This commit was manufactured by cvs2svn to create tag 'v200705160100'.
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.axis2.consumption.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.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.core/.project b/bundles/org.eclipse.jst.ws.axis2.consumption.core/.project
deleted file mode 100644
index 673d2ac..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis2.consumption.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.jst.ws.axis2.consumption.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index a758557..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 24 12:40:53 EDT 2007
-eclipse.preferences.version=1
-encoding//src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUI.properties=ISO-8859-1
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis2.consumption.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5cd75cc..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Sun May 06 17:32:38 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.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index dd17456..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis2.consumption.core
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.ws.axis2.consumption.core.plugin.WebServiceAxis2ConsumptionCorePlugin
-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.ui,
- org.eclipse.jst.ws.axis2.core
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.ws.axis2.consumption.core.command,
- org.eclipse.jst.ws.axis2.consumption.core.data,
- org.eclipse.jst.ws.axis2.consumption.core.messages,
- org.eclipse.jst.ws.axis2.consumption.core.plugin,
- org.eclipse.jst.ws.axis2.consumption.core.utils,
- org.eclipse.jst.ws.axis2.creation.core.data
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %PLUGIN_PROVIDER
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis2.consumption.core/build.properties
deleted file mode 100644
index 7a7bd82..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/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 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.properties,\
-               plugin.xml
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis2.consumption.core/plugin.properties
deleted file mode 100644
index c334ca0..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/plugin.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
-# -------- -------- -----------------------------------------------------------
-# 20070428   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
-# 20070507   185686 sandakith@wso2.com - Lahiru Sandakith
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis2 Consumption Core Plug-in
-PLUGIN_PROVIDER=WSO2
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis2.consumption.core/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
deleted file mode 100644
index 1997e6d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientCodegenCommand.java
+++ /dev/null
@@ -1,204 +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
- * -------- -------- -----------------------------------------------------------
- * 20070205   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070206   172186 sandakith@wso2.com	- Fix for 172186, Added a check to overcome the issue.
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   185398 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.command;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.data.DataModel;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.ContentCopyUtils;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDL2JavaGenerator;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2ClientCodegenCommand extends AbstractDataModelOperation {
-	
-	  private DataModel model;
-		
-	  public Axis2ClientCodegenCommand( DataModel model ){
-	    this.model = model;  
-	  }
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-													 throws ExecutionException {
-		IStatus status = Status.OK_STATUS;  
-		IEnvironment environment = getEnvironment();
-		IStatusHandler statusHandler = environment.getStatusHandler();	
-		
-		String workspaceDirectory = ResourcesPlugin.getWorkspace().getRoot().
-													getLocation().toOSString();
-		String currentDynamicWebProjectDir = FileUtils.addAnotherNodeToPath(
-														workspaceDirectory,
-														model.getWebProjectName());
-		String matadataDir = FileUtils.addAnotherNodeToPath(
-										workspaceDirectory,
-										Axis2ConsumptionUIMessages.DIR_DOT_METADATA);
-	    String matadataPluginsDir = FileUtils.addAnotherNodeToPath(
-	    								matadataDir,
-	    								Axis2ConsumptionUIMessages.DIR_DOT_PLUGINS);
-	    String matadataAxis2Dir = FileUtils.addAnotherNodeToPath(
-	    									matadataPluginsDir, 
-	    									Axis2ConsumptionUIMessages.AXIS2_PROJECT);
-		String tempCodegenOutputLocation = FileUtils.addAnotherNodeToPath(
-											matadataAxis2Dir, 
-											Axis2ConsumptionUIMessages.CODEGEN_RESULTS);
-		File tempCodegenOutputLocationFile = new File(tempCodegenOutputLocation);
-		if (tempCodegenOutputLocationFile.exists()){
-			FileUtils.deleteDirectories(tempCodegenOutputLocation);
-		}
-		FileUtils.createDirectorys(tempCodegenOutputLocation);
-		WSDL2JavaGenerator generator = new WSDL2JavaGenerator(); 
-      
-		//AxisService service;
-		Object axisServiceInstance;
-	try {
-		//service = generator.getAxisService(model.getWsdlURI());
-		ClassLoadingUtil.setInitByClient(true);
-		ClassLoadingUtil.cleanAntClassLoader();
-		ClassLoadingUtil.init(model.getWebProjectName());
-		axisServiceInstance = generator.getAxisService(model.getWsdlURI());
-		Map optionsMap = generator.fillOptionMap(	
-			model.isASync(), //async
-            model.isSync(), //sync
-            false,  //servirside false always
-            false,  //services.xml false always
-            model.isTestCaseCheck(),
-            model.isGenerateAllCheck(),
-            (model.getServiceName()!=null)?model.getServiceName():null,
-            (model.getPortName()!=null)?model.getPortName():null,
-            (model.getDatabindingType().toLowerCase()!=null)
-            			?model.getDatabindingType().toLowerCase()
-            			:null,
-            (model.getWsdlURI()!=null)?model.getWsdlURI():null,
-            (model.getPackageText()!=null)?model.getPackageText():null,
-            "java",
-            tempCodegenOutputLocation,
-            model.getNamespaseToPackageMapping(),
-            false	//Serverside interface always false
-           ); 
-      
-        //CodeGenConfiguration codegenConfig = new CodeGenConfiguration(service, optionsMap);
-		Class CodeGenConfigurationClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader("org.apache.axis2.wsdl.codegen.CodeGenConfiguration");
-
-		//-----------------------------------------------------------------------------------//
-		//Fix for the Axis2 1.2 
-		//Constructor CodeGenConfigurationConstructor = CodeGenConfigurationClass
-		//		.getConstructor(new Class[]{axisServiceInstance.getClass(),Map.class});
-		//Object CodeGenConfigurationInstance = CodeGenConfigurationConstructor
-		//		.newInstance(new Object[]{axisServiceInstance,optionsMap});
-		
-		Constructor CodeGenConfigurationConstructor = CodeGenConfigurationClass
-				.getConstructor(new Class[]{Map.class});
-		Object CodeGenConfigurationInstance = CodeGenConfigurationConstructor
-				.newInstance(new Object[]{optionsMap});
-		
-		// codegenConfig.addAxisService(service);
-		Method addAxisServiceMethod = CodeGenConfigurationClass
-				.getMethod("addAxisService", new Class[]{ axisServiceInstance.getClass()});
-		addAxisServiceMethod.invoke(CodeGenConfigurationInstance, 
-							new Object[]{axisServiceInstance});
-		
-        //set the wsdl definision for codegen config for skeleton generarion.
-        WSDLPropertyReader reader = new WSDLPropertyReader();
-        reader.readWSDL(model.getWebProjectName(),model.getWsdlURI());
-        Object wsdlDefinitionInstance = reader.getWsdlDefinitionInstance();
-        //Class DefinitionClass = ClassLoadingUtil.loadClassFromAntClassLoader("javax.wsdl.Definition");
-        //codegenConfig.setWsdlDefinition(wsdlDefinition);
-		Method setWsdlDefinitionMethod = CodeGenConfigurationClass
-				.getMethod("setWsdlDefinition", new Class[]{reader.getWsdlDefinitionClass()});
-		setWsdlDefinitionMethod.invoke(CodeGenConfigurationInstance, 
-					new Object[]{wsdlDefinitionInstance});       
-        
-		//-----------------------------------------------------------------------------------//
-		
-        //set the baseURI
-        //codegenConfig.setBaseURI(generator.getBaseUri(model.getWsdlURI()));
-		
-		Method setBaseURIMethod = CodeGenConfigurationClass
-				.getMethod("setBaseURI", new Class[]{String.class});
-		setBaseURIMethod.invoke(CodeGenConfigurationInstance, 
-								new Object[]{generator.getBaseUri(model.getWsdlURI())});
-		
-		//Get the namespace from the AxisService and set it in the configuration 
-		Class AxisServiceClass = ClassLoadingUtil
-					.loadClassFromAntClassLoader("org.apache.axis2.description.AxisService");
-
-		Method getTargetNamespaceMethod = AxisServiceClass.getMethod("getTargetNamespace", null);
-		Object targetNamespace = getTargetNamespaceMethod.invoke(axisServiceInstance, null);
-		
-		Class URLProcessorClass = ClassLoadingUtil
-					.loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
-		Method makePackageNameMethod = URLProcessorClass
-					.getMethod("makePackageName", new Class[]{String.class});
-		Object stringReturn = makePackageNameMethod.invoke(null, new Object[]{targetNamespace});
-		
-		model.setPackageText(stringReturn.toString());
-		
-		Method setPackageNameMethod = CodeGenConfigurationClass
-					.getMethod("setPackageName", new Class[]{String.class});
-		setPackageNameMethod.invoke(CodeGenConfigurationInstance, new Object[]{stringReturn});
-		
-        //new CodeGenerationEngine(codegenConfig).generate();
-		
-		Class CodeGenerationEngineClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader("org.apache.axis2.wsdl.codegen.CodeGenerationEngine");
-		Constructor CodeGenerationEngineConstructor = CodeGenerationEngineClass
-					.getConstructor(new Class[]{CodeGenConfigurationInstance.getClass()});
-		Object CodeGenerationEngineInstance  = CodeGenerationEngineConstructor
-					.newInstance(new Object[]{CodeGenConfigurationInstance});
-		
-		//Invoke Codegen Method
-		Method generateMethod = CodeGenerationEngineClass.getMethod("generate", null);
-		generateMethod.invoke(CodeGenerationEngineInstance, null);
-      
-		//Copy the existing codegen results to the current project
-        ContentCopyUtils contentCopyUtils = new ContentCopyUtils();
-	    status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
-	    							tempCodegenOutputLocation, 
-	    							currentDynamicWebProjectDir, 
-	    							monitor, 
-	    							statusHandler);
-      
-	} catch (Exception e) {
-		status = StatusUtils.errorStatus(NLS.bind(
-											Axis2ConsumptionUIMessages.ERROR_CODEGEN_EXCEPTION,
-											new String[]{e.getLocalizedMessage()}),
-										e);
-		environment.getStatusHandler().reportError(status); 
-	}
-		
-		return status;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java
deleted file mode 100644
index 7adfc77..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2ClientDefaultingCommand.java
+++ /dev/null
@@ -1,75 +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
- * -------- -------- -----------------------------------------------------------
- * 20070205   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
- * 20070508   175030 sandakith@wso2.com - Lahiru Sandakith, WSDL not passed to Axis2 client fix
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.command;
-
-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.data.DataModel;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.DefaultCodegenUtil;
-import org.eclipse.jst.ws.axis2.core.context.ServiceContext;
-import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebServiceClient;
-
-public class Axis2ClientDefaultingCommand extends AbstractDataModelOperation {
-	
-	DataModel model;
-	private IWebServiceClient ws;
-	IStatus status;
-	
-	public Axis2ClientDefaultingCommand(DataModel model, IWebServiceClient ws){
-		this.model=model;
-		this.ws=ws;
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		//Default Settings for the Codegeneration
-		String deployedWSDLURL = FacetContainerUtils.getDeployedWSDLURL(
-	  								model.getWebProjectName().split("Client")[0],
-	  								ServiceContext.getInstance().getServiceName());
-		String wsFrameworkWSDLURL = ws.getWebServiceClientInfo().getWsdlURL();
- 
-		model.setWsdlURI(
-				((wsFrameworkWSDLURL!=null) || (deployedWSDLURL!=wsFrameworkWSDLURL))?
-						wsFrameworkWSDLURL:
-							deployedWSDLURL
-		);
-		
-		// WSE with Client alone. 
-		ws.getWebServiceClientInfo().setWsdlURL(deployedWSDLURL);
-		
-		model.setDatabindingType(Axis2ConsumptionUIMessages.DATA_BINDING_ADB);
-		model.setASync(false);
-		model.setSync(false);
-		
-		DefaultCodegenUtil defaultCodegenUtil = new DefaultCodegenUtil(model);
-		defaultCodegenUtil.populateModelParamsFromWSDL();
-		
-		status = Status.OK_STATUS;
-		return status;
-	}
-	
-	public DataModel getWebServiceDataModel(){
-		return model;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2WebservicesServerCommand.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2WebservicesServerCommand.java
deleted file mode 100644
index e673038..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/command/Axis2WebservicesServerCommand.java
+++ /dev/null
@@ -1,45 +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.axis2.consumption.core.command;
-
-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.data.DataModel;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2WebservicesServerCommand extends
-AbstractDataModelOperation {
-
-	String project;
-	DataModel model;
-	public Axis2WebservicesServerCommand(DataModel model, String project){
-		this.model=model;
-		this.project = project;
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-	throws ExecutionException {
-		//Copy the axis2 libs in to this client project
-		//TODO No Need to copy the axis2 libs after the introduction of the facet 
-		//     Check wether the facet is present and if not pop up a warning
-		IStatus status = Status.OK_STATUS;
-		model.setWebProjectName(project);
-		return status;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/data/DataModel.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/data/DataModel.java
deleted file mode 100644
index bcc76db..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/data/DataModel.java
+++ /dev/null
@@ -1,109 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.data;
-
-public class DataModel extends Model{
-	
-	//Consumption DataModel Parameters
-	
-	private String 	serviceClass;
-	private String 	databindingType;
-	private String 	namespaseToPackageMapping;
-	//Default setting is to generate both sync and async
-	private boolean	Sync = false; 
-	private boolean	ASync = false;
-	private boolean generateAllCheck = false;
-	private boolean testCaseCheck = false;
-
-	
-	public String getDatabindingType() {
-		return databindingType;
-	}
-	public void setDatabindingType(String databindingType) {
-		this.databindingType = databindingType;
-	}
-	public boolean isGenerateAllCheck() {
-		return generateAllCheck;
-	}
-	public void setGenerateAllCheck(boolean generateAllCheck) {
-		this.generateAllCheck = generateAllCheck;
-	}
-	public String getNamespaseToPackageMapping() {
-		return namespaseToPackageMapping;
-	}
-	public void setNamespaseToPackageMapping(String namespaseToPackageMapping) {
-		this.namespaseToPackageMapping = namespaseToPackageMapping;
-	}
-
-	public String getPackageText() {
-		return super.getPackageText();
-	}
-
-	public void setPackageText(String packageText) {
-		super.setPackageText(packageText);
-	}
-	
-	public String getPortName() {
-		return super.getPortName();
-	}
-
-	public void setPortName(String portName) {
-		super.setPortName(portName);
-	}
-	
-	public String getServiceClass() {
-		return serviceClass;
-	}
-	public void setServiceClass(String serviceClass) {
-		this.serviceClass = serviceClass;
-	}
-
-	public String getServiceName() {
-		return super.getServiceName();
-	}
-
-	public void setServiceName(String serviceName) {
-		super.setServiceName(serviceName);
-	}
-	
-	public String getWsdlURI() {
-		return super.getWsdlURI();
-	}
-
-	public void setWsdlURI(String wsdlURI) {
-		super.setWsdlURI(wsdlURI);
-	}
-	
-	public boolean isASync() {
-		return ASync;
-	}
-	public void setASync(boolean async) {
-		ASync = async;
-	}
-	public boolean isSync() {
-		return Sync;
-	}
-	public void setSync(boolean sync) {
-		Sync = sync;
-	}
-	public boolean isTestCaseCheck() {
-		return testCaseCheck;
-	}
-	public void setTestCaseCheck(boolean testCaseCheck) {
-		this.testCaseCheck = testCaseCheck;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/data/Model.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/data/Model.java
deleted file mode 100644
index 221b777..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/data/Model.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
- * -------- -------- -----------------------------------------------------------
- * 20070213   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.data;
-
-public class Model {
-	
-	private String  webProjectName;
-	
-	private boolean serverStatus;
-	private String  wsdlURI;
-	private String portName;
-	private String serviceName;
-	private String packageText;
-	
-	public String getPackageText() {
-		return packageText;
-	}
-	public void setPackageText(String packageText) {
-		this.packageText = packageText;
-	}
-	public String getPortName() {
-		return portName;
-	}
-	public void setPortName(String portName) {
-		this.portName = portName;
-	}
-	public String getServiceName() {
-		return serviceName;
-	}
-	public void setServiceName(String serviceName) {
-		this.serviceName = serviceName;
-	}
-	public String getWsdlURI() {
-		return wsdlURI;
-	}
-	public void setWsdlURI(String wsdlURI) {
-		this.wsdlURI = wsdlURI;
-	}
-	public boolean getServerStatus() {
-		return serverStatus;
-	}
-	public void setServerStatus(boolean b) {
-		this.serverStatus = b;
-	}
-	
-	public String getWebProjectName() {
-		return webProjectName;
-	}
-	public void setWebProjectName(String webProjectName) {
-		this.webProjectName = webProjectName;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUI.properties b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUI.properties
deleted file mode 100644
index ca8c1ff..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUI.properties
+++ /dev/null
@@ -1,46 +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
-# 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
-###############################################################################
-
-
-LABEL_SERVICE_NAME_CAPTION=Service Name
-LABEL_GENERATE_TESTCASE_CAPTION=Generate test case to test the service
-LABEL_DATABINDING_CAPTION=Databinding Name
-LABEL_PORTNAME=Port Name
-LABEL_GENERATE_ALL=Generate all types for all elements referred by schemas
-LABEL_PACKEGE_NAME=Custom package name
-LABEL_NAMESPACE=Namespace
-LABEL_PACKAGE=Package
-LABEL_CLIENT_SIDE=Client mode
-LABEL_SYNC_AND_ASYNC=Generate both sync and async
-LABEL_SYNC=Generate sync style only
-LABEL_ASYNC=Generate async style only
-LABEL_DATA_MODEL=WebServiceDataModel
-
-PAGE_TITLE_WS_AXIS2_PROXY=Axis2 Client Web Service Configuration 
-PAGE_DESC_WS_AXIS2_PROXY=Please select the appropriate Codegen settings 
-
-DATA_BINDING_ADB=ADB
-DATA_BINDING_NONE=NONE
-
-DIR_DOT_METADATA=.metadata
-DIR_DOT_PLUGINS=.plugins
-
-ERROR_INVALID_FILE_READ_WRITEL=Exception occurred while reading or writing files {0}
-ERROR_INVALID_WSDL_FILE_READ_WRITEL=Exception occurred while reading or writing WSDL {0}
-ERROR_CODEGEN_EXCEPTION=Exception occurred while code generation for WSDL {0}
-
-AXIS2_PROJECT=org.eclipse.jst.ws.axis2
-CODEGEN_RESULTS=codegen
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.java
deleted file mode 100644
index b982b20..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/messages/Axis2ConsumptionUIMessages.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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Axis2ConsumptionUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = 
-		"org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUI";//$NON-NLS-1$
-
-	private Axis2ConsumptionUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String LABEL_SERVICE_NAME_CAPTION;
-	public static String LABEL_GENERATE_TESTCASE_CAPTION;
-	public static String LABEL_DATABINDING_CAPTION;
-	public static String LABEL_PORTNAME;
-	public static String LABEL_GENERATE_ALL;
-	public static String LABEL_PACKEGE_NAME;
-	public static String LABEL_NAMESPACE;
-	public static String LABEL_PACKAGE;
-	public static String LABEL_CLIENT_SIDE;
-	public static String LABEL_SYNC_AND_ASYNC;
-	public static String LABEL_SYNC;
-	public static String LABEL_ASYNC;
-	public static String LABEL_DATA_MODEL;
-	
-	public static String PAGE_TITLE_WS_AXIS2_PROXY;
-	public static String PAGE_DESC_WS_AXIS2_PROXY;
-	
-	public static String DIR_DOT_METADATA;
-	public static String DIR_DOT_PLUGINS;
-	
-	public static String ERROR_INVALID_FILE_READ_WRITEL;
-	public static String ERROR_INVALID_WSDL_FILE_READ_WRITEL;
-	public static String ERROR_CODEGEN_EXCEPTION;
-	
-	public static String AXIS2_PROJECT;
-	public static String CODEGEN_RESULTS;
-	
-	public static String DATA_BINDING_ADB;
-	public static String DATA_BINDING_NONE;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Axis2ConsumptionUIMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/plugin/WebServiceAxis2ConsumptionCorePlugin.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/plugin/WebServiceAxis2ConsumptionCorePlugin.java
deleted file mode 100644
index 669cbc2..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/plugin/WebServiceAxis2ConsumptionCorePlugin.java
+++ /dev/null
@@ -1,63 +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
- * -------- -------- -----------------------------------------------------------
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.plugin;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WebServiceAxis2ConsumptionCorePlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.axis2.consumption.core";
-
-	// The shared instance
-	private static WebServiceAxis2ConsumptionCorePlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public WebServiceAxis2ConsumptionCorePlugin() {
-		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 WebServiceAxis2ConsumptionCorePlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/ContentCopyUtils.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/ContentCopyUtils.java
deleted file mode 100644
index b026b93..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/ContentCopyUtils.java
+++ /dev/null
@@ -1,137 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.IStatusHandler;
-
-public class ContentCopyUtils {
-
-	private List fileAndDirectoriesList = new ArrayList();
-	FileInputStream finStream = null;		
-
-	/**
-	 * This method will copy the source directory into the eclipse workspace according 
-	 * to the Eclipse Framework API
-	 * @param sourceDir
-	 * @param destinationDir
-	 * @param monitor
-	 * @param statusHandler
-	 * @return
-	 */
-	public IStatus copyDirectoryRecursivelyIntoWorkspace(String sourceDir, 
-				String destinationDir,
-				IProgressMonitor monitor,
-				IStatusHandler statusHandler) {
-		IStatus status = Status.OK_STATUS;
-		fileAndDirectoriesList.clear();
-		File axis2WebappFolder = new File(sourceDir);
-		visitAllDirsAndFiles(axis2WebappFolder);
-		List deployFiles = new ArrayList();
-		deployFiles= fileAndDirectoriesList;
-
-		try {
-
-			//Import the axis2 dependency plugin according to the Resources API of eclipse 
-			ResourceContext context = WebServicePlugin.getInstance().getResourceContext();	
-
-			IPath outputPath = new Path (destinationDir);
-
-			String fileName;
-			IPath targetPath=null;
-			boolean isDirectory = false;
-
-			String deployFile;
-			Iterator iterator;
-
-			String tempOutputDir = axis2WebappFolder.toString();
-			iterator = deployFiles.iterator();
-			while (iterator.hasNext()) {
-				deployFile = (String) iterator.next();
-				File source = new File(deployFile);
-				if (source.isDirectory()) {
-					isDirectory =true;
-				}else{
-					isDirectory=false;
-					finStream = new FileInputStream(source);
-				}
-
-				if (deployFile.startsWith(tempOutputDir)) {
-					fileName = deployFile.substring(tempOutputDir.length());
-					targetPath = outputPath.append(fileName).makeAbsolute();
-					if (isDirectory){
-						org.eclipse.wst.command.internal.env.common.FileResourceUtils
-						.makeFolderPathAtLocation(context,  
-								targetPath,
-								monitor,
-								statusHandler);
-					}else{
-						if (finStream != null) {
-							org.eclipse.wst.command.internal.env.common.FileResourceUtils
-							.createFileAtLocation(context,  
-									targetPath,
-									finStream,
-									monitor,
-									statusHandler);
-						}
-						finStream.close();
-					}
-				}
-			}
-		} catch (IOException e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2ConsumptionUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-							new String[]{e.getLocalizedMessage()}), e);
-		} catch (CoreException e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2ConsumptionUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-							new String[]{e.getLocalizedMessage()}), e);
-		}
-
-		return status;
-
-	}
-
-	//	Process all files and directories under dir
-	private void visitAllDirsAndFiles(File dir) {
-
-		fileAndDirectoriesList.add(dir.getAbsolutePath());
-
-		if (dir.isDirectory()) {
-			String[] children = dir.list();
-			for (int i=0; i<children.length; i++) {
-				visitAllDirsAndFiles(new File(dir, children[i]));
-			}
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/DefaultCodegenUtil.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/DefaultCodegenUtil.java
deleted file mode 100644
index 79054a3..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/DefaultCodegenUtil.java
+++ /dev/null
@@ -1,90 +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
- * -------- -------- -----------------------------------------------------------
- * 20070206   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.axis2.consumption.core.utils;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.consumption.core.data.Model;
-import org.eclipse.jst.ws.axis2.consumption.core.messages.Axis2ConsumptionUIMessages;
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-
-public class DefaultCodegenUtil {
-	
-	private WSDLPropertyReader reader;
-	private Model model;
-	private List serviceQNameList = null;
-	IStatus status;
-	
-	public DefaultCodegenUtil(org.eclipse.jst.ws.axis2.consumption.core.data.DataModel model){
-		this.model=model;
-	}
-	
-	public DefaultCodegenUtil(org.eclipse.jst.ws.axis2.creation.core.data.DataModel model){
-		this.model=model;
-	}
-
-	/**
-	 * populate the model for the default scenario from the wsdl url
-	 */
-	public void populateModelParamsFromWSDL() {
-		status = Status.OK_STATUS;
-		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()) {
-					// 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);
-					model.setServiceName(resultLocalPart.toString());
-					// load the ports
-					 loadPortNames();
-				} 
-				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);
-		}
-	}
-	
-	private void loadPortNames() {
-			java.util.List ports = reader.getPortNameList(serviceQNameList.get(0));
-					// add the local part of the
-					model.setPortName(ports.get(0).toString());
-	}
-	
-	private void populatePackageName() {
-		model.setPackageText(reader.packageFromTargetNamespace());
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/WSDL2JavaGenerator.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/WSDL2JavaGenerator.java
deleted file mode 100644
index c05c86f..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/WSDL2JavaGenerator.java
+++ /dev/null
@@ -1,397 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   184729 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.consumption.core.utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-
-public class WSDL2JavaGenerator {
-	
-    /**
-     * Maps a string containing the name of a language to a constant defined in 
-     * CommandLineOptionConstants.LanguageNames
-     * @param UILangValue a string containg a language, e.g. "java", "cs", "cpp" or "vb"
-     * @return a normalized string constant
-     */
-    private String mapLanguagesWithCombo(String UILangValue)  {
-       return UILangValue;
-    }
-    /**
-     * Creates a list of parameters for the code generator based on the decisions made by 
-     * the user on the OptionsPage(page2). For each setting, there is a Command-Line option for 
-     * the Axis2 code generator.
-     * @return a Map with keys from CommandLineOptionConstants with the values entered 
-     * by the user on the Options Page.
-     */
-    public Map fillOptionMap(boolean isAyncOnly,
-            		  boolean isSyncOnly,
-            		  boolean isServerSide,
-            		  boolean isServerXML,
-            		  boolean isTestCase,
-            		  boolean isGenerateAll,
-            		  String serviceName,
-            		  String portName,
-            		  String databindingName,
-            		  String WSDLURI,
-            		  String packageName,
-            		  String selectedLanguage,
-            		  String outputLocation,
-            		  String namespace2packageList,
-            		  boolean isServerSideInterface
-            		  ){
-       Map optionMap = new HashMap();
-       
-     try{  
-        //Reflection invocatin resources
-		Class CommandLineOptionConstantsClass = ClassLoadingUtil.loadClassFromAntClassLoader(
-							"org.apache.axis2.util.CommandLineOptionConstants$WSDL2JavaConstants");
-		Class CommandLineOptionClass = ClassLoadingUtil.loadClassFromAntClassLoader(
-														"org.apache.axis2.util.CommandLineOption");
-		Constructor CommandLineOptionConstructor = CommandLineOptionClass.getConstructor(
-														new Class[]{String.class,String[].class});
-        //WSDL file name
-       
-							//       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.WSDL_LOCATION_URI_OPTION, 
-							//    		   		 new CommandLineOption(
-							//    		   				 CommandLineOptionConstants.WSDL2JavaConstants.WSDL_LOCATION_URI_OPTION,
-							//    		   				 getStringArray(WSDLURI)));
-		
-        //Reflection Invocation 
-		Field WSDL_LOCATION_URI_OPTION_FIELD = CommandLineOptionConstantsClass.getField(
-																		"WSDL_LOCATION_URI_OPTION");
-		optionMap.put((String)WSDL_LOCATION_URI_OPTION_FIELD.get(String.class),
-						CommandLineOptionConstructor.newInstance(
-							new Object[]{(String)WSDL_LOCATION_URI_OPTION_FIELD.get(String.class),
-							getStringArray(WSDLURI)}));
-       
-       //Async only
-       if (isAyncOnly)
-       {
-							//          optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION, 
-							//        		  	new CommandLineOption(
-							//        		  			CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_ASYNC_ONLY_OPTION,
-							//        		  			new String[0]));
-        
-    	//Reflection Invocation     	   
-   		Field CODEGEN_ASYNC_ONLY_OPTION_FIELD = CommandLineOptionConstantsClass
-   												.getField("CODEGEN_ASYNC_ONLY_OPTION");
-		optionMap.put((String)CODEGEN_ASYNC_ONLY_OPTION_FIELD.get(
-						String.class),
-						CommandLineOptionConstructor.newInstance(
-							new Object[]{(String)CODEGEN_ASYNC_ONLY_OPTION_FIELD.get(String.class),
-							new String[0]}));
-       }
-       
-       //sync only
-       if (isSyncOnly)
-       {
-							//          optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION, 
-							//        		  new CommandLineOption(
-							//        		  CommandLineOptionConstants.WSDL2JavaConstants.CODEGEN_SYNC_ONLY_OPTION,
-							//        		  new String[0]));
-       //Reflection Invocation
-      		Field CODEGEN_SYNC_ONLY_OPTION_FIELD = CommandLineOptionConstantsClass
-      												.getField("CODEGEN_SYNC_ONLY_OPTION");
-    		optionMap.put((String)CODEGEN_SYNC_ONLY_OPTION_FIELD.get(String.class),
-					CommandLineOptionConstructor.newInstance(
-							new Object[]{(String)CODEGEN_SYNC_ONLY_OPTION_FIELD.get(String.class),
-							new String[0]}));
-       }
-       //serverside
-       if (isServerSide)
-       {
-							//          optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION, 
-							//        		  new CommandLineOption(
-							//        		  CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_CODE_OPTION,
-							//        		  new String[0]));
-	    //Reflection Invocation
-		Field SERVER_SIDE_CODE_OPTION_FIELD = CommandLineOptionConstantsClass
-												.getField("SERVER_SIDE_CODE_OPTION");
-		optionMap.put((String)SERVER_SIDE_CODE_OPTION_FIELD.get(String.class),
-				CommandLineOptionConstructor.newInstance(
-						new Object[]{(String)SERVER_SIDE_CODE_OPTION_FIELD.get(String.class),
-						new String[0]}));
-          //server xml
-          if (isServerXML)
-          {
-          //optionMap.put(
-							//            		 CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
-          // 	new CommandLineOption(
-          // 	CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_SERVICE_DESCRIPTION_OPTION,
-							//            		 new String[0]));
-       		Field GENERATE_SERVICE_DESCRIPTION_OPTION_FIELD = CommandLineOptionConstantsClass
-   												.getField("GENERATE_SERVICE_DESCRIPTION_OPTION");
-    		optionMap.put((String)GENERATE_SERVICE_DESCRIPTION_OPTION_FIELD.get(String.class),
-				CommandLineOptionConstructor.newInstance(
-				   new Object[]{(String)GENERATE_SERVICE_DESCRIPTION_OPTION_FIELD.get(String.class),
-				   new String[0]}));
-          }
-          if (isGenerateAll){
-							//              optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_ALL_OPTION, 
-							//            		  new CommandLineOption(
-							//            		  CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_ALL_OPTION,
-							//            		  new String[0]));
-			Field GENERATE_ALL_OPTION_FIELD = CommandLineOptionConstantsClass
-														.getField("GENERATE_ALL_OPTION");
-			optionMap.put((String)GENERATE_ALL_OPTION_FIELD.get(String.class),
-					CommandLineOptionConstructor.newInstance(
-							new Object[]{(String)GENERATE_ALL_OPTION_FIELD.get(String.class),
-							new String[0]}));
-          }
-       }
-       //test case
-       if (isTestCase)
-       {
-							//          optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION,
-							//        		  new CommandLineOption(
-							//        		  CommandLineOptionConstants.WSDL2JavaConstants.GENERATE_TEST_CASE_OPTION,
-							//        		  new String[0]));
-		Field GENERATE_TEST_CASE_OPTION_FIELD = CommandLineOptionConstantsClass
-													.getField("GENERATE_TEST_CASE_OPTION");
-		optionMap.put((String)GENERATE_TEST_CASE_OPTION_FIELD.get(String.class),
-				CommandLineOptionConstructor.newInstance(
-						new Object[]{(String)GENERATE_TEST_CASE_OPTION_FIELD.get(String.class),
-						new String[0]}));
-       }
-       //package name
-							//       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.PACKAGE_OPTION,
-							//    		   new CommandLineOption(
-							//    		   CommandLineOptionConstants.WSDL2JavaConstants.PACKAGE_OPTION,
-							//    		   getStringArray(packageName)));
- 		Field PACKAGE_OPTION_FIELD = CommandLineOptionConstantsClass.getField("PACKAGE_OPTION");
-		optionMap.put((String)PACKAGE_OPTION_FIELD.get(String.class),
-							CommandLineOptionConstructor.newInstance(
-									new Object[]{(String)PACKAGE_OPTION_FIELD.get(String.class),
-									getStringArray(packageName)}));
-		
-       //selected language
-							//       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.STUB_LANGUAGE_OPTION,
-							//    		   new CommandLineOption(
-							//    		   CommandLineOptionConstants.WSDL2JavaConstants.STUB_LANGUAGE_OPTION,
-							//    		   getStringArray(mapLanguagesWithCombo(selectedLanguage))));
- 		Field STUB_LANGUAGE_OPTION_FIELD = CommandLineOptionConstantsClass
- 															.getField("STUB_LANGUAGE_OPTION");
-		optionMap.put((String)STUB_LANGUAGE_OPTION_FIELD.get(String.class),
-							CommandLineOptionConstructor.newInstance(
-								new Object[]{(String)STUB_LANGUAGE_OPTION_FIELD.get(String.class),
-								getStringArray(mapLanguagesWithCombo(selectedLanguage))}));
-		
-       //output location
-							//       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.OUTPUT_LOCATION_OPTION,
-							//    		   new CommandLineOption(
-							//    		   CommandLineOptionConstants.WSDL2JavaConstants.OUTPUT_LOCATION_OPTION,
-							//    		   getStringArray(outputLocation)));
- 		Field OUTPUT_LOCATION_OPTION_FIELD = CommandLineOptionConstantsClass
- 														.getField("OUTPUT_LOCATION_OPTION");
-		optionMap.put((String)OUTPUT_LOCATION_OPTION_FIELD.get(String.class),
-							CommandLineOptionConstructor.newInstance(
-								new Object[]{(String)OUTPUT_LOCATION_OPTION_FIELD.get(String.class),
-								getStringArray(outputLocation)}));
-       
-      //databinding
-							//       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION,
-							//    		   new CommandLineOption(
-							//    		   CommandLineOptionConstants.WSDL2JavaConstants.DATA_BINDING_TYPE_OPTION,
-							//    		   getStringArray(databindingName)));
- 		Field DATA_BINDING_TYPE_OPTION_FIELD = CommandLineOptionConstantsClass
- 													.getField("DATA_BINDING_TYPE_OPTION");
-		optionMap.put((String)DATA_BINDING_TYPE_OPTION_FIELD.get(String.class),
-							CommandLineOptionConstructor.newInstance(
-							  new Object[]{(String)DATA_BINDING_TYPE_OPTION_FIELD.get(String.class),
-							  getStringArray(databindingName)}));
-       
-       //port name
-       if (portName!=null){
-							//	       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.PORT_NAME_OPTION,
-							//	    		   new CommandLineOption(
-							//	    		   CommandLineOptionConstants.WSDL2JavaConstants.PORT_NAME_OPTION,
-							//	    		   getStringArray(portName)));
-     		Field PORT_NAME_OPTION_FIELD = CommandLineOptionConstantsClass
-     														.getField("PORT_NAME_OPTION");
-    		optionMap.put((String)PORT_NAME_OPTION_FIELD.get(String.class),
-    						CommandLineOptionConstructor.newInstance(
-    								new Object[]{(String)PORT_NAME_OPTION_FIELD.get(String.class),
-    								getStringArray(portName)}));
-       }
-       //service name
-       if (serviceName!= null){
-							//	       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVICE_NAME_OPTION,
-							//	    		   new CommandLineOption(
-							//	    		   CommandLineOptionConstants.WSDL2JavaConstants.SERVICE_NAME_OPTION,
-							//	    		   getStringArray(serviceName)));
-     		Field SERVICE_NAME_OPTION_FIELD = CommandLineOptionConstantsClass
-     													.getField("SERVICE_NAME_OPTION");
-    		optionMap.put((String)SERVICE_NAME_OPTION_FIELD.get(String.class),
-    					CommandLineOptionConstructor.newInstance(
-    							new Object[]{(String)SERVICE_NAME_OPTION_FIELD.get(String.class),
-    									getStringArray(serviceName)}));
-       }
-       //ns2pkg mapping
-       if (namespace2packageList!= null){
-							//	       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION,
-							//	    		   new CommandLineOption(
-							//	    		   CommandLineOptionConstants.WSDL2JavaConstants.NAME_SPACE_TO_PACKAGE_OPTION
-							//	    		   , getStringArray(namespace2packageList)));
-     		Field NAME_SPACE_TO_PACKAGE_OPTION_FIELD = CommandLineOptionConstantsClass
-     											.getField("NAME_SPACE_TO_PACKAGE_OPTION");
-    		optionMap.put((String)NAME_SPACE_TO_PACKAGE_OPTION_FIELD.get(String.class),
-    				CommandLineOptionConstructor.newInstance(
-    					new Object[]{(String)NAME_SPACE_TO_PACKAGE_OPTION_FIELD.get(String.class),
-    					getStringArray(namespace2packageList)}));
-       }
-       
-       //server side interface  mapping
-       if (isServerSideInterface){
-							//	       optionMap.put(CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION,
-							//	    		   new CommandLineOption(
-							//	    		   CommandLineOptionConstants.WSDL2JavaConstants.SERVER_SIDE_INTERFACE_OPTION,
-							//	    		   new String[0]));
-     		Field SERVER_SIDE_INTERFACE_OPTION_FIELD = CommandLineOptionConstantsClass
-     											.getField("SERVER_SIDE_INTERFACE_OPTION");
-    		optionMap.put((String)SERVER_SIDE_INTERFACE_OPTION_FIELD.get(String.class),
-    				CommandLineOptionConstructor.newInstance(
-    					new Object[]{(String)SERVER_SIDE_INTERFACE_OPTION_FIELD.get(String.class),
-    					new String[0]}));
-       }
-       
-     }catch(Exception e){
-    	 e.printStackTrace();
-     }
-       return optionMap;
-       
-    }
-    
-    public String getBaseUri(String wsdlURI){
-    	
-    	try {
-			URL url;
-			if (wsdlURI.indexOf("://")==-1){
-				url = new URL("file","",wsdlURI);
-			}else{
-				url = new URL(wsdlURI);	
-			}
-
-			
-			String baseUri;
-			if ("file".equals(url.getProtocol())){
-				baseUri = new File(url.getFile()).getParentFile().toURL().toExternalForm();
-			}else{
-				baseUri = url.toExternalForm().substring(0,
-						url.toExternalForm().lastIndexOf("/")
-				);
-			}
-		
-			
-			return baseUri;
-		} catch (MalformedURLException e) {
-			throw new RuntimeException(e);
-		}
-    }
-    
-    /**
-     * Reads the WSDL Object Model from the given location.
-     * 
-     * @param wsdlURI the filesystem location (full path) of the WSDL file to read in.
-     * @return the WSDLDescription object containing the WSDL Object Model of the given WSDL file
-     * @throws WSDLException when WSDL File is invalid
-     * @throws IOException on errors reading the WSDL file
-     */
-    public Object getAxisService(String wsdlURI) throws Exception{
-    	
-    		URL url;
-			if (wsdlURI.indexOf("://")==-1){
-				url = new URL("file","",wsdlURI);
-			}if (wsdlURI.indexOf(":/")==-1){
-				url = new URL("file","",wsdlURI);
-			}
-			else{
-				url = new URL(wsdlURI);	
-			}
-
-			//FIXME @author soi - 
-		    // This quick fix assume that the wsdlURI points to a wsdl 1.1 version.
-			// A better fix should be to determine which builder to use based on the wsdl version. 
-			// The current implementation of the wsdl builder classes did not allow for this. 
-			// I will suggestthat the determination of which builder to use should be done in
-			// the builder classes, preferably in the parent builder class. Accessable through a
-			// static reference to a method like getBuilderInstance(String wsdlURI) in the parent
-			//builder class or through a builder Abstract Factor or Abstract factory methods.
-			
-			
-			//WSDL11ToAxisServiceBuilder builder = new WSDL11ToAxisServiceBuilder(
-			//											url.openConnection().getInputStream());
-							//			builder.setBaseUri(getBaseUri(wsdlURI));
-							//			return builder.populateService();
-			
-			//Reflection invocation
-			//Class WSDL11ToAxisServiceBuilderClass = ClassLoadingUtil.loadClassFromAxis2LibPath(
-			//                projectName,
-			//                "org.apache.axis2.description.WSDL11ToAxisServiceBuilder");
-			
-			Class WSDL11ToAxisServiceBuilderClass = ClassLoadingUtil.loadClassFromAntClassLoader(
-					"org.apache.axis2.description.WSDL11ToAxisServiceBuilder");
-			Constructor constructor = WSDL11ToAxisServiceBuilderClass.getConstructor(
-					new Class[]{InputStream.class});
-			Object WSDL11ToAxisServiceBuilderInstance = constructor.newInstance(
-					new Object[]{url.openConnection().getInputStream()});
-			Method setBaseUriMethod = WSDL11ToAxisServiceBuilderClass.getMethod(
-					"setBaseUri", 
-					new Class[]{String.class});
-			setBaseUriMethod.invoke(
-					WSDL11ToAxisServiceBuilderInstance, 
-					new Object[]{wsdlURI});
-			
-			//Fix for the Axis2 1.2 
-			//builder.setCodegen(true);
-			Method setCodegenMethod = WSDL11ToAxisServiceBuilderClass.getMethod(
-					"setCodegen", 
-					new Class[]{boolean.class});
-			setCodegenMethod.invoke(
-					WSDL11ToAxisServiceBuilderInstance, 
-					new Object[]{true});
-			
-			Method populateServiceMethod = WSDL11ToAxisServiceBuilderClass.getMethod(
-					"populateService", 
-					null);
-			return populateServiceMethod.invoke(WSDL11ToAxisServiceBuilderInstance, null);
-			
-			//return this import org.apache.axis2.description.AxisService;
-    }
-
-    /**
-     * Converts a single String into a String Array
-     * 
-     * @param value a single string
-     * @return an array containing only one element
-     */
-    private String[] getStringArray(String value)
-    {
-       String[] values = new String[1];
-       values[0] = value;
-       return values;
-    }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/WSDLPropertyReader.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/WSDLPropertyReader.java
deleted file mode 100644
index 8aaacec..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/consumption/core/utils/WSDLPropertyReader.java
+++ /dev/null
@@ -1,239 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   184729 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-
-package org.eclipse.jst.ws.axis2.consumption.core.utils;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-
-
-/**
- * This class presents a convenient way of reading the 
- * WSDL file(url) and producing a useful set of information
- * It does NOT use any of the standard WSDL classes from 
- * Axis2, rather it uses wsdl4j to read the wsdl and extract 
- * the properties (This is meant as a convenience for the UI
- * only. We may not need the whole conversion the WSDLpump 
- * goes through)
- * One would need to change this to suit a proper WSDL 
- */
-public class WSDLPropertyReader {
-
-
-	//private Definition wsdlDefinition = null;
-	private Object DefinitionInstance = null;
-	private Class DefinitionClass = null;
-	private Class ServiceClass = null;
-
-	public void readWSDL(String projectName, String filepath) throws Exception {
-		
-		ClassLoadingUtil.init(projectName);
-		
-		DefinitionClass = ClassLoadingUtil.loadClassFromAntClassLoader("javax.wsdl.Definition");
-		
-		//		WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
-		//		wsdlDefinition = reader.readWSDL(filepath); 
-
-		Class WSDLFactoryClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader("javax.wsdl.factory.WSDLFactory");
-		Method newInstanceMethod = WSDLFactoryClass.getMethod("newInstance", null);
-		Object WSDLFactoryObject = newInstanceMethod.invoke(null, null);
-		Class WSDLFactoryImplClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader(WSDLFactoryObject.getClass().getName());
-		Method newWSDLReaderMethod = WSDLFactoryImplClass.getMethod("newWSDLReader", null);
-		Object WSDLReaderObject = newWSDLReaderMethod.invoke(WSDLFactoryObject, null);
-		Class WSDLReaderClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader(WSDLReaderObject.getClass().getName());
-		Method readWSDLMethod = WSDLReaderClass.getMethod("readWSDL", new Class[]{String.class});
-		DefinitionInstance = readWSDLMethod.invoke(WSDLReaderObject, new Object[]{filepath});
-
-	}
-
-	/**
-	 * Returns the namespace map from definition
-	 * @return
-	 */
-	public Map getDefinitionNamespaceMap(){
-		//return wsdlDefinition.getNamespaces();
-		Map map = null;
-		try {
-			Method getNamespacesMethod = DefinitionClass.getMethod("getNamespaces", null);
-			map = (Map)getNamespacesMethod.invoke(DefinitionInstance, null);
-		} 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 map;
-	}
-
-	/**
-	 * get the default package derived by the targetNamespace
-	 */
-	public String packageFromTargetNamespace(){
-		//return  URLProcessor.makePackageName(wsdlDefinition.getTargetNamespace());
-		String returnString = null;
-		try{
-			Method getTargetNamespaceMethod = DefinitionClass.getMethod("getTargetNamespace", null);
-			String packageName = (String)getTargetNamespaceMethod.invoke(DefinitionInstance, null);
-			Class URLProcessorClass = ClassLoadingUtil
-					.loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
-			Method makePackageNameMethod = URLProcessorClass
-					.getMethod("makePackageName", new Class[]{String.class});
-			returnString = (String)makePackageNameMethod.invoke(null, new Object[]{packageName});
-		} 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 returnString;
-	}
-
-	/**
-	 * Returns a list of service names
-	 * the names are QNames
-	 * @return
-	 */
-	public List getServiceList(){
-		//Service service = null;
-		//Map serviceMap = wsdlDefinition.getServices();
-		//service = (Service)serviceIterator.next();
-		//returnList.add(service.getQName());
-		List returnList = new ArrayList();
-		try{
-			Object serviceInstance;
-			Method getServicesMethod = DefinitionClass.getMethod("getServices", null);
-			Map serviceMap = (Map)getServicesMethod.invoke(DefinitionInstance, null);
-
-			if(serviceMap!=null && !serviceMap.isEmpty()){
-				Iterator serviceIterator = serviceMap.values().iterator();
-				while(serviceIterator.hasNext()){
-					ServiceClass = ClassLoadingUtil
-							.loadClassFromAntClassLoader("javax.wsdl.Service");
-					Method getQNameMethod = ServiceClass.getMethod("getQName", null);
-					serviceInstance = (Object)serviceIterator.next();
-					returnList.add(getQNameMethod.invoke(serviceInstance, null));   
-				}
-			}
-		} 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 returnList;
-	}
-
-	/**
-	 * Returns a list of ports for a particular service
-	 * the names are QNames
-	 * @return
-	 */
-	public List getPortNameList(Object serviceName){
-		//List returnList = new ArrayList();
-		//Service service = wsdlDefinition.getService(serviceName);
-		//Port port = null; 
-		//if(service!=null){
-		//	Map portMap = service.getPorts();
-		//	if (portMap!=null && !portMap.isEmpty()){
-		//		Iterator portIterator = portMap.values().iterator();
-		//		while(portIterator.hasNext()){
-		//			port = (Port)portIterator.next();
-		//			returnList.add(port.getName());
-		//		}
-		//	}
-		//}
-		//return returnList;
-
-		List returnList = new ArrayList();
-		try{	
-			Method getServiceMethod = DefinitionClass
-						.getMethod("getService", new Class[]{serviceName.getClass()});
-			Object serviceInstance = getServiceMethod
-						.invoke(DefinitionInstance, new Object[]{serviceName});
-			Object portInstance = null;
-			if(serviceInstance!=null){
-				Method getPortsMethod = ServiceClass.getMethod("getPorts", null);
-				Map portMap = (Map)getPortsMethod.invoke(serviceInstance, null);
-				if (portMap!=null && !portMap.isEmpty()){
-					Iterator portIterator = portMap.values().iterator();
-					while(portIterator.hasNext()){
-						portInstance = (Object)portIterator.next();
-						Class PortClass = ClassLoadingUtil
-								.loadClassFromAntClassLoader("javax.wsdl.Port");
-						Method getNameMethod = PortClass.getMethod("getName", null);
-						returnList.add(getNameMethod.invoke(portInstance,null)); 
-					}
-				}
-
-			}
-		} 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 returnList;
-	}
-	
-    /**
-     * public method to get loaded wsdl Definition Instance
-     * @return
-     */
-    public Object getWsdlDefinitionInstance() {
-            return DefinitionInstance;
-    }
-    
-    /**
-     * public method to get loaded Definition Class
-     * @return
-     */
-    public Class getWsdlDefinitionClass() {
-            return DefinitionClass;
-    }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/creation/core/data/DataModel.java b/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/creation/core/data/DataModel.java
deleted file mode 100644
index 78ad0b3..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.consumption.core/src/org/eclipse/jst/ws/axis2/creation/core/data/DataModel.java
+++ /dev/null
@@ -1,166 +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.axis2.creation.core.data;
-
-import org.eclipse.jst.ws.axis2.consumption.core.data.Model;
-
-public class DataModel extends Model{
-	
-	//Client Side
-	private String serviceClass;
-	private boolean generateServicesXML;
-	private boolean servicesXML;
-	private boolean generateAAR;
-	private String  pathToServicesXML;
-	private String  pathToWebServicesTempDir;
-	
-	//Server Side 
-	private boolean generateServerSideInterface;
-    private boolean serverXMLCheck;
-	private boolean generateAllCheck;
-	private boolean testCaseCheck;
-	private String databindingType;
-	private String namespaseToPackageMapping;
-
-
-	public boolean isGenerateServicesXML(){
-		return generateServicesXML;
-	}
-
-	public void setGenerateServicesXML(boolean generateServicesXML){
-		this.generateServicesXML = generateServicesXML;
-	}
-
-	public String getPathToServicesXML(){
-		return pathToServicesXML;
-	}
-
-	public void setPathToServicesXML(String pathToServicesXML){
-		this.pathToServicesXML = pathToServicesXML;
-	}
-
-	public boolean isGenerateAAR() {
-		return generateAAR;
-	}
-
-	public void setGenerateAAR(boolean generateAAR) {
-		this.generateAAR = generateAAR;
-	}
-
-	public boolean isServicesXML() {
-		return servicesXML;
-	}
-
-	public void setServicesXML(boolean servicesXML) {
-		this.servicesXML = servicesXML;
-	}
-
-	public String getPathToWebServicesTempDir() {
-		return pathToWebServicesTempDir;
-	}
-
-	public void setPathToWebServicesTempDir(String pathToWebServicesTempDir) {
-		this.pathToWebServicesTempDir = pathToWebServicesTempDir;
-	}
-
-	public String getWsdlURI() {
-		return super.getWsdlURI();
-	}
-
-	public void setWsdlURI(String wsdlURI) {
-		super.setWsdlURI(wsdlURI);
-	}
-
-	public String getDatabindingType() {
-		return databindingType;
-	}
-
-	public void setDatabindingType(String databindingType) {
-		this.databindingType = databindingType;
-	}
-
-	public boolean isGenerateAllCheck() {
-		return generateAllCheck;
-	}
-
-	public void setGenerateAllCheck(boolean generateAllCheck) {
-		this.generateAllCheck = generateAllCheck;
-	}
-
-	public boolean isGenerateServerSideInterface() {
-		return generateServerSideInterface;
-	}
-
-	public void setGenerateServerSideInterface(boolean generateServerSideInterface) {
-		this.generateServerSideInterface = generateServerSideInterface;
-	}
-
-	public String getPortName() {
-		return super.getPortName();
-	}
-
-	public void setPortName(String portName) {
-		super.setPortName(portName);
-	}
-
-	public boolean isServerXMLCheck() {
-		return serverXMLCheck;
-	}
-
-	public void setServerXMLCheck(boolean serverXMLCheck) {
-		this.serverXMLCheck = serverXMLCheck;
-	}
-
-	public String getServiceName() {
-		return super.getServiceName();
-	}
-
-	public void setServiceName(String serviceName) {
-		super.setServiceName(serviceName);
-	}
-
-	public boolean isTestCaseCheck() {
-		return testCaseCheck;
-	}
-
-	public void setTestCaseCheck(boolean testCaseCheck) {
-		this.testCaseCheck = testCaseCheck;
-	}
-
-	public String getPackageText() {
-		return super.getPackageText();
-	}
-
-	public void setPackageText(String packageText) {
-		super.setPackageText(packageText);
-	}
-
-	public String getServiceClass() {
-		return serviceClass;
-	}
-
-	public void setServiceClass(String serviceClass) {
-		this.serviceClass = serviceClass;
-	}
-
-	public String getNamespaseToPackageMapping() {
-		return namespaseToPackageMapping;
-	}
-
-	public void setNamespaseToPackageMapping(String namespaseToPackageMapping) {
-		this.namespaseToPackageMapping = namespaseToPackageMapping;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/.classpath b/bundles/org.eclipse.jst.ws.axis2.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/.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.core/.project b/bundles/org.eclipse.jst.ws.axis2.core/.project
deleted file mode 100644
index 2230d2d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis2.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis2.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e7793f..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,57 +0,0 @@
-#Tue Mar 20 10:45:04 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.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 73fba01..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/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.core;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.ws.axis2.core.plugin.WebServiceAxis2CorePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.apache.ant,
- org.eclipse.ui,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.wst.common.project.facet.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.j2ee.web,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.wst.common.environment,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.command.env.ui
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.ws.axis2.core.context,
- org.eclipse.jst.ws.axis2.core.plugin,
- org.eclipse.jst.ws.axis2.core.plugin.data,
- org.eclipse.jst.ws.axis2.core.plugin.messages,
- org.eclipse.jst.ws.axis2.core.utils
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/build.properties b/bundles/org.eclipse.jst.ws.axis2.core/build.properties
deleted file mode 100644
index 21048dc..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/build.properties
+++ /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
-# -------- -------- -----------------------------------------------------------
-# 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/icons/axis2-facet-add.gif b/bundles/org.eclipse.jst.ws.axis2.core/icons/axis2-facet-add.gif
deleted file mode 100644
index e862ced..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/icons/axis2-facet-add.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/icons/axis2-facet.ico b/bundles/org.eclipse.jst.ws.axis2.core/icons/axis2-facet.ico
deleted file mode 100644
index 0e52a10..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/icons/axis2-facet.ico
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis2.core/plugin.properties
deleted file mode 100644
index e7b1282..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/plugin.properties
+++ /dev/null
@@ -1,32 +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
-# -------- -------- -----------------------------------------------------------
-# 20070405   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 Core Plug-in
-PLUGIN_PROVIDER=WSO2
-
-AXIS2_CATOGERY_LABEL=Axis2 Web Services
-AXIS2_CATOGERY_DISCRIPTION=Enables Web Services generation through Axis2 Web services engine.
-
-AXIS2_FACET_CORE_LABEL=Axis2 Web Services Core
-AXIS2_FACET_CORE_DISCRIPTION=Prepare the Project for Web Services generation through Axis2 Web services engine.
-
-
-AXIS2_FACET_EXT_LABEL=Axis2 Web Services Extensions
-AXIS2_FACET_EXT_DISCRIPTION=Prepare the Project for additional Web services support with the Axis2 Web services runtime.
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis2.core/plugin.xml
deleted file mode 100644
index 6f5ca1f..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/plugin.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<plugin>
-
-	<extension point="org.eclipse.wst.common.project.facet.core.facets">
-	
-	  <category id="axis2.category">
-    	<label>%AXIS2_CATOGERY_LABEL</label>
-    	<description>%AXIS2_CATOGERY_DISCRIPTION</description>
-  	  </category>
-
-		  <project-facet id="axis2.core">
-			<label>%AXIS2_FACET_CORE_LABEL</label>
-			<description>%AXIS2_FACET_CORE_DISCRIPTION</description>
-			<member category="axis2.category "/>
-		  </project-facet>
-
-		<project-facet-version facet="axis2.core" version="1.1">
-		    <constraint>
-      			<requires facet="jst.web" version="2.2,2.3,2.4"/>
-    		</constraint>
-    		<action type="INSTALL">
-      			<delegate class="org.eclipse.jst.ws.axis2.facet.deligate.Axis2CoreFacetInstallDelegate"/>
-    		</action>
-    		<action type="UNINSTALL">
-      			<delegate class="org.eclipse.jst.ws.axis2.facet.deligate.Axis2CoreFacetUnInstallDelegate"/>
-    		</action>
-  		</project-facet-version>
-
-		  <project-facet id="axis2.ext">
-			<label>%AXIS2_FACET_EXT_LABEL</label>
-			<description>%AXIS2_FACET_EXT_DISCRIPTION</description>
-			<member category="axis2.category" />
-		  </project-facet>
-
-		<project-facet-version facet="axis2.ext" version="1.1">
-		    <constraint>
-      			<requires facet="axis2.core" version="1.1"/>
-    		</constraint>
-    		<action type="INSTALL">
-      			<delegate class="org.eclipse.jst.ws.axis2.facet.deligate.Axis2ExtFacetInstallDelegate"/>
-    		</action>
-    		<action type="UNINSTALL">
-      			<delegate class="org.eclipse.jst.ws.axis2.facet.deligate.Axis2ExtFacetUnInstallDelegate"/>
-    		</action>
-  		</project-facet-version>
-  
-	</extension>
-	
-	<extension point="org.eclipse.wst.common.project.facet.ui.images">
-  		<image facet="axis2.core" path="icons/axis2-facet-add.gif"/>
-  		<image facet="axis2.ext" path="icons/axis2-facet-add.gif"/>
-  		<image category="axis2.category" path="icons/axis2-facet.ico"/>
-	</extension>
-	
-	<extension
-       point="org.eclipse.wst.common.project.facet.core.runtimes">
-    <supported>
-      <runtime-component
-         any="true"/>
-      <facet
-         id="axis2.core"
-         version="1.1"/>
-      <facet
-         id="axis2.ext"
-         version="1.1"/>
-    </supported>
-   </extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/ServiceContext.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/ServiceContext.java
deleted file mode 100644
index b2b41a8..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/context/ServiceContext.java
+++ /dev/null
@@ -1,43 +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
- * 20070508   175030 sandakith@wso2.com - Lahiru Sandakith, Refactor BuServiceContext 
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.context;
-
-public class ServiceContext {
-	
-	private static ServiceContext instance;
-	private static String serviceName; 
-	
-	//singleton
-	private ServiceContext(){}
-	
-	public static ServiceContext getInstance(){
-		if (instance == null) {
-			instance = new ServiceContext();
-		}
-		return instance;
-	}
-
-	public String getServiceName() {
-		return serviceName;
-	}
-
-	public void setServiceName(String serviceName) {
-		ServiceContext.serviceName = serviceName;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/WebServiceAxis2CorePlugin.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/WebServiceAxis2CorePlugin.java
deleted file mode 100644
index 5c77ed7..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/WebServiceAxis2CorePlugin.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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WebServiceAxis2CorePlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.axis2.core";
-
-	// The shared instance
-	private static WebServiceAxis2CorePlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public WebServiceAxis2CorePlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#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 WebServiceAxis2CorePlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/data/ServerModel.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/data/ServerModel.java
deleted file mode 100644
index 81e2e4c..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/data/ServerModel.java
+++ /dev/null
@@ -1,141 +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
- * -------- -------- -----------------------------------------------------------
- * 20070213   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse 
- * 										the Axis2 runtime to the framework for 168762
- * 20070420   168762 sandakith@wso2.com - Lahiru Sandakith, Include the preference 
- * 										persist model parameters
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.plugin.data;
-
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-
-public class ServerModel {
-	
-	//Axis2 Runtime
-	private static String axis2ServerPath;
-	private static boolean axis2ServerPathRepresentsWar;
-	
-	//Axis2 Preferences
-	//Service Codegen Options
-	private static String serviceDatabinding = Axis2CoreUIMessages.ADB;
-	private static boolean serviceTestcase = false;
-	private static boolean serviceInterfaceSkeleton = false;
-	private static boolean serviceGenerateAll = false;
-	
-	//Client Codegen Options
-	private static boolean sync = false;
-	private static boolean async = false;
-	private static String cleintDatabinding = Axis2CoreUIMessages.ADB;
-	private static boolean clientTestcase = false;
-	private static boolean clientGenerateAll = false;
-	
-	//Service Archive Options
-	private static String aarExtention = Axis2CoreUIMessages.AAR;
-
-	public static String getAxis2ServerPath() {
-		return axis2ServerPath;
-	}
-
-	public static void setAxis2ServerPath(String axis2ServerPathParam) {
-		axis2ServerPath = axis2ServerPathParam;
-	}
-
-	public static boolean isAxis2ServerPathRepresentsWar() {
-		return axis2ServerPathRepresentsWar;
-}
-	public static void setAxis2ServerPathRepresentsWar(
-			boolean axis2ServerPathRepresentsWar) {
-		ServerModel.axis2ServerPathRepresentsWar = axis2ServerPathRepresentsWar;
-	}
-
-	public static String getAarExtention() {
-		return aarExtention;
-	}
-
-	public static void setAarExtention(String aarExtention) {
-		ServerModel.aarExtention = aarExtention;
-	}
-
-	public static boolean isAsync() {
-		return async;
-	}
-
-	public static void setAsync(boolean async) {
-		ServerModel.async = async;
-	}
-
-	public static String getCleintDatabinding() {
-		return cleintDatabinding;
-	}
-
-	public static void setCleintDatabinding(String cleintDatabinding) {
-		ServerModel.cleintDatabinding = cleintDatabinding;
-	}
-
-	public static boolean isClientGenerateAll() {
-		return clientGenerateAll;
-	}
-
-	public static void setClientGenerateAll(boolean clientGenerateAll) {
-		ServerModel.clientGenerateAll = clientGenerateAll;
-	}
-
-	public static boolean isClientTestcase() {
-		return clientTestcase;
-	}
-
-	public static void setClientTestcase(boolean clientTestcase) {
-		ServerModel.clientTestcase = clientTestcase;
-	}
-
-	public static String getServiceDatabinding() {
-		return serviceDatabinding;
-	}
-
-	public static void setServiceDatabinding(String serviceDatabinding) {
-		ServerModel.serviceDatabinding = serviceDatabinding;
-	}
-
-	public static boolean isServiceGenerateAll() {
-		return serviceGenerateAll;
-	}
-
-	public static void setServiceGenerateAll(boolean serviceGenerateAll) {
-		ServerModel.serviceGenerateAll = serviceGenerateAll;
-	}
-
-	public static boolean isServiceInterfaceSkeleton() {
-		return serviceInterfaceSkeleton;
-	}
-
-	public static void setServiceInterfaceSkeleton(boolean serviceInterfaceSkeleton) {
-		ServerModel.serviceInterfaceSkeleton = serviceInterfaceSkeleton;
-	}
-
-	public static boolean isServiceTestcase() {
-		return serviceTestcase;
-	}
-
-	public static void setServiceTestcase(boolean serviceTestcase) {
-		ServerModel.serviceTestcase = serviceTestcase;
-	}
-
-	public static boolean isSync() {
-		return sync;
-	}
-
-	public static void setSync(boolean sync) {
-		ServerModel.sync = sync;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUI.properties b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUI.properties
deleted file mode 100644
index cdf5e34..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUI.properties
+++ /dev/null
@@ -1,79 +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
-# 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
-# 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
-# 20070508   184450 sandakith@wso2.com - Lahiru Sandakith fix 184450, more information for user
-# 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
-# 20070510   172926 sandakith@wso2.com - Lahiru Sandakith, Fix 172926 Use Util Classes
-###############################################################################
-
-LABEL_BROUSE=Browse
-LABEL_WEB_SERVICE_CODEGEN=Web service codegen options
-LABEL_WEB_SERVICE_CLIENT_CODEGEN=Web service client codegen options
-LABEL_WEB_SERVICE_AAR=Web service archive options
-LABEL_DATABINDING=Default Databinding
-LABEL_AAR_EXTENTION=AAR default extension
-LABEL_AXIS2_RUNTIME_LOAD=Axis2 runtime loaded successfully  !!!
-LABEL_AXIS2_RUNTIME_LOAD_ERROR=Error occurred during loading Axis2 Runtime\n Please select the correct Axis2 runtime folder !!
-LABEL_GENERATE_TESTCASE_CAPTION=Generate test case to test the service
-LABEL_GENERATE_SERVERSIDE_INTERFACE=Generate an interface for skeleton
-LABEL_GENERATE_ALL=Generate all types for all elements referred by schemas
-LABEL_CLIENT_SIDE=Client mode
-LABEL_SYNC_AND_ASYNC=Generate both sync and async
-LABEL_SYNC=Generate sync style only
-LABEL_ASYNC=Generate async style only
-
-DIR_TEMPWAR=tempwar
-DIR_EXPLOADED_TEMPWAR=exploadedwar
-DIR_LIB=lib
-
-FILE_AXIS2_WAR=axis2.war
-
-
-NULL=
-ADB=adb
-AAR=aar
-AXIS2_LOCATION=Axis2 Runtime
-AXIS2_RUNTIME=Axis2 Runtime
-AXIS2_PREFERENCES=Axis2 Preferences
-AXIS2_RUNTIME_TOOLTIP=Browse and select Axis2 Binary distribution folder or folder contains Axis2 war distribution
-AXIS2_PREFERENCES_TOOLTIP=Please select the default preferences for Axis2 Runtime
-AXIS2_RUNTIME_LOCATION=Axis2 Runtime Location
-AXIS2_RUNTIME_PREFERENCES=Axis2 Runtime Preferences
-LABEL_AXIS2_RUNTIME_NOT_EXIT=Browse and select location of the Axis2 binary distribution or\n the folder which contains the Axis2 war distribution. 
-ERROR_INVALID_AXIS2_SERVER_LOCATION=Invalid Axis2 Webapp location
-TEMP_AXIS2_FACET_DIR=org.apache.axis2.facet
-DIR_DOT_METADATA=.metadata
-DIR_DOT_PLUGINS=.plugins
-DIR_UNZIP=unzip
-
-LOCAL_SERVER_PORT=http://localhost:8080
-SERVICES=services
-
-WEBAPP_EXPLODED_SERVER_LOCATION_FILE=server.properties
-SERVER_STATUS_LOCATION_FILE=status.properties
-WAR_STATUS_LOCATION_FILE=war.properties
-
-
-PROPERTY_KEY_PATH=path
-PROPERTY_KEY_STATUS=status
-
-SERVER_STATUS_PASS=pass
-SERVER_STATUS_FAIL=fail
-
-ERROR_INVALID_FILE_READ_WRITEL=Exception occurred while reading or writing file {0}
-ERROR_SERVER_IS_NOT_SET=The Axis2 facets cannot be installed since the Axis2 runtime location has not been set.  \nPlease go to the Web Services preference page and set the Axis2 runtime location under Axis2 Preferences.
-
-PROGRESS_INSTALL_AXIS2_RUNTIME=Installing Axis2 Runtime...
-PROGRESS_UNINSTALL_AXIS2_RUNTIME=UnInstalling the Axis2 Runtime...
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java
deleted file mode 100644
index 4f67e6e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/plugin/messages/Axis2CoreUIMessages.java
+++ /dev/null
@@ -1,91 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- * 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
- * 20070510   172926 sandakith@wso2.com - Lahiru Sandakith, Fix 172926 Use Util Classes
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.plugin.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Axis2CoreUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = 
-			"org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUI";//$NON-NLS-1$
-
-	private Axis2CoreUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String LABEL_BROUSE;
-	public static String LABEL_WEB_SERVICE_CODEGEN;
-	public static String LABEL_WEB_SERVICE_CLIENT_CODEGEN;
-	public static String LABEL_WEB_SERVICE_AAR;
-	public static String LABEL_AAR_EXTENTION;
-	public static String LABEL_DATABINDING;
-	public static String LABEL_AXIS2_RUNTIME_LOAD;
-	public static String LABEL_AXIS2_RUNTIME_LOAD_ERROR;
-	public static String LABEL_AXIS2_RUNTIME_NOT_EXIT;
-	public static String LABEL_GENERATE_TESTCASE_CAPTION;
-	public static String LABEL_GENERATE_SERVERSIDE_INTERFACE;
-	public static String LABEL_GENERATE_ALL;
-	public static String LABEL_CLIENT_SIDE;
-	public static String LABEL_SYNC_AND_ASYNC;
-	public static String LABEL_SYNC;
-	public static String LABEL_ASYNC;
-	
-	public static String DIR_TEMPWAR;
-	public static String DIR_EXPLOADED_TEMPWAR;
-	public static String DIR_DOT_METADATA;
-	public static String DIR_LIB;
-	public static String DIR_DOT_PLUGINS;
-	public static String DIR_UNZIP;
-
-	public static String FILE_AXIS2_WAR;
-	
-	public static String AXIS2_LOCATION;
-	public static String AXIS2_RUNTIME;
-	public static String AXIS2_PREFERENCES;
-	public static String AXIS2_RUNTIME_TOOLTIP;
-	public static String AXIS2_PREFERENCES_TOOLTIP;
-	public static String TEMP_AXIS2_FACET_DIR;
-	public static String WEBAPP_EXPLODED_SERVER_LOCATION_FILE;
-	public static String SERVER_STATUS_LOCATION_FILE;
-	public static String WAR_STATUS_LOCATION_FILE;
-	public static String NULL;
-	public static String ADB;
-	public static String AAR;
-	public static String PROPERTY_KEY_PATH;
-	public static String PROPERTY_KEY_STATUS;
-	public static String LOCAL_SERVER_PORT;
-	public static String SERVICES;
-	public static String AXIS2_RUNTIME_LOCATION;
-	public static String AXIS2_RUNTIME_PREFERENCES;
-
-	public static String SERVER_STATUS_PASS;
-	public static String SERVER_STATUS_FAIL;
-
-	public static String ERROR_INVALID_AXIS2_SERVER_LOCATION;
-	public static String ERROR_INVALID_FILE_READ_WRITEL;
-	public static String ERROR_SERVER_IS_NOT_SET;
-
-	
-	public static String PROGRESS_INSTALL_AXIS2_RUNTIME;
-	public static String PROGRESS_UNINSTALL_AXIS2_RUNTIME;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Axis2CoreUIMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java
deleted file mode 100644
index 06a749a..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/Axis2CoreUtils.java
+++ /dev/null
@@ -1,76 +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
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.utils;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-
-public class Axis2CoreUtils {
-	
-	private static boolean alreadyComputedTempAxis2Directory = false;
-	private static String tempAxis2Dir = null;
-	
-	public static String tempAxis2Directory() {
-		if (!alreadyComputedTempAxis2Directory){
-			String[] nodes = {Axis2CoreUIMessages.DIR_DOT_METADATA,
-								Axis2CoreUIMessages.DIR_DOT_PLUGINS,
-								Axis2CoreUIMessages.TEMP_AXIS2_FACET_DIR};
-			tempAxis2Dir =FileUtils.addNodesToPath(
-					ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(), nodes); 
-			alreadyComputedTempAxis2Directory= true;
-		}
-		return tempAxis2Dir;
-	}
-	
-	public static String tempAxis2WebappFileLocation() {
-		return
-		addAnotherNodeToPath(tempAxis2Directory(),
-							 Axis2CoreUIMessages.WEBAPP_EXPLODED_SERVER_LOCATION_FILE);
-	}
-	
-	
-	public static String tempRuntimeStatusFileLocation() {
-		return
-		addAnotherNodeToPath(tempAxis2Directory(),
-							 Axis2CoreUIMessages.SERVER_STATUS_LOCATION_FILE);
-	}
-	
-	public static String tempWarStatusFileLocation() {
-		return
-		addAnotherNodeToPath(tempAxis2Directory(),
-							 Axis2CoreUIMessages.WAR_STATUS_LOCATION_FILE);
-	}
-	
-	public static String addAnotherNodeToPath(String currentPath, String newNode) {
-		return currentPath + File.separator + newNode;
-	}
-	
-	public static void  writePropertyToFile(File file,String key, String value) throws IOException {
-		Writer out = new BufferedWriter(new OutputStreamWriter(
-						new FileOutputStream(file), "8859_1"));
-	       out.write(key+"="+value+"\n");
-	       out.close();
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/ClassLoadingUtil.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/ClassLoadingUtil.java
deleted file mode 100644
index b735d1f..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/ClassLoadingUtil.java
+++ /dev/null
@@ -1,128 +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.axis2.core.utils;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
-
-public class ClassLoadingUtil {
-
-	private static String[] axis2ClassPath = null;
-	private static String[] classLoadPath = null;
-	private static int libCount = 0;
-	private static AntClassLoader antClassLoader;
-	private static boolean libsLoaded = false;
-	private static URL[] urls = null;
-	private static boolean alreadyInit = false;
-	private static boolean initByClient = false;
-	
-	public static void init(String project) {
-		if (!alreadyInit) {
-
-		//Obtain a ant class loader instance
-			if(antClassLoader==null){
-		antClassLoader =  new AntClassLoader();
-			}
-		
-		// Set the class loader to child first
-		antClassLoader.setParentFirst(false);
-		
-			if (!(axis2ClassPath ==null) || !libsLoaded){
-				classLoadPath = getAxis2Libs(project);
-			}
-			
-			if(urls == null){
-				urls= new URL[classLoadPath.length];
-			}
-
-		Path classpath = new Path(new Project());
-		
-		try{
-			for (int i = 0; i < classLoadPath.length; i++) {
-				//Create a File object on the root of the directory containing the class file
-				if(classLoadPath[i]!=null){
-					File file = new File(classLoadPath[i]);
-					// Convert File to a URL
-					URL url = file.toURL();          
-					urls[i]= url;
-					classpath.setPath(classLoadPath[i]);
-				}
-			}
-			
-		}catch(MalformedURLException e){
-			e.printStackTrace();
-		}
-			antClassLoader.setClassPath(classpath);
-			alreadyInit = true;
-				}
-			}
-
-	
-	
-	public static Class loadClassFromAntClassLoader(String fillyQualifiedClassName){
-		
-		Class cls = null;
-		try{	
-			cls = antClassLoader.loadClass(fillyQualifiedClassName);
-		} catch (ClassNotFoundException e) {
-			e.printStackTrace();
-		}
-		return cls;
-	}
-	
-	
-	private static String[] getAxis2Libs(String project){
-		File webContainerPath = new File(FacetContainerUtils.pathToWebProjectContainerLib(project));
-		axis2ClassPath = new String[webContainerPath.list().length];
-		libCount = 0;
-		visitAllFiles(webContainerPath);
-		return axis2ClassPath;
-	}
-
-
-	public static void visitAllFiles(File dir) {
-		if(!dir.toString().endsWith(".txt")){
-			if (dir.isDirectory()) {
-
-				String[] children = dir.list();
-				for (int i=0; i<children.length; i++) {
-					visitAllFiles(new File(dir, children[i]));
-				}
-
-			} else {
-				axis2ClassPath[libCount]=dir.getAbsolutePath();
-				libCount+=1;
-			}
-
-		}
-		libsLoaded = true;
-	}
-
-	public static void cleanAntClassLoader(){
-		if(initByClient){
-			antClassLoader.cleanup();
-			alreadyInit = false;
-		}
-}
-	public static void setInitByClient(boolean status){
-		initByClient = status;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java
deleted file mode 100644
index a013c6a..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FacetContainerUtils.java
+++ /dev/null
@@ -1,114 +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
- * -------- -------- -----------------------------------------------------------
- * 20070222  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070510   172926 sandakith@wso2.com - Lahiru Sandakith, Fix 172926 Use Util Classes
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.utils;
-
-import java.io.File;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-import org.eclipse.jst.ws.axis2.core.utils.Axis2CoreUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-
-public class FacetContainerUtils {
-
-	public static String  pathToWebProjectContainer(String project) {
-
-		String workspaceDirectory = ResourcesPlugin.getWorkspace().getRoot()
-												   .getLocation().toOSString();
-		String projectString = replaceEscapecharactors(project.toString());
-
-		String currentDynamicWebProjectDir = J2EEUtils.getWebContentPath(
-				ResourcesPlugin.getWorkspace().getRoot().getProject(
-						getProjectNameFromFramewokNameString(projectString)
-						)).toOSString();
-
-		String webContainerDirString = Axis2CoreUtils.addAnotherNodeToPath(
-				workspaceDirectory,
-				currentDynamicWebProjectDir);
-		
-		return webContainerDirString;
-	}
-	
-	
-	public static String pathToWebProjectContainerLib(String project){
-
-		String workspaceDirectory = ResourcesPlugin.getWorkspace().getRoot()
-		   								.getLocation().toOSString();
-		
-		String webContainerWEBINF = J2EEUtils.getWebInfPath(
-						ResourcesPlugin.getWorkspace().getRoot().getProject(
-						getProjectNameFromFramewokNameString(project))).toOSString();
-		
-		String webContainerWEBINFString = Axis2CoreUtils.addAnotherNodeToPath(
-															workspaceDirectory,
-															webContainerWEBINF);
-		return  Axis2CoreUtils.addAnotherNodeToPath(
-				webContainerWEBINFString,
-				Axis2CoreUIMessages.DIR_LIB);
-		
-	}
-	
-	
-	
-	//Fix for the windows build not working
-	private static String replaceEscapecharactors(String vulnarableString){
-		if (vulnarableString.indexOf("/")!=-1){
-			vulnarableString = vulnarableString.replace('/', File.separator.charAt(0));
-		}
-		return vulnarableString;
-	}
-	
-	
-	private static String getProjectNameFromFramewokNameString(String frameworkProjectString){
-		if (frameworkProjectString.indexOf(getSplitCharactor())== -1){
-			return frameworkProjectString;
-		}else{
-			return frameworkProjectString.split(getSplitCharactors())[1];
-		}
-		
-	}
-	
-	
-	private static String getSplitCharactor(){
-		//Windows check (because from inside wtp in return I received a hard coded path)
-		if (File.separatorChar == '\\'){
-			return "\\" ;
-		}else{
-			return File.separator;
-		}
-	}
-	
-	private static String getSplitCharactors(){
-		//Windows check (because from inside wtp in return I received a hard coded path)
-		if (File.separatorChar == '\\'){
-			return "\\" + File.separator;
-		}else{
-			return File.separator;
-		}
-	}
-	
-	
-	public static String getDeployedWSDLURL(String projectName, String serviceName){
-		//TODO get the hostname and port from eclispe runtime  
-		String[] deployedWSDLURLParts = {projectName.split("Client")[0],
-										 Axis2CoreUIMessages.SERVICES,
-										 serviceName
-										 };
-		return FileUtils.addNodesToURL(Axis2CoreUIMessages.LOCAL_SERVER_PORT, 
-										deployedWSDLURLParts)+"?wsdl";
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FileUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FileUtils.java
deleted file mode 100644
index 6a453fa..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/FileUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation, 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
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation, WSO2 Inc. - Initial API and implementation
- * 20070110   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.axis2.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class FileUtils
-{
-	public FileUtils(){
-		super();
-	}
-
-	public static void copyFile(String src, String dest) {
-		InputStream is = null;
-		FileOutputStream fos = null;
-
-		try
-		{
-			is = new FileInputStream(src);
-			fos = new FileOutputStream(dest);
-			int c = 0;
-			byte[] array = new byte[1024];
-			while ((c = is.read(array)) >= 0){
-				fos.write(array, 0, c);
-			}
-		}
-		catch (Exception e)	{
-			e.printStackTrace();
-		}
-		finally	{
-			try	{
-				fos.close();
-				is.close();
-			}
-			catch (Exception e)	{
-				e.printStackTrace();
-			}
-		}
-	}
-
-	public static File createFileAndParentDirectories(String fileName) throws Exception {
-		File file = new File(fileName);
-		File parent = file.getParentFile();
-		if (!parent.exists()){
-			parent.mkdirs();
-		}
-		file.createNewFile();
-		return file;
-	}
-	
-	public static boolean deleteDir(File dir) {
-        if (dir.isDirectory()) {
-            String[] children = dir.list();
-            for (int i=0; i<children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
-                if (!success) {
-                    return false;
-                }
-            }
-        }
-        return dir.delete();
-    }
-
-	public static void deleteDirectories(File dir) {
-		File[] children = dir.listFiles();
-		for (int i = 0; i < children.length; i++){
-			if (children[i].list() != null && children[i].list().length > 0){
-				deleteDirectories(children[i]);
-			}
-			else{
-				children[i].delete();
-			}
-		}
-		dir.delete();
-	}
-
-	public static void deleteDirectories(String dir) {
-		File directory = new File(dir);
-		deleteDirectories(directory);
-	}
-
-	public static void createTargetFile(String sourceFileName, String targetFileName) 
-							throws Exception {
-		createTargetFile(sourceFileName, targetFileName, false);
-	}
-
-	public static void createTargetFile(String sourceFileName, String targetFileName, 
-						boolean overwrite) throws Exception{
-		File idealResultFile = new File(targetFileName);
-		if (overwrite || !idealResultFile.exists())
-		{
-			FileUtils.createFileAndParentDirectories(targetFileName);
-			FileUtils.copyFile(sourceFileName, targetFileName);
-		}
-	}
-
-	public static boolean createDirectory(String directory){
-		// Create a directory; all ancestor directories must exist
-		boolean success = (new File(directory)).mkdir();
-		if (!success) {
-			// Directory creation failed
-		}
-		return success;  
-	}
-
-	public static boolean createDirectorys(String directory){
-		// Create a directory; all ancestor directories must exist
-		boolean success = (new File(directory)).mkdirs();
-		if (!success) {
-			// Directory creation failed
-		}
-		return success;  
-	}
-
-	//Copies all files under srcDir to dstDir.
-	// If dstDir does not exist, it will be created.
-	public static void copyDirectory(File srcDir, File dstDir) throws IOException {
-		if (srcDir.isDirectory()) {
-			if (!dstDir.exists()) {
-				dstDir.mkdir();
-			}
-
-			String[] children = srcDir.list();
-			for (int i=0; i<children.length; i++) {
-				copyDirectory(new File(srcDir, children[i]),
-						new File(dstDir, children[i]));
-			}
-		} else {
-			copy(srcDir, dstDir);
-		}
-	}
-
-	//Copies src file to dst file.
-	// If the dst file does not exist, it is created
-	public static void copy(File src, File dst) throws IOException {
-		InputStream in = new FileInputStream(src);
-		OutputStream out = new FileOutputStream(dst);
-
-		// Transfer bytes from in to out
-		byte[] buf = new byte[1024];
-		int len;
-		while ((len = in.read(buf)) > 0) {
-			out.write(buf, 0, len);
-		}
-		in.close();
-		out.close();
-	}
-
-	public static String addAnotherNodeToPath(String currentPath, String newNode) {
-		return currentPath + File.separator + newNode;
-	}
-	
-	public static String addNodesToPath(String currentPath, String[] newNode) {
-		String returnPath=currentPath;
-		for (int i = 0; i < newNode.length; i++) {
-			returnPath = returnPath + File.separator + newNode[i];
-		}
-		return returnPath;
-	}
-	
-	public static String addNodesToPath(StringBuffer currentPath, String[] pathNodes) {
-		for (int i = 0; i < pathNodes.length; i++){
-			currentPath.append(File.separator);
-			currentPath.append(pathNodes[i]);
-		}
-		return currentPath.toString();
-	}
-	
-	public static String addNodesToURL(String currentPath, String[] newNode) {
-		String returnPath=currentPath;
-		for (int i = 0; i < newNode.length; i++) {
-			returnPath = returnPath + "/" + newNode[i];
-		}
-		return returnPath;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java
deleted file mode 100644
index e965ae4..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/core/utils/RuntimePropertyUtils.java
+++ /dev/null
@@ -1,189 +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
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.core.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-
-public class RuntimePropertyUtils {
-	private static File PropertiesFileDir,serverPropertiesFile,statusPropertyFile,warPropertyFile;
-	private static IStatus status;
-	private static Properties properties;
-	
-	private static void init(){
-		PropertiesFileDir = new File(Axis2CoreUtils.tempAxis2Directory());
-		if (!PropertiesFileDir.exists()){
-			PropertiesFileDir.mkdirs();
-		}
-		properties = new Properties();
-	}
-	
-	private static void serverPropertiesFileInit() throws IOException{
-		serverPropertiesFile = new File(Axis2CoreUtils.tempAxis2WebappFileLocation());
-		if (!serverPropertiesFile.exists()){
-			serverPropertiesFile.createNewFile();
-		}
-		properties.load(new FileInputStream(serverPropertiesFile));
-	}
-	
-	private static void statusPropertiesFileInit() throws IOException{
-		statusPropertyFile = new File(Axis2CoreUtils.tempRuntimeStatusFileLocation());
-		if (!statusPropertyFile.exists()){
-			statusPropertyFile.createNewFile();
-		}
-		properties.load(new FileInputStream(statusPropertyFile));
-	}
-	
-	private static void warPropertiesFileInit() throws IOException{
-		warPropertyFile = new File(Axis2CoreUtils.tempWarStatusFileLocation());
-		if (!warPropertyFile.exists()){
-			warPropertyFile.createNewFile();
-		}
-		properties.load(new FileInputStream(warPropertyFile));
-	}
-	
-	
-	
-	public static IStatus writeServerPathToPropertiesFile(String axis2Path) {
-		//Fix for properties file skipping the File seperator charactor 
-		// on windows when loading again
-		String axis2PathNew = null;
-		if ((axis2Path.indexOf("\\")) != -1) {
-			axis2PathNew = axis2Path.replace(File.separator, File.separator+File.separator);;
-		}else{
-			axis2PathNew=axis2Path;
-		}
-		try {
-			init();
-			serverPropertiesFileInit();
-			if(! (properties.size()== 0)){
-				if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_PATH)){
-					properties.remove(Axis2CoreUIMessages.PROPERTY_KEY_PATH);
-				}
-			}
-				Axis2CoreUtils.writePropertyToFile(serverPropertiesFile, 
-												   Axis2CoreUIMessages.PROPERTY_KEY_PATH,
-												   axis2PathNew);
-		} catch (FileNotFoundException e) {
-			updateStatusError();
-		} catch (IOException e) {
-			updateStatusError();
-		}
-		
-		return status;
-	}
-	
-	public static String getServerPathFromPropertiesFile(){
-		init();
-		String serverPath = null;
-		serverPropertiesFile = new File(Axis2CoreUtils.tempAxis2WebappFileLocation());
-		if (!serverPropertiesFile.exists()){
-			updateStatusError();			
-		}
-		try {
-			properties.load(new FileInputStream(serverPropertiesFile));
-			if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_PATH)){
-				serverPath = properties.getProperty(Axis2CoreUIMessages.PROPERTY_KEY_PATH);
-			}
-		} catch (FileNotFoundException e) {
-			updateStatusError();
-		} catch (IOException e) {
-			updateStatusError();
-		}
-		return serverPath;
-	}
-	
-	
-	public static IStatus writeServerStausToPropertiesFile(String runtimeStatus) {
-		try {
-			init();
-			statusPropertiesFileInit();
-			if(! (properties.size()== 0)){
-				if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
-					properties.remove(Axis2CoreUIMessages.PROPERTY_KEY_STATUS);
-				}
-			}
-			Axis2CoreUtils.writePropertyToFile(statusPropertyFile, 
-											   Axis2CoreUIMessages.PROPERTY_KEY_STATUS, 
-											   runtimeStatus);
-		} catch (FileNotFoundException e) {
-			updateStatusError(); 
-		} catch (IOException e) {
-			updateStatusError();
-		}
-		
-		return status;
-	}
-	
-	public static IStatus writeWarStausToPropertiesFile(boolean warStatus) {
-		try {
-			init();
-			warPropertiesFileInit();
-			if(! (properties.size()== 0)){
-				if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
-					properties.remove(Axis2CoreUIMessages.PROPERTY_KEY_STATUS);
-				}
-			}
-			Axis2CoreUtils.writePropertyToFile(warPropertyFile, 
-											   Axis2CoreUIMessages.PROPERTY_KEY_STATUS, 
-											   String.valueOf(warStatus));
-		} catch (FileNotFoundException e) {
-			updateStatusError(); 
-		} catch (IOException e) {
-			updateStatusError();
-		}
-		
-		return status;
-	}
-	
-	public static boolean getWarStatusFromPropertiesFile(){
-		init();
-		boolean warStatus = false;
-		warPropertyFile = new File(Axis2CoreUtils.tempWarStatusFileLocation());
-		if (!warPropertyFile.exists()){
-			updateStatusError();			
-		}
-		try {
-			properties.load(new FileInputStream(warPropertyFile));
-			if(properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
-				warStatus = Boolean.parseBoolean(
-						properties.getProperty(Axis2CoreUIMessages.PROPERTY_KEY_STATUS));
-			}
-		} catch (FileNotFoundException e) {
-			updateStatusError();
-		} catch (IOException e) {
-			updateStatusError();
-		}
-		return warStatus;
-	}
-
-	private static void updateStatusError(){
-			status = new Status( IStatus.ERROR, 
-					"id", 
-					0, 
-					Axis2CoreUIMessages.ERROR_INVALID_AXIS2_SERVER_LOCATION, 
-					null ); 
-		}
-		
-	}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java
deleted file mode 100644
index 4319d72..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/commands/Axis2WebservicesServerCommand.java
+++ /dev/null
@@ -1,103 +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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.commands;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-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.core.plugin.data.ServerModel;
-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.FacetContainerUtils;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-import org.eclipse.jst.ws.axis2.core.utils.RuntimePropertyUtils;
-import org.eclipse.jst.ws.axis2.facet.utils.Axis2RuntimeUtils;
-import org.eclipse.jst.ws.axis2.facet.utils.Axis2WebappUtils;
-import org.eclipse.jst.ws.axis2.facet.utils.ContentCopyUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2WebservicesServerCommand extends
-AbstractDataModelOperation {
-
-	String project;
-	public Axis2WebservicesServerCommand(String project){
-		this.project = project;
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-	throws ExecutionException {
-		return Status.OK_STATUS;
-	}
-	
-	public IStatus exexuteOverrride(IProgressMonitor monitor)  {
-		//Copy the axis2 libs in to this client project
-		IStatus status =null;
-		String runtimeLocation = null;
-		ContentCopyUtils contentCopyUtils = new ContentCopyUtils();
-		try {
-			if(ServerModel.isAxis2ServerPathRepresentsWar() 
-					|| RuntimePropertyUtils.getWarStatusFromPropertiesFile()){
-				runtimeLocation = Axis2RuntimeUtils.copyAxis2War(
-														monitor,
-														Axis2CoreUIMessages.PROPERTY_KEY_PATH);
-			}else{
-
-				runtimeLocation = Axis2WebappUtils.copyAxis2War(
-														monitor,
-														Axis2CoreUIMessages.PROPERTY_KEY_PATH);
-			}
-		} catch (FileNotFoundException e) {
-			return handleExceptionStatus(e);
-		} catch (IOException e) {
-			return handleExceptionStatus(e);
-		} catch (Exception e) {
-			return handleExceptionStatus(e);
-		}
-		status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
-				runtimeLocation, 
-				FacetContainerUtils.pathToWebProjectContainer(project), 
-				monitor 
-		);
-		status = Status.OK_STATUS;
-		//clean up tempory files
-		File tempFacetDirectory = new File(runtimeLocation);
-		if (tempFacetDirectory.exists() && ServerModel.isAxis2ServerPathRepresentsWar()) {
-			FileUtils.deleteDir(tempFacetDirectory);
-		}
-		return status;
-	}
-	
-	private void cleanupIfFacetStatusFailed(String runtimeLocation){
-		File tempFacetDirectory = new File(runtimeLocation);
-		if (tempFacetDirectory.exists()) {
-			FileUtils.deleteDir(tempFacetDirectory);
-		}
-	}
-	
-	private IStatus handleExceptionStatus(Exception e){
-		IStatus status = null;
-		status = new Status(1,project,1,Axis2CoreUIMessages.ERROR_SERVER_IS_NOT_SET,e);
-		cleanupIfFacetStatusFailed(Axis2CoreUtils.tempAxis2Directory());
-		return status;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java
deleted file mode 100644
index 5e0f5b7..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetInstallDelegate.java
+++ /dev/null
@@ -1,52 +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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.deligate;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-import org.eclipse.jst.ws.axis2.core.utils.RuntimePropertyUtils;
-import org.eclipse.jst.ws.axis2.facet.commands.Axis2WebservicesServerCommand;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class Axis2CoreFacetInstallDelegate implements IDelegate {
-	
-	private IStatus status;
-	
-	public void execute(IProject project, IProjectFacetVersion arg1, Object arg2,
-			IProgressMonitor monitor) throws CoreException {
-			monitor.beginTask(Axis2CoreUIMessages.PROGRESS_INSTALL_AXIS2_RUNTIME, 2 );
-	        	Axis2WebservicesServerCommand command = new Axis2WebservicesServerCommand(
-	        													project.toString()
-	        												); 
-	        	status = command.exexuteOverrride(monitor);
-	        	if (status.getCode() == Status.OK_STATUS.getCode() ){
-	        		RuntimePropertyUtils.writeServerStausToPropertiesFile(
-	        								Axis2CoreUIMessages.SERVER_STATUS_PASS);
-	        	}else{
-	        		RuntimePropertyUtils.writeServerStausToPropertiesFile(
-							Axis2CoreUIMessages.SERVER_STATUS_FAIL);
-	        		throw new CoreException(status);
-	        	}
-	            monitor.worked( 1 );
-	            monitor.done();
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetUnInstallDelegate.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetUnInstallDelegate.java
deleted file mode 100644
index 114407d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2CoreFacetUnInstallDelegate.java
+++ /dev/null
@@ -1,50 +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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.deligate;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-import org.eclipse.jst.ws.axis2.core.utils.FacetContainerUtils;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class Axis2CoreFacetUnInstallDelegate implements IDelegate {
-	
-	private IStatus status;
-	
-	public void execute(IProject project, IProjectFacetVersion arg1, Object arg2,
-			IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(Axis2CoreUIMessages.PROGRESS_UNINSTALL_AXIS2_RUNTIME, 2 );
-			File webContainerDir = new File(FacetContainerUtils.pathToWebProjectContainer(
-																project.toString()));
-			if (webContainerDir.isDirectory()) {
-				FileUtils.deleteDirectories(webContainerDir);
-			}
-			// TODO rollback the dynamic web project to the previous state.
-	        status = Status.OK_STATUS;
-			monitor.worked( 1 );
-	}
-	
-	public IStatus getStatus(){
-		return status;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2ExtFacetInstallDelegate.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2ExtFacetInstallDelegate.java
deleted file mode 100644
index 5d7f5cb..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2ExtFacetInstallDelegate.java
+++ /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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.deligate;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class Axis2ExtFacetInstallDelegate implements IDelegate {
-
-	public void execute(IProject arg0, IProjectFacetVersion arg1, Object arg2,
-			IProgressMonitor arg3) throws CoreException {
-			//TODO This will include the more requirements that needed to be automated
-			//	   when we cover the other RFE s in future.
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2ExtFacetUnInstallDelegate.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2ExtFacetUnInstallDelegate.java
deleted file mode 100644
index edc71cf..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/deligate/Axis2ExtFacetUnInstallDelegate.java
+++ /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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.deligate;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-
-public class Axis2ExtFacetUnInstallDelegate implements IDelegate {
-
-	public void execute(IProject arg0, IProjectFacetVersion arg1, Object arg2,
-			IProgressMonitor arg3) throws CoreException {
-			//TODO This will include the more requirements that needed to be automated
-			//	   when we cover the other RFE s in future.
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUI.properties b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUI.properties
deleted file mode 100644
index 1cb3d0c..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUI.properties
+++ /dev/null
@@ -1,17 +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
-# -------- -------- -----------------------------------------------------------
-# 20070214   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse 
-# 										  the Axis2 facet to the framework for 168762
-###############################################################################
-
-
-WEB_INF_LIB=WEB-INF/lib
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java
deleted file mode 100644
index 5f04b7e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/messages/Axis2FacetUIMessages.java
+++ /dev/null
@@ -1,34 +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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class Axis2FacetUIMessages extends NLS {
-
-	private static final String BUNDLE_NAME = 
-				"org.eclipse.jst.ws.axis2.facet.messages.Axis2FacetUI";//$NON-NLS-1$
-
-	private Axis2FacetUIMessages() {
-		// Do not instantiate
-	}
-
-	public static String WEB_INF_LIB;
-	
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Axis2FacetUIMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/model/FacetModel.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/model/FacetModel.java
deleted file mode 100644
index ba0d68e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/model/FacetModel.java
+++ /dev/null
@@ -1,29 +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
- * -------- -------- -----------------------------------------------------------
- * 20070222  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.model;
-
-public class FacetModel {
-	
-	private static String webFacetConinerDir;
-
-	public static String getWebFacetConinerDir() {
-		return webFacetConinerDir;
-	}
-
-	public static void setWebFacetConinerDir(String inputWebFacetConinerDir) {
-		webFacetConinerDir = inputWebFacetConinerDir;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/plugin/Axis2FacetPlugin.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/plugin/Axis2FacetPlugin.java
deleted file mode 100644
index c95e133..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/plugin/Axis2FacetPlugin.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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.plugin;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Axis2FacetPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.apache.axis2.facet";
-
-	// The shared instance
-	private static Axis2FacetPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Axis2FacetPlugin() {
-		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);
-	}
-
-	public static Axis2FacetPlugin getDefault() {
-		return plugin;
-	}
-	
-	public static Axis2FacetPlugin getInstance() {
-		return plugin;
-	}
-	
-    public static void log( final Exception e ){
-        final String msg = e.getMessage() + "";
-        log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, e ) );
-    }
-
-    public static void log( final IStatus status ){
-        getInstance().getLog().log( status );
-    }
-
-    public static void log( final String msg ){
-        log( new Status( IStatus.ERROR, PLUGIN_ID, IStatus.OK, msg, null ) );
-    }
-
-    public static IStatus createErrorStatus( final String msg ){
-        return createErrorStatus( msg, null );
-    }
-
-    public static IStatus createErrorStatus( final String msg,
-                                             final Exception e ){
-        return new Status( IStatus.ERROR, PLUGIN_ID, 0, msg, e );
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java
deleted file mode 100644
index 1c01722..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2RuntimeUtils.java
+++ /dev/null
@@ -1,185 +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
- * -------- -------- -----------------------------------------------------------
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.channels.FileChannel;
-import java.util.Enumeration;
-import java.util.Properties;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.axis2.core.plugin.data.ServerModel;
-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.FileUtils;
-
-public class Axis2RuntimeUtils {
-	
-	public static final int ZIP=0, UNZIP = 1;
-	protected static int mode = UNZIP;
-	static ZipFile zipFile;
-	protected static byte[] b;
-	static SortedSet createdDirs;
-	static String outputPath;
-
-	public static String  copyAxis2War(IProgressMonitor monitor, String Axis2Home)
-							throws FileNotFoundException, IOException{
-		String tempWarFile = null;
-		String tempWarLocation = null;
-		String  tempUnzipLocation = null;
-		try {
-			if (new File (Axis2CoreUtils.tempAxis2Directory()).isDirectory()) {
-				tempWarLocation = Axis2CoreUtils.addAnotherNodeToPath(
-															Axis2CoreUtils.tempAxis2Directory(),
-															Axis2CoreUIMessages.DIR_TEMPWAR);
-			File tempWarLocationFile= new File(tempWarLocation);
-			if (tempWarLocationFile.exists()) {
-				FileUtils.deleteDirectories(tempWarLocationFile);
-			}
-			tempWarLocationFile.mkdirs();
-			tempWarFile = Axis2CoreUtils.addAnotherNodeToPath(
-															tempWarLocation,	
-															Axis2CoreUIMessages.FILE_AXIS2_WAR);
-			new File(tempWarFile).createNewFile();
-			Properties properties = new Properties();
-			properties.load(new FileInputStream(Axis2CoreUtils.tempAxis2WebappFileLocation()));
-				if (properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_PATH)){
-					String axis2WarFile = Axis2CoreUtils.addAnotherNodeToPath(
-													(ServerModel.getAxis2ServerPath()!=null)
-													?ServerModel.getAxis2ServerPath()
-													:properties.getProperty(
-															Axis2CoreUIMessages.PROPERTY_KEY_PATH),
-																Axis2CoreUIMessages.FILE_AXIS2_WAR);
-					FileChannel srcChannel = new FileInputStream(axis2WarFile).getChannel();
-					FileChannel dstChannel = new FileOutputStream(tempWarFile).getChannel();
-					// Copy file contents from source to destination
-					dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
-					// Close the channels
-					srcChannel.close();
-					dstChannel.close();
-				
-				//unzip this into another foulder
-				tempUnzipLocation = FileUtils.addAnotherNodeToPath(tempWarLocation, 
-											Axis2CoreUIMessages.DIR_UNZIP);
-				File tempUnzipLocationFile= new File(tempUnzipLocation);
-				if (!tempUnzipLocationFile.exists()) {
-					tempUnzipLocationFile.mkdirs();
-				}
-				unzipAxis2War(tempWarFile,tempUnzipLocation );
-
-				}
-				
-			} else {
-				//Throws an error message
-			}
-		} catch (FileNotFoundException e) {
-			throw e;	
-		} catch (IOException e) {
-			throw e;
-		}
-
-		return tempUnzipLocation;
-	}
-	
-	
-	private static void unzipAxis2War(String fileName,String outputPath){
-	      b = new byte[8092];
-	      setOutputPath(outputPath);
-	      if (fileName.endsWith(".war") )
-	        unZip(fileName);
-	      else
-	    	  throw new IllegalStateException("Wrong file type" + fileName);
-	}
-
-	/** For a given Zip file, process each entry. */
-	public static void unZip(String fileName) {
-	
-	  createdDirs = new TreeSet();
-	  try {
-	    zipFile = new ZipFile(fileName);
-	    Enumeration all = zipFile.entries();
-	    while (all.hasMoreElements()) {
-	      unzipFile((ZipEntry) all.nextElement());
-	    }
-	  } catch (IOException e) {
-	    e.printStackTrace();
-	  }
-	}
-
-	
-	protected static void unzipFile(ZipEntry e) throws IOException {
-
-	  boolean warnedMkDir = false;
-	    String zipName = e.getName();
-	    switch (mode) {
-	    case UNZIP:
-	      if (zipName.startsWith("/")) {
-	        if (!warnedMkDir)
-	        warnedMkDir = true;
-	        zipName = zipName.substring(1);
-	      }
-	      if (zipName.endsWith("/")) {
-	        return;
-	      }
-	      int ix = zipName.lastIndexOf('/');
-	      if (ix > 0) {
-	        String dirName = zipName.substring(0, ix);
-	        if (!createdDirs.contains(dirName)) {
-	          File d = new File(getOutputPath()+File.separator+dirName);
-	          if (!(d.exists() && d.isDirectory())) {
-	            if (!d.mkdirs()) {
-	              throw new IllegalStateException("Warning: unable to mkdir " + dirName);
-	            }
-	            createdDirs.add(dirName);
-	          }
-	        }
-	      }
-          FileOutputStream os = new FileOutputStream(getOutputPath()+File.separator+zipName);
-	      InputStream is = zipFile.getInputStream(e);
-	      int n = 0;
-	      while ((n = is.read(b)) > 0)
-	        os.write(b, 0, n);
-	      is.close();
-	      os.close();
-	      break;
-	    default:
-	      throw new IllegalStateException("mode value (" + mode + ") bad");
-	    }
-	  }
-
-	
-
-	public static String getOutputPath() {
-		return outputPath;
-	}
-
-
-	public static void setOutputPath(String outputPath) {
-		Axis2RuntimeUtils.outputPath = outputPath;
-	}
-
-		    
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java
deleted file mode 100644
index 3b19342..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/Axis2WebappUtils.java
+++ /dev/null
@@ -1,108 +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
- * -------- -------- -----------------------------------------------------------
- * 20070410 168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070501   180284 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   185686 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.ws.axis2.core.plugin.data.ServerModel;
-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.FileUtils;
-
-public class Axis2WebappUtils {
-
-	private static String tempWarLocation = null;
-	private static boolean alreadyWarExist = false;
-
-	public static String  copyAxis2War(IProgressMonitor monitor, String Axis2Home)
-										throws FileNotFoundException, IOException{
-		if(!alreadyWarExist){
-			File tempAxis2Directory = new File (Axis2CoreUtils.tempAxis2Directory());
-			if(!tempAxis2Directory.exists()){
-				tempAxis2Directory.mkdirs();
-			}
-			if (tempAxis2Directory.isDirectory()) {
-				tempWarLocation = Axis2CoreUtils.addAnotherNodeToPath(
-						Axis2CoreUtils.tempAxis2Directory(),
-						Axis2CoreUIMessages.DIR_EXPLOADED_TEMPWAR);
-				File tempWarLocationFile= new File(tempWarLocation);
-				if (tempWarLocationFile.exists()) {
-					FileUtils.deleteDirectories(tempWarLocationFile);
-				}
-				tempWarLocationFile.mkdirs();
-				Properties properties = new Properties();
-				properties.load(new FileInputStream(Axis2CoreUtils.tempAxis2WebappFileLocation()));
-				if (properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_PATH)){
-					String axis2HomeLocation = (ServerModel.getAxis2ServerPath()!=null)
-									?ServerModel.getAxis2ServerPath()
-									:properties.getProperty(Axis2CoreUIMessages.PROPERTY_KEY_PATH);
-					String axis2WebappLocation = Axis2CoreUtils.addAnotherNodeToPath(
-							axis2HomeLocation,
-							"webapp");
-					String axis2LibFile = Axis2CoreUtils.addAnotherNodeToPath(
-							axis2HomeLocation,
-					"lib");
-					String axis2ConfFile = Axis2CoreUtils.addAnotherNodeToPath(
-							axis2HomeLocation,
-					"conf");
-					String axis2RepositoryFile = Axis2CoreUtils.addAnotherNodeToPath(
-							axis2HomeLocation,
-					"repository");
-					String axis2TempWebInfFile = Axis2CoreUtils.addAnotherNodeToPath(
-							tempWarLocation,
-					"WEB-INF");
-					String axis2TempWebInfLibFile = Axis2CoreUtils.addAnotherNodeToPath(
-							axis2TempWebInfFile,
-					"lib");
-					String axis2TempWebInfConfFile = Axis2CoreUtils.addAnotherNodeToPath(
-							axis2TempWebInfFile,
-					"conf");
-					String axis2TempWebBuildFile = Axis2CoreUtils.addAnotherNodeToPath(
-							tempWarLocation,
-					"build.xml");
-
-					//Copy the webapp content 
-					FileUtils.copyDirectory(new File(axis2WebappLocation), tempWarLocationFile);
-					//delete the build.xml File
-					new File(axis2TempWebBuildFile).delete();
-					//Copy libs 
-					FileUtils.copyDirectory(new File(axis2LibFile),
-											new File(axis2TempWebInfLibFile));
-					//copy conf/axis2.xml
-					FileUtils.copyDirectory(new File(axis2ConfFile), 
-											new File(axis2TempWebInfConfFile));
-					//Copy modules and services 					
-					FileUtils.copyDirectory(new File(axis2RepositoryFile), 
-											new File(axis2TempWebInfFile));
-					alreadyWarExist= true;
-				}
-
-			} else {
-				alreadyWarExist = false;
-				//Throws an error message
-			}
-		}	
-		return tempWarLocation;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/ContentCopyUtils.java b/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/ContentCopyUtils.java
deleted file mode 100644
index 7b82867..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.core/src/org/eclipse/jst/ws/axis2/facet/utils/ContentCopyUtils.java
+++ /dev/null
@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation, 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
- * -------- -------- -----------------------------------------------------------
- * IBM Corporation,  WSO2 Inc. - initial API and implementation
- * WSO2 Inc. - initial extended API and implementation
- * 20070213  168766 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  facet to the framework for 168766
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.facet.utils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.plugin.messages.Axis2CoreUIMessages;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
-
-public class ContentCopyUtils {
-
-	private static IWorkspaceRoot root_ = null;
-	private static IWorkspace workspace_ = null;
-	private List fileAndDirectoriesList = new ArrayList();
-	FileInputStream finStream = null;		
-
-	/**
-	 * This method will copy the source directory into the eclipse workspace 
-	 * according to the Eclipse Framework API
-	 * @param sourceDir
-	 * @param destinationDir
-	 * @param monitor
-	 * @param statusHandler
-	 * @return
-	 */
-	public IStatus copyDirectoryRecursivelyIntoWorkspace(String sourceDir, 
-									String destinationDir,IProgressMonitor monitor) {
-		IStatus status = Status.OK_STATUS;
-		fileAndDirectoriesList.clear();
-		File axis2WebappFolder = new File(sourceDir);
-		visitAllDirsAndFiles(axis2WebappFolder);
-		List deployFiles = new ArrayList();
-		deployFiles= fileAndDirectoriesList;
-
-		try {
-
-			//Import the axis2 dependency plugin according to the Resources API of eclipse 
-			ResourceContext context = WebServicePlugin.getInstance().getResourceContext();	
-
-			IPath outputPath = new Path (destinationDir);
-
-			String fileName;
-			IPath targetPath=null;
-			boolean isDirectory = false;
-
-			String deployFile;
-			Iterator iterator;
-
-			String tempOutputDir = axis2WebappFolder.toString();
-			iterator = deployFiles.iterator();
-			while (iterator.hasNext()) {
-				deployFile = (String) iterator.next();
-				File source = new File(deployFile);
-				if (source.isDirectory()) {
-					isDirectory =true;
-				}else{
-					isDirectory=false;
-					finStream = new FileInputStream(source);
-				}
-
-				if (deployFile.startsWith(tempOutputDir)) {
-					fileName = deployFile.substring(tempOutputDir.length());
-					targetPath = outputPath.append(fileName).makeAbsolute();
-					if (isDirectory){
-						makeFolderPathAtLocation(context,  
-								targetPath,
-								monitor);
-					}else{
-						if (finStream != null) {
-							createFileAtLocation(context,  
-									targetPath,
-									finStream,
-									monitor);
-						}
-						finStream.close();
-					}
-				}
-			}
-		} catch (IOException e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2CoreUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-							 new String[]{e.getLocalizedMessage()}), e);
-		} catch (CoreException e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2CoreUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-							 new String[]{e.getLocalizedMessage()}), e);
-		}
-
-		return status;
-
-	}
-
-	//	Process all files and directories under dir
-	private void visitAllDirsAndFiles(File dir) {
-
-		fileAndDirectoriesList.add(dir.getAbsolutePath());
-
-		if (dir.isDirectory()) {
-			String[] children = dir.list();
-			for (int i=0; i<children.length; i++) {
-				visitAllDirsAndFiles(new File(dir, children[i]));
-			}
-		}
-	}
-	
-	
-	
-	private static IFolder makeFolder (
-		    ResourceContext  resourceContext,
-		    IContainer       parent,
-		    String           folderName,
-		    IProgressMonitor progressMonitor )
-		  
-		  throws CoreException
-		  {
-		    IResource child  = parent.findMember(folderName);
-		    if( child == null )
-		    {
-		      IFolder folder = parent.getFolder(new Path(folderName));
-		      folder.create(true,true,null);
-		      return folder;
-		    }
-		    else if( child.getType() == IResource.FOLDER )
-		    {
-		      return (IFolder)child;
-		    }
-		    else
-		    {
-		      throw new CoreException(
-		        new Status( IStatus.ERROR, 
-		                    "ResourceUtils",
-		                    0, 
-		                    NLS.bind("ERROR",//EnvironmentMessages.MSG_ERROR_RESOURCE_NOT_FOLDER,
-							                 new Object[]{ parent.getFullPath().append(folderName).toString() }),
-					null ) );
-		    }
-		  }
-
-	
-	public static IContainer makeFolderPathAtLocation (
-			   ResourceContext  resourceContext,
-			   IContainer       resource,
-			   IProgressMonitor progressMonitor )
-			 
-			   throws CoreException
-			   {
-				 if (resource.exists())
-				 {
-					 if (resource instanceof IContainer)
-					 {
-						 return (IContainer) resource;
-					 }
-					 else
-					 {
-						 throw new CoreException(
-								 new Status( IStatus.ERROR, 
-										 "ResourceUtils",
-										 0, 
-										 NLS.bind("ERROR",
-												 new Object[]{ resource.getFullPath().toString() }),
-												 null ) );
-					 }
-				 }
-				 else
-				 {
-					 IContainer parent = makeFolderPathAtLocation(resourceContext, 
-							 			resource.getParent(), 
-							 			progressMonitor );
-					 String folderName = resource.getName();
-					 
-					 return makeFolder(resourceContext, parent, folderName, progressMonitor  );
-				 }
-			 }
-	
-	
-	 /**
-	  * Creates a path of folders.
-	  * Do not call with an absolutePath of less than one segment.
-	  * @param resourceContext the resource context for making folders.
-	  * @param absolutePath the path of folders that will be created.
-	  * @param progressMonitor the progress monitor to be used.
-	  * @param statusHandler the status handler.
-	  * @return returns the IContainer of the created folder.
-	  */
-	 public static IContainer makeFolderPathAtLocation (
-	   ResourceContext  resourceContext,
-	   IPath            absolutePath,
-	   IProgressMonitor progressMonitor )
-	 
-	   throws CoreException
-	 {
-	 	return makeFolderPathAtLocation(resourceContext,
-	 		getWorkspaceRoot().getContainerForLocation(absolutePath),
-	 		progressMonitor);
-	 }
-	 
-	 
-	 public static IWorkspaceRoot getWorkspaceRoot ()
-	  {
-	    if (root_ == null)
-	    {
-	      root_ = ResourcesPlugin.getWorkspace().getRoot();
-	    }
-	    return root_;
-	  }
-	
-	  public static IFile createFileAtLocation (
-			     ResourceContext resourceContext,
-			     IPath           absolutePath,
-			     InputStream     inputStream,
-			     IProgressMonitor progressMonitor )
-
-			     throws CoreException 
-			   {    
-			     if (!absolutePath.isAbsolute())
-			     {
-			       throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,
-			    		   NLS.bind("ERROR",//EnvironmentMessages.MSG_ERROR_PATH_NOT_ABSOLUTE,
-			    		   new Object[] {absolutePath.toString()}),null));
-			     }
-			     if (absolutePath.segmentCount() < 1)
-			     {
-			       throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,
-			    		   NLS.bind("ERROR",//EnvironmentMessages.MSG_ERROR_PATH_EMPTY,
-			    		   new Object[] {absolutePath.toString()}),null));
-			     }
-			     if (absolutePath.segmentCount() < 2)
-			     {
-			       throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,
-			    		   NLS.bind("ERROR",//EnvironmentMessages.MSG_ERROR_PATH_NOT_FOLDER,
-			    		   new Object[] {absolutePath.toString()}),null));
-			     }
-			     IContainer parent   = makeFolderPathAtLocation(resourceContext, 
-			    		 				absolutePath.removeLastSegments(1), progressMonitor);
-			     String     fileName = absolutePath.lastSegment();
-			     
-			     return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor);
-			   }
-	
-	
-	  private static IFile makeFile (
-			    ResourceContext  resourceContext,
-			    IContainer       parent,
-			    String           fileName,
-			    InputStream      inputStream,
-			    IProgressMonitor progressMonitor )
-			 
-			    throws CoreException
-			  {
-			    IResource child  = parent.findMember(fileName);
-			    
-			    if( child != null )
-			    {
-			      if( child.getType() == IResource.FILE )
-			      {
-			        //We have permission to overwrite so check if file is read-only
-			        if( child.getResourceAttributes().isReadOnly() )
-			        {
-			          IFile[] files = new IFile[1];
-			          files[0] = (IFile)child;
-			        }
-
-			        //Change the contents of the existing file.
-			        IFile file = parent.getFile( new Path(fileName) );
-			        file.setContents( inputStream, true, true, null );
-			        
-			        return file;
-			      
-			      }
-			      else
-			      {
-			        throw new CoreException( 
-			          new Status( IStatus.ERROR,
-			                      "ResourceUtils",
-			                      0, 
-			                      NLS.bind("ERROR",
-							                       new Object[] {parent.getFullPath().append(fileName)}),
-								  null ) );
-			      }
-			    }
-			    else
-			    {
-			      //Create a new file.
-			      IFile file = parent.getFile( new Path(fileName) );
-			      file.create( inputStream, true, null);
-			      
-			      return file;
-			    }
-			  }
-	  
-	  public static IWorkspace getWorkspace ()
-	  {
-	    if (workspace_ == null)
-	    {
-	      if (root_ == null)
-	      {
-	        root_ = ResourcesPlugin.getWorkspace().getRoot();
-	      }
-	      
-	      workspace_ = root_.getWorkspace();
-	    }
-	    
-	    return workspace_;
-	  }
-	  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/.classpath b/bundles/org.eclipse.jst.ws.axis2.creation.core/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/.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.core/.project b/bundles/org.eclipse.jst.ws.axis2.creation.core/.project
deleted file mode 100644
index b1c0d65..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis2.creation.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.jst.ws.axis2.creation.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5c552aa..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,62 +0,0 @@
-#Sun May 06 17:33:38 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.creation.core/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.jst.ws.axis2.creation.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 8322bb7..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Wed Feb 21 10:49:06 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.creation.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis2.creation.core/META-INF/MANIFEST.MF
deleted file mode 100644
index fd78b46..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis2.creation.core
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.jst.ws.axis2.creation.core.plugin.WebServiceAxis2CreationCorePlugin
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.command.env,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.infopop,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jst.ws.axis2.consumption.core,
- org.eclipse.jst.ws.axis2.core,
- org.apache.ant
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.jst.ws.axis2.creation.core.command,
- org.eclipse.jst.ws.axis2.creation.core.messages,
- org.eclipse.jst.ws.axis2.creation.core.plugin,
- org.eclipse.jst.ws.axis2.creation.core.utils
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: %PLUGIN_PROVIDER
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/build.properties b/bundles/org.eclipse.jst.ws.axis2.creation.core/build.properties
deleted file mode 100644
index a812408..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/build.properties
+++ /dev/null
@@ -1,19 +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
-# -------- -------- -----------------------------------------------------------
-# 20070507   185686 sandakith@wso2.com - Lahiru Sandakith
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis2.creation.core/plugin.properties
deleted file mode 100644
index e4346f9..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/plugin.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
-# -------- -------- -----------------------------------------------------------
-# 20070428   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
-# 20070507   185686 sandakith@wso2.com - Lahiru Sandakith
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis2 Creation Core Plug-in
-PLUGIN_PROVIDER=WSO2
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis2.creation.core/plugin.xml
deleted file mode 100644
index 1f01135..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-    
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUCommand.java
deleted file mode 100644
index bd5ffe1..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUCommand.java
+++ /dev/null
@@ -1,47 +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.axis2.creation.core.command;
-
-
-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.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class Axis2BUCommand extends AbstractDataModelOperation 
-{
-  private DataModel model;
-  
-  public Axis2BUCommand( DataModel model )
-  {
-    this.model = model;  
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-    IStatus status ;  
-    // Check for the nessesary data are available for the scenario to begin
-    if (model.getServiceClass() == null){
-		status = StatusUtils.errorStatus(Axis2CreationUIMessages.ERROR_INVALID_SERVICE_CREATION);
-    }else {
-		status = Status.OK_STATUS; // Ok to proceed 
-	}
-    return status;      	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java
deleted file mode 100644
index 59de544..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BUServiceCreationCommand.java
+++ /dev/null
@@ -1,152 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.core.utils.FileUtils;
-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.axis2.creation.core.utils.CommonUtils;
-import org.eclipse.jst.ws.axis2.creation.core.utils.ServiceXMLCreator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class Axis2BUServiceCreationCommand extends
-		AbstractDataModelOperation {
-	
-	  	private DataModel model;
-		private IWebService ws;
-
-	  public Axis2BUServiceCreationCommand( DataModel model,IWebService ws, String project )
-	  {
-	    this.model = model;  
-	    this.ws=ws;
-	  }
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		IStatus status = Status.OK_STATUS;  
-		IEnvironment environment = getEnvironment();
-		//The full Qulalified Service Class
-		String serviceClass = ws.getWebServiceInfo().getImplURL(); 
-		try {
-			
-//			String workspaceDirectory = ResourceUtils.getWorkspaceRoot().getLocation().toOSString();
-			String workspaceDirectory = ResourcesPlugin.getWorkspace()
-														.getRoot().getLocation().toOSString();
-			String currentDynamicWebProjectDir = FileUtils.addAnotherNodeToPath(workspaceDirectory, 
-														model.getWebProjectName());
-			String matadataDir = FileUtils.addAnotherNodeToPath(workspaceDirectory,
-														Axis2CreationUIMessages.DIR_DOT_METADATA);
-		    String matadataPluginsDir = FileUtils.addAnotherNodeToPath(matadataDir,
-		    											Axis2CreationUIMessages.DIR_DOT_PLUGINS);
-		    String matadataAxis2Dir = FileUtils.addAnotherNodeToPath(matadataPluginsDir, 
-		    											Axis2CreationUIMessages.AXIS2_PROJECT);
-		    String webservicesDir = FileUtils.addAnotherNodeToPath(matadataAxis2Dir,
-		    													   Axis2CreationUIMessages.DIR_WEBSERVICES);
-		    model.setPathToWebServicesTempDir(webservicesDir);
-		    
-			//Get the Service name from the class name
-		    String serviceName = CommonUtils.classNameFromQualifiedName(serviceClass); 
-		    //String servicePackage = CommonUtils.packageNameFromQualifiedName(serviceClass); 
-			
-			String servicesDirectory = FileUtils.addAnotherNodeToPath(webservicesDir, serviceName);
-			String serviceXMLDirectory = FileUtils.addAnotherNodeToPath(servicesDirectory, 
-														Axis2CreationUIMessages.DIR_META_INF);
-			
-			//Create the directories
-			//Create the Webservices stuff on the workspace .matadata directory  
-		    FileUtils.createDirectorys(servicesDirectory);
-		    FileUtils.createDirectorys(serviceXMLDirectory);		    
-		    
-		    //create the services.xml file
-		    File serviceXMLFile;
-            if (model.isGenerateServicesXML()){
-			    ServiceXMLCreator serviceXMLCreator = new ServiceXMLCreator(serviceName, 
-			    															serviceClass, 	
-			    															null);
-			    serviceXMLFile = new File(serviceXMLDirectory + File.separator + 
-			    						  Axis2CreationUIMessages.FILE_SERVICES_XML);
-			    FileWriter serviceXMLFileWriter;
-	
-				serviceXMLFileWriter = new FileWriter(serviceXMLFile, false);
-	            BufferedWriter writer = new BufferedWriter(serviceXMLFileWriter) ;
-	            writer.write(serviceXMLCreator.toString()) ;
-	            writer.close() ;
-            }else {
-            	String pathToServicesXML = model.getPathToServicesXML();
-            	if (pathToServicesXML == null){
-    				status = StatusUtils
-    					.errorStatus(Axis2CreationUIMessages.ERROR_INVALID_SERVICES_XML);
-    				environment.getStatusHandler().reportError(status); 
-            	}else{
-            		serviceXMLFile = new File(pathToServicesXML);
-            		File targetServicesXMLFile = new File(serviceXMLDirectory + File.separator + 
-            										Axis2CreationUIMessages.FILE_SERVICES_XML);
-            		FileUtils.copy(serviceXMLFile, targetServicesXMLFile);
-            	}
-            	
-            }
-	        
-            // Copy the classes directory to the sevices directory
-			String defaultClassesSubDirectory = Axis2CreationUIMessages.DIR_BUILD +File.separator+ 
-													Axis2CreationUIMessages.DIR_CLASSES;
-			//TODO copy only the relevent .classes to the aar
-			String classesDirectory = currentDynamicWebProjectDir + File.separator + 
-									  defaultClassesSubDirectory;
-			
-			FileUtils.copyDirectory(new File(classesDirectory), new File(servicesDirectory));
-			
-//			//Create the .aar file 
-//			String aarDirString =  FileUtils.addAnotherNodeToPath(webservicesDir, 
-//			Axis2CreationUIMessages.DIR_AAR);
-//			File aarDir = new File(aarDirString);
-//			FileUtils.createDirectorys(aarDirString);
-//			AARFileWriter aarFileWriter = new AARFileWriter();
-//			File serviseDir = new File(servicesDirectory);
-//			aarFileWriter.writeAARFile(aarDir, serviceName + 
-//			Axis2CreationUIMessages.FILE_AAR, serviseDir);
-			
-			//Import all the stuff form the .matadata directory to inside the current web project
-			} catch (IOException e) {
-				status = StatusUtils.errorStatus(
-						NLS.bind(Axis2CreationUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-								new String[]{e.getLocalizedMessage()}), e);
-				environment.getStatusHandler().reportError(status); 
-			} catch (Exception e) {
-				status = StatusUtils.errorStatus(
-						NLS.bind(Axis2CreationUIMessages.ERROR_INVALID_SERVICE_CREATION,
-								new String[]{e.getLocalizedMessage()}), e);
-				environment.getStatusHandler().reportError(status); 
-			}
-		    
-		
-	    
-	    return status;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BuildProjectCommand.java
deleted file mode 100644
index 626dccd..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2BuildProjectCommand.java
+++ /dev/null
@@ -1,104 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   185686 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-//import org.apache.xerces.impl.validation.ValidationManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2BuildProjectCommand extends
-		AbstractDataModelOperation {
-	
-//	  private ValidationManager validationManager;
-	  private IProject project;
-	  private boolean forceBuild;
-
-	  /**
-	   * Default CTOR;
-	   */
-	  public Axis2BuildProjectCommand(){
-	  }
-	  
-	  public Axis2BuildProjectCommand(IProject project){
-		  this.project = project;
-	  }
-	  
-	  public Axis2BuildProjectCommand(IProject project, boolean forceBuild){
-		  this.project = project;
-		  this.forceBuild = forceBuild;
-	  }
-
-	  /**
-	   * Execute the command
-	   */
-	  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	  {
-	    try
-	    {
-	      if (forceBuild)
-	        project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-//	      else if (validationManager == null)
-//	        project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-//	      else if (validationManager.getWorkspaceAutoBuildPreference())
-//	        project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-	    }
-	    catch (Exception e){
-	    }
-	    
-	    try{
-	     Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,
-  		  		new NullProgressMonitor());   
-	    }
-	    catch (InterruptedException ie){
-	      // continue execution
-	    }
-	    catch (OperationCanceledException oce){
-	      // continue execution
-	    }
-	    
-	    return Status.OK_STATUS;
-	  }
-	  /**
-	   * @param forceBuild The forceBuild to set.
-	   */
-	  public void setForceBuild(boolean forceBuild) {
-	    this.forceBuild = forceBuild;
-	  }
-
-	  /**
-	   * @param project The project to set.
-	   */
-	  public void setProject(IProject project) {
-	    this.project = project;
-	  }
-
-//	  /**
-//	   * @param validationManager The validationManager to set.
-//	   */
-//	  public void setValidationManager(ValidationManager validationManager) {
-//	    this.validationManager = validationManager;
-//	  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2ChengeBuildPathCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2ChengeBuildPathCommand.java
deleted file mode 100644
index 1fb540a..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2ChengeBuildPathCommand.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
- * -------- -------- -----------------------------------------------------------
- * 20070125  168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2ChengeBuildPathCommand extends AbstractDataModelOperation {
-	
-	private IProject project;
-	private String srcDir;
-	private String outDir;
-	
-	public Axis2ChengeBuildPathCommand(IProject project, String srcDir, String outDir) {
-		this.project = project;
-		this.srcDir = srcDir;
-		this.outDir = outDir;
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-				   throws ExecutionException {
-		
-		IPath srcPath = new Path(srcDir);
-		IPath outPath = new Path(outDir);
-		
-		IStatus status = Status.OK_STATUS;
-		final IJavaProject jproj = JavaCore.create(project);
-        final IClasspathEntry[] cp = {JavaCore.newSourceEntry(srcPath)};
-
-        try {
-			jproj.setRawClasspath(cp, outPath, null);
-			jproj.save(null, true);
-		} catch (JavaModelException e) {
-			e.printStackTrace();
-		}
-		return status;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2CleanupCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2CleanupCommand.java
deleted file mode 100644
index b4bb82c..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2CleanupCommand.java
+++ /dev/null
@@ -1,37 +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
- * -------- -------- -----------------------------------------------------------
- * 20070314   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse 
- * 										the Axis2 runtime to the framework for 168762
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-
-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 Axis2CleanupCommand extends AbstractDataModelOperation 
-{
-  
-  public Axis2CleanupCommand(){
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-    // Cleanup the reflection over head by increasing the priority to the garbage thread
-    System.gc();
-    return Status.OK_STATUS;      	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java
deleted file mode 100644
index 50f1c80..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2DefaultingCommand.java
+++ /dev/null
@@ -1,110 +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
- * -------- -------- -----------------------------------------------------------
- * 20070206   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- * 20070508   175030 sandakith@wso2.com - Lahiru Sandakith, WSDL not passed to Axis2 client fix
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.Properties;
-
-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.DefaultCodegenUtil;
-import org.eclipse.jst.ws.axis2.core.context.ServiceContext;
-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.FacetContainerUtils;
-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.axis2.creation.core.utils.CommonUtils;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class Axis2DefaultingCommand extends AbstractDataModelOperation 
-{
-	private DataModel model;
-	private IWebService ws;
-	private int scenario;
-	IStatus status;
-
-	public Axis2DefaultingCommand( DataModel model ,IWebService ws, int scenario)
-	{
-		this.model = model;  
-		this.ws=ws;
-		this.scenario=scenario;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ){
-		//Check wether the current dynamic Web Project is properly build to invoke web service
-		Properties properties = new Properties();
-		try {
-			properties.load(new FileInputStream(Axis2CoreUtils.tempRuntimeStatusFileLocation()));
-			if (properties.containsKey(Axis2CoreUIMessages.PROPERTY_KEY_STATUS)){
-				 status = Status.OK_STATUS;
-				 model.setServerStatus(true);
-			}else{
-				status = StatusUtils.errorStatus(Axis2CoreUIMessages.ERROR_SERVER_IS_NOT_SET);
-			}
-		} catch (FileNotFoundException e) {
-			status = StatusUtils.errorStatus(Axis2CoreUIMessages.ERROR_INVALID_FILE_READ_WRITEL+
-												Axis2CoreUIMessages.ERROR_SERVER_IS_NOT_SET);
-		} catch (IOException e) {
-			status = StatusUtils.errorStatus(Axis2CoreUIMessages.ERROR_INVALID_FILE_READ_WRITEL+
-												Axis2CoreUIMessages.ERROR_SERVER_IS_NOT_SET);
-		}
-		
-		if (scenario == WebServiceScenario.TOPDOWN) {
-			model.setWsdlURI(ws.getWebServiceInfo().getWsdlURL());
-			model.setDatabindingType(Axis2CreationUIMessages.DATA_BINDING_ADB);
-			DefaultCodegenUtil defaultCodegenUtil = new DefaultCodegenUtil(model);
-			defaultCodegenUtil.populateModelParamsFromWSDL();
-			model.setServicesXML(true);
-			model.setServerXMLCheck(true);
-			ServiceContext.getInstance().setServiceName(model.getServiceName());
-		}else if (scenario == WebServiceScenario.BOTTOMUP) {
-			model.setServiceClass(ws.getWebServiceInfo().getImplURL());
-			//set the service name inside BUServiceContext for used by client if invoke together
-			ServiceContext.getInstance().setServiceName(
-					CommonUtils.classNameFromQualifiedName(ws.getWebServiceInfo().getImplURL())
-					);
-			
-			model.setGenerateServicesXML(true);
-		}else{
-			//never come here
-		}
-		
-		// Fix for the Bugzilla Bug 175030
-		// Axis2: WSDL representing Web service not passed to Axis2 client
-		// After setting the initial wsdlURL return from the framework to the data model,
-		// replace it with the deployed wsdlURL
-		String deployedWSDLURL = FacetContainerUtils.getDeployedWSDLURL(
-					model.getWebProjectName(),
-					ServiceContext.getInstance().getServiceName());
-		ws.getWebServiceInfo().setWsdlURL(deployedWSDLURL);
-		
-		
-		return status;      	
-	}
-
-	public DataModel getWebServiceDataModel()
-	{
-		return model;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2ServicesXMLValidationCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2ServicesXMLValidationCommand.java
deleted file mode 100644
index 974dcef..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2ServicesXMLValidationCommand.java
+++ /dev/null
@@ -1,32 +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.axis2.creation.core.command;
-
-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 Axis2ServicesXMLValidationCommand extends
-		AbstractDataModelOperation {
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-			throws ExecutionException {
-		//Here write the code to validate the services.xml
-	    IStatus status = Status.OK_STATUS; 
-	    return status;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java
deleted file mode 100644
index 6d1b04d..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2SkelImplCommand.java
+++ /dev/null
@@ -1,94 +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
- * -------- -------- -----------------------------------------------------------
- * 20070123   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.axis2.creation.core.command;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-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.axis2.creation.core.utils.CommonUtils;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
-
-public class Axis2SkelImplCommand extends AbstractDataModelOperation {
-
-	private WebServiceInfo webServiceInfo;
-	private DataModel model;
-
-	public Axis2SkelImplCommand(WebServiceInfo webServiceInfo, DataModel model){
-		this.webServiceInfo = webServiceInfo;
-		this.model=model;
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
-		
-		IStatus status = Status.OK_STATUS;
-		IEnvironment environment = getEnvironment();
-
-		String workspaceDirectory = ResourcesPlugin.getWorkspace().getRoot().
-													getLocation().toOSString();
-		String currentDynamicWebProjectDir = FileUtils.addAnotherNodeToPath(
-													   workspaceDirectory, 
-													   model.getWebProjectName());
-		String projectSrcDir =  FileUtils.addAnotherNodeToPath(
-											currentDynamicWebProjectDir, 
-											Axis2CreationUIMessages.DIR_SRC);
-
-		String packagePath = CommonUtils.packgeName2PathName(model.getPackageText());
-		String packageDir = FileUtils.addAnotherNodeToPath(projectSrcDir, packagePath);
-		String serviceSkeletonImpl = FileUtils.addAnotherNodeToPath(packageDir, model.
-																	getServiceName());
-
-		String serviceSkeletonImplURL =  serviceSkeletonImpl + 
-										 Axis2CreationUIMessages.SKELETON_SUFFIX;
-		IPath serviceSkeletonImplURLPath = new Path(serviceSkeletonImplURL); 
-		try {
-			//webServiceInfo.setImplURL(serviceSkeletonImplURLPath.toFile().toURL().toString());
-			//String[] implURLArray = {serviceSkeletonImplURL};
-			//webServiceInfo.setImplURLs( implURLArray);
-			
-			String serviceSkeletonImplURLString = 
-				serviceSkeletonImplURLPath.toFile().toURL().toString();
-
-			webServiceInfo.setImplURL(serviceSkeletonImplURLString);
-			String[] implURLArray = {serviceSkeletonImplURLString};
-			webServiceInfo.setImplURLs( implURLArray);
-
-			
-		} catch (MalformedURLException e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2CreationUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-							new String[]{e.getLocalizedMessage()}), e);
-			environment.getStatusHandler().reportError(status); 
-		}
-
-		return status;
-		
-	}
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDCommand.java
deleted file mode 100644
index e07e7d0..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDCommand.java
+++ /dev/null
@@ -1,47 +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.axis2.creation.core.command;
-
-
-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.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-
-public class Axis2TDCommand extends AbstractDataModelOperation 
-{
-  private DataModel model;
-  
-  public Axis2TDCommand( DataModel model )
-  {
-    this.model = model;  
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-    IStatus status = Status.OK_STATUS;  
-    // Check for the nessesary data are available for the scenario to begin
-    if (model.getWsdlURI() == null){
-		status = StatusUtils.errorStatus(Axis2CreationUIMessages.ERROR_INVALID_SERVICE_CREATION);
-    }else {
-		status = Status.OK_STATUS; // Ok to proceed 
-	}
-    return status;      	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java
deleted file mode 100644
index 5ff0794..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2TDServiceCreationCommand.java
+++ /dev/null
@@ -1,129 +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
- * -------- -------- -----------------------------------------------------------
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   184740 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.core.utils.FileUtils;
-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.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.IWebService;
-
-public class Axis2TDServiceCreationCommand extends
-AbstractDataModelOperation {
-	
-  	private DataModel model;
-
-  public Axis2TDServiceCreationCommand( DataModel model,IWebService ws, String project )
-  {
-    this.model = model;  
-  }
-
-public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-		throws ExecutionException {
-	IStatus status = Status.OK_STATUS;  
-	IEnvironment environment = getEnvironment();
-	//The full Qulalified Service Class
-//	String serviceDefinition = ws.getWebServiceInfo().getWsdlURL(); 
-	try {
-		
-//		String workspaceDirectory = ResourceUtils.getWorkspaceRoot().getLocation().toOSString();
-		String workspaceDirectory = ResourcesPlugin.getWorkspace()
-														.getRoot().getLocation().toOSString();
-		String currentDynamicWebProjectDir = FileUtils.addAnotherNodeToPath(workspaceDirectory, 
-														model.getWebProjectName());
-		String matadataDir = FileUtils.addAnotherNodeToPath(workspaceDirectory,
-														Axis2CreationUIMessages.DIR_DOT_METADATA);
-	    String matadataPluginsDir = FileUtils.addAnotherNodeToPath(matadataDir,
-	    												Axis2CreationUIMessages.DIR_DOT_PLUGINS);
-	    String matadataAxis2Dir = FileUtils.addAnotherNodeToPath(matadataPluginsDir, 
-	    												Axis2CreationUIMessages.AXIS2_PROJECT);
-	    String tempServicesDir = FileUtils.addAnotherNodeToPath(matadataAxis2Dir,
-	    													   Axis2CreationUIMessages.DIR_SERVICES);
-	    
-	    model.setPathToWebServicesTempDir(tempServicesDir);
-		
-	    //Exploded temperory services directory
-		String currentservicesDirectory = FileUtils.addAnotherNodeToPath(tempServicesDir, 
-														model.getServiceName());
-		String metaInfDirectory = FileUtils.addAnotherNodeToPath(currentservicesDirectory, 
-														Axis2CreationUIMessages.DIR_META_INF);
-		
-		//Create the directories
-		//Create the Webservices stuff on the workspace .matadata directory  
-	    FileUtils.createDirectorys(currentservicesDirectory);
-	    FileUtils.createDirectorys(metaInfDirectory);		    
-	    
-	    
-	    //copy the generated resources (services.xml .wsdl ) files
-	    //at resources/service.xml
-	    String currentProjectResourcesDirString = FileUtils
-	    		.addAnotherNodeToPath(currentDynamicWebProjectDir, 
-	    							  Axis2CreationUIMessages.DIR_RESOURCES);
-	    File currentProjectResourcesDir = new File(currentProjectResourcesDirString);
-	    if(!currentProjectResourcesDir.exists()){
-	    	currentProjectResourcesDir.mkdir();
-	    }
-	    FileUtils.copyDirectory(currentProjectResourcesDir, new File(metaInfDirectory));
-        
-        // Copy the classes directory to the sevices directory
-		String defaultClassesSubDirectory = Axis2CreationUIMessages.DIR_BUILD + File.separator + 
-											Axis2CreationUIMessages.DIR_CLASSES;
-		//TODO copy only the relevent .classes to the aar
-		String classesDirectory = currentDynamicWebProjectDir + File.separator + 
-											defaultClassesSubDirectory;
-		
-		FileUtils.copyDirectory(new File(classesDirectory), new File(currentservicesDirectory));
-		
-//		//Create the .aar file 
-//		String aarDirString =  FileUtils.addAnotherNodeToPath(webservicesDir, 
-// 		Axis2CreationUIMessages.DIR_AAR);
-//		File aarDir = new File(aarDirString);
-//		FileUtils.createDirectorys(aarDirString);
-//		AARFileWriter aarFileWriter = new AARFileWriter();
-//		File serviseDir = new File(servicesDirectory);
-//		aarFileWriter.writeAARFile(aarDir, serviceName + 
-//		Axis2CreationUIMessages.FILE_AAR, serviseDir);
-		
-		
-		//Import all the stuff form the .matadata directory to inside the current web project
-		} catch (IOException e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2CreationUIMessages.ERROR_INVALID_FILE_READ_WRITEL,
-							new String[]{e.getLocalizedMessage()}), e);
-			environment.getStatusHandler().reportError(status); 
-		} catch (Exception e) {
-			status = StatusUtils.errorStatus(
-					NLS.bind(Axis2CreationUIMessages.ERROR_INVALID_SERVICE_CREATION,
-							new String[]{e.getLocalizedMessage()}), e);
-			environment.getStatusHandler().reportError(status); 
-		}
-	    
-	
-    
-    return status;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WSDL2JavaCommand.java
deleted file mode 100644
index 3613578..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WSDL2JavaCommand.java
+++ /dev/null
@@ -1,192 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   184729 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.Map;
-
-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.ContentCopyUtils;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDL2JavaGenerator;
-import org.eclipse.jst.ws.axis2.consumption.core.utils.WSDLPropertyReader;
-import org.eclipse.jst.ws.axis2.core.utils.ClassLoadingUtil;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-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.axis2.creation.core.utils.PathLoadingUtil;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-
-public class Axis2WSDL2JavaCommand extends AbstractDataModelOperation {
-	
-	  private DataModel model;
-		
-	  public Axis2WSDL2JavaCommand( DataModel model ){
-	    this.model = model;  
-	  }
-
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-													 throws ExecutionException {
-		
-		IStatus status = Status.OK_STATUS;  
-		IEnvironment environment = getEnvironment();
-		IStatusHandler statusHandler = environment.getStatusHandler();	
-		
-		PathLoadingUtil.init(model);
-		String tempCodegenOutputLocation =PathLoadingUtil.getTempCodegenOutputLocation();
-		String currentDynamicWebProjectDir = PathLoadingUtil.getCurrentDynamicWebProjectDir();
-		
-		File tempCodegenLocationFile = new File(tempCodegenOutputLocation);
-		if (tempCodegenLocationFile.exists())FileUtils.deleteDirectories(tempCodegenOutputLocation);
-		FileUtils.createDirectorys(tempCodegenOutputLocation);
-        WSDL2JavaGenerator generator = new WSDL2JavaGenerator(); 
-        
-        //AxisService service;
-        Object axisServiceInstance;
-        
-	try {
-		//service = generator.getAxisService(model.getWsdlURI());
-		ClassLoadingUtil.init(model.getWebProjectName());
-		axisServiceInstance = generator.getAxisService(model.getWsdlURI());
-        Map optionsMap = generator.fillOptionMap(	
-        	false,  //async always false
-            false,	//sync always false
-            true,   //is serverside true
-            model.isServerXMLCheck(),
-            model.isTestCaseCheck(),
-            model.isGenerateAllCheck(),
-            (model.getServiceName()!=null)?model.getServiceName():null,
-            (model.getPortName()!=null)?model.getPortName():null,
-            (model.getDatabindingType().toLowerCase()!=null)?
-            		model.getDatabindingType().toLowerCase():
-            		null,
-            (model.getWsdlURI()!=null)?model.getWsdlURI():null,
-            (model.getPackageText()!=null)?model.getPackageText():null,
-            "java",
-            tempCodegenOutputLocation,
-            model.getNamespaseToPackageMapping(),
-            model.isGenerateServerSideInterface()
-          );
-        
-        
-        //CodeGenConfiguration codegenConfig = new CodeGenConfiguration(service, optionsMap);
-		Class CodeGenConfigurationClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader("org.apache.axis2.wsdl.codegen.CodeGenConfiguration");
-
-		//-----------------------------------------------------------------------------------//
-		//Fix for the Axis2 1.2 
-		//Constructor CodeGenConfigurationConstructor = CodeGenConfigurationClass
-		//		.getConstructor(new Class[]{axisServiceInstance.getClass(),Map.class});
-		//Object CodeGenConfigurationInstance = CodeGenConfigurationConstructor
-		//		.newInstance(new Object[]{axisServiceInstance,optionsMap});
-		
-		Constructor CodeGenConfigurationConstructor = CodeGenConfigurationClass
-				.getConstructor(new Class[]{Map.class});
-		Object CodeGenConfigurationInstance = CodeGenConfigurationConstructor
-				.newInstance(new Object[]{optionsMap});
-		
-		// codegenConfig.addAxisService(service);
-		Method addAxisServiceMethod = CodeGenConfigurationClass
-				.getMethod("addAxisService", new Class[]{ axisServiceInstance.getClass()});
-		addAxisServiceMethod.invoke(CodeGenConfigurationInstance, 
-							new Object[]{axisServiceInstance});
-		
-        //set the wsdl definision for codegen config for skeleton generarion.
-        WSDLPropertyReader reader = new WSDLPropertyReader();
-        reader.readWSDL(model.getWebProjectName(),model.getWsdlURI());
-        Object wsdlDefinitionInstance = reader.getWsdlDefinitionInstance();
-        //Class DefinitionClass = ClassLoadingUtil.loadClassFromAntClassLoader("javax.wsdl.Definition");
-        //codegenConfig.setWsdlDefinition(wsdlDefinition);
-		Method setWsdlDefinitionMethod = CodeGenConfigurationClass
-				.getMethod("setWsdlDefinition", new Class[]{reader.getWsdlDefinitionClass()});
-		setWsdlDefinitionMethod.invoke(CodeGenConfigurationInstance, 
-					new Object[]{wsdlDefinitionInstance});       
-        
-		//-----------------------------------------------------------------------------------//
-
-		//set the baseURI
-        //codegenConfig.setBaseURI(generator.getBaseUri(model.getWsdlURI()));
-		
-		Method setBaseURIMethod = CodeGenConfigurationClass
-			.getMethod("setBaseURI", new Class[]{ String.class});
-		setBaseURIMethod.invoke(CodeGenConfigurationInstance, 
-								new Object[]{generator.getBaseUri(model.getWsdlURI())});
-		
-		//Get the namespace from the AxisService and set it in the configuration 
-		Class AxisServiceClass = ClassLoadingUtil
-					.loadClassFromAntClassLoader("org.apache.axis2.description.AxisService");		
-		Method getTargetNamespaceMethod = AxisServiceClass.getMethod("getTargetNamespace", null);
-		Object targetNamespace = getTargetNamespaceMethod.invoke(axisServiceInstance, null);
-		
-		
-		Class URLProcessorClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader("org.apache.axis2.util.URLProcessor");
-		Method makePackageNameMethod = URLProcessorClass
-				.getMethod("makePackageName", new Class[]{String.class});
-		Object stringReturn = makePackageNameMethod.invoke(null, new Object[]{targetNamespace});
-		
-		model.setPackageText(stringReturn.toString());
-		
-		Method setPackageNameMethod = CodeGenConfigurationClass
-					.getMethod("setPackageName", new Class[]{String.class});
-		setPackageNameMethod.invoke(CodeGenConfigurationInstance, new Object[]{stringReturn});
-		
-        //new CodeGenerationEngine(codegenConfig).generate();
-		Class CodeGenerationEngineClass = ClassLoadingUtil
-				.loadClassFromAntClassLoader("org.apache.axis2.wsdl.codegen.CodeGenerationEngine");
-		Constructor CodeGenerationEngineConstructor = CodeGenerationEngineClass
-						.getConstructor(new Class[]{CodeGenConfigurationInstance.getClass()});
-		Object CodeGenerationEngineInstance  = CodeGenerationEngineConstructor
-						.newInstance(new Object[]{CodeGenConfigurationInstance});
-		
-		//Invoke Codegen Method
-		Method generateMethod = CodeGenerationEngineClass.getMethod("generate", null);
-		generateMethod.invoke(CodeGenerationEngineInstance, null);
-		
-        
-		//Copy the existing codegen results to the current project
-        ContentCopyUtils contentCopyUtils = new ContentCopyUtils();
-	    status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
-	    							tempCodegenOutputLocation, 
-	    							currentDynamicWebProjectDir, 
-	    							monitor, 
-	    							statusHandler);
-
-        
-	} catch (Exception e) {
-		status = StatusUtils.errorStatus(NLS.bind(
-											Axis2CreationUIMessages.ERROR_CODEGEN_EXCEPTION,
-											new String[]{e.getLocalizedMessage()}),
-										e);
-		e.printStackTrace();
-		environment.getStatusHandler().reportError(status); 
-	}
-		
-		return status;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java
deleted file mode 100644
index b0640e5..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/command/Axis2WebservicesServerCommand.java
+++ /dev/null
@@ -1,103 +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
- * 20070510   172926 sandakith@wso2.com - Lahiru Sandakith, Fix 172926 Use Util Classes 
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.command;
-
-import java.io.File;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.ResourcesPlugin;
-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.ContentCopyUtils;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-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.common.J2EEUtils;
-import org.eclipse.wst.common.environment.IEnvironment;
-import org.eclipse.wst.common.environment.IStatusHandler;
-import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
-
-public class Axis2WebservicesServerCommand extends AbstractDataModelOperation {
-
-	private DataModel model;
-	private int scenario;
-
-	public Axis2WebservicesServerCommand( DataModel model, int scenario ){
-		this.model = model;  
-		this.scenario = scenario;
-	}
-
-	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
-	throws ExecutionException {
-
-		IStatus status = Status.OK_STATUS;
-		IEnvironment environment = getEnvironment();
-		IStatusHandler statusHandler = environment.getStatusHandler();	
-
-		 String currentDynamicWebProjectDir = J2EEUtils.getWebContentPath(
-				 				ResourcesPlugin.getWorkspace().getRoot().getProject(
-				 				model.getWebProjectName())
-						).toOSString();
-
-		String webContainerDirString = FileUtils.addAnotherNodeToPath(
-				ResourcesPlugin.getWorkspace().getRoot().getLocation().toOSString(),
-				currentDynamicWebProjectDir);
-
-		ContentCopyUtils contentCopyUtils = new ContentCopyUtils();
-		
-		//Check for the server status
-		if (model.getServerStatus()){
-			if (scenario == WebServiceScenario.BOTTOMUP){
-				//Import the tempory webservices directory according to the Resources API of eclipse 
-				String webserviceTempDirString = model.getPathToWebServicesTempDir();
-				String repositoryString = webContainerDirString 
-				+ File.separator + Axis2CreationUIMessages.DIR_WEB_INF 
-				+ File.separator + Axis2CreationUIMessages.DIR_SERVICES;
-				//Copy the existing services to the repository
-				status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
-											webserviceTempDirString, 
-											repositoryString, 
-											monitor, 
-											statusHandler);
-				FileUtils.deleteDirectories(webserviceTempDirString);
-
-
-			}else if (scenario == WebServiceScenario.TOPDOWN){
-				//Do topdown
-				String webserviceTempDirString = model.getPathToWebServicesTempDir();
-				String repositoryString = webContainerDirString 
-				+ File.separator + Axis2CreationUIMessages.DIR_WEB_INF 
-				+ File.separator + Axis2CreationUIMessages.DIR_SERVICES;
-				//Copy the existing services to the repository
-				status = contentCopyUtils.copyDirectoryRecursivelyIntoWorkspace(
-											webserviceTempDirString, 
-											repositoryString, 
-											monitor, 
-											statusHandler);
-				FileUtils.deleteDirectories(webserviceTempDirString);
-			}
-			status = Status.OK_STATUS;
-		}else{
-			status = Status.CANCEL_STATUS;
-		}
-
-		return status;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUI.properties b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUI.properties
deleted file mode 100644
index cc17811..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUI.properties
+++ /dev/null
@@ -1,78 +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
-# 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
-###############################################################################
-#
-# Axis2 server component type labels
-#
-LABEL_HAVE_SERVICES_XML_FILE=Have a Sevices.xml file
-LABEL_DEFAULT_SERVICES_XML_FILE=Generate Default Sevices.xml file
-LABEL_AXIS2_PREFERENCE_PAGE=Axis2 Web Service Java Bean Configuration
-LABEL_AXIS2_PREFERENCE_PAGE_HEADING=Axis2 Web Service Java Bean Configuration
-LABEL_AXIS2_PREFERENCE_PAGE_SUB_HEADING=Customize your Web service on this page
-LABEL_BROWSE=&Browse
-LABEL_DATA_MODEL=WebServiceDataModel
-LABEL_JAVA_2_WSDL_PAGE_HEADING=Axis2 Web Service skeleton Java Bean Configuration
-LABEL_JAVA_2_WSDL_PAGE_SUB_HEADING=Please select the appropriate options for the code generation
-LABEL_SERVICE_NAME_CAPTION=Service Name
-LABEL_GENERATE_TESTCASE_CAPTION=Generate test case to test the service
-LABEL_DATABINDING_CAPTION=Databinding Name
-LABEL_PORTNAME=Port Name
-LABEL_GENERATE_ALL=Generate sll types for all elements referred by schemas
-LABEL_GENERATE_SERVERSIDE_INTERFACE=Generate an Interface for Skeleton
-LABEL_PACKEGE_NAME=Custom package name
-LABEL_NAMESPACE=Namespace
-LABEL_PACKAGE=Package
-LABEL_NAMESPACE_TO_PACKAGE=Namespace to package mappings
-
-#
-# Axis2 server component type files
-#
-FILE_SERVICES_XML=services.xml
-FILE_XML=*.xml
-
-#
-# Axis2 server component type folders
-#
-DIR_META_INF=META-INF
-DIR_BUILD=build
-DIR_SRC=src
-DIR_CLASSES=classes
-DIR_RESOURCES=resources
-DIR_WEB_INF=WEB-INF
-DIR_SERVICES=services
-DIR_WEBSERVICES=webservices
-DIR_WEBCONTENT=WebContent
-DIR_DOT_METADATA=.metadata
-DIR_DOT_PLUGINS=.plugins
-
-#
-# Axis2 server component type error
-#
-ERROR_INVALID_SERVICES_XML=You must select a valid services.xml file!
-ERROR_INVALID_FILE_READ_WRITEL=Exception occurred while reading or writing file {0}
-ERROR_INVALID_WSDL_FILE_READ_WRITEL=Exception occurred while reading or writing WSDL {0}
-ERROR_INVALID_SERVICE_CREATION=Exception occurred during service creation
-ERROR_CODEGEN_EXCEPTION=Exception occurred while code generation for the WSDL {0}
-
-#
-# Axis2 server component type other
-#
-JAR_TASK=jar
-AXIS2_PROJECT=org.eclipse.jst.ws.axis2
-CODEGEN_RESULTS=codegen
-
-DATA_BINDING_ADB=ADB
-DATA_BINDING_NONE=NONE
-SKELETON_SUFFIX=Skeleton.java
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java
deleted file mode 100644
index 20d446e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/messages/Axis2CreationUIMessages.java
+++ /dev/null
@@ -1,83 +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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- * 20070511   186440 sandakith@wso2.com - Lahiru Sandakith fix 186440
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.messages;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Axis2CreationUIMessages extends NLS {
-
-	//get the lables from this massages to the properties file
-	private static final String BUNDLE_NAME = 
-			"org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUI";//$NON-NLS-1$
-
-	private Axis2CreationUIMessages() {
-		// Do not instantiate
-	}
-	//labels
-	public static String LABEL_HAVE_SERVICES_XML_FILE;
-	public static String LABEL_DEFAULT_SERVICES_XML_FILE;
-	public static String LABEL_AXIS2_PREFERENCE_PAGE;
-	public static String LABEL_AXIS2_PREFERENCE_PAGE_HEADING;
-	public static String LABEL_AXIS2_PREFERENCE_PAGE_SUB_HEADING;
-	public static String LABEL_BROWSE;
-	public static String LABEL_DATA_MODEL;
-	public static String LABEL_JAVA_2_WSDL_PAGE_HEADING;
-	public static String LABEL_JAVA_2_WSDL_PAGE_SUB_HEADING;
-	public static String LABEL_SERVICE_NAME_CAPTION;
-	public static String LABEL_GENERATE_TESTCASE_CAPTION;
-	public static String LABEL_DATABINDING_CAPTION;
-	public static String LABEL_PORTNAME;
-	public static String LABEL_GENERATE_ALL;
-	public static String LABEL_GENERATE_SERVERSIDE_INTERFACE;
-	public static String LABEL_PACKEGE_NAME;
-	public static String LABEL_NAMESPACE;
-	public static String LABEL_PACKAGE;
-	public static String LABEL_NAMESPACE_TO_PACKAGE;
-	
-	//files
-	public static String FILE_SERVICES_XML;
-	public static String FILE_XML;
-	//folders
-	public static String DIR_BUILD;
-	public static String DIR_SRC;
-	public static String DIR_CLASSES;
-	public static String DIR_RESOURCES;
-	public static String DIR_META_INF;
-	public static String DIR_WEB_INF;
-	public static String DIR_SERVICES;
-	public static String DIR_WEBSERVICES;
-	public static String DIR_WEBCONTENT;
-	public static String DIR_DOT_METADATA;
-	public static String DIR_DOT_PLUGINS;
-	//error
-	public static String ERROR_INVALID_SERVICES_XML;
-	public static String ERROR_INVALID_FILE_READ_WRITEL;
-	public static String ERROR_INVALID_WSDL_FILE_READ_WRITEL;
-	public static String ERROR_INVALID_SERVICE_CREATION;
-	public static String ERROR_CODEGEN_EXCEPTION;
-	//other
-	public static String JAR_TASK;
-	public static String AXIS2_PROJECT;
-	public static String CODEGEN_RESULTS;
-	public static String DATA_BINDING_ADB;
-	public static String DATA_BINDING_NONE;
-	public static String SKELETON_SUFFIX;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, Axis2CreationUIMessages.class);
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/plugin/WebServiceAxis2CreationCorePlugin.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/plugin/WebServiceAxis2CreationCorePlugin.java
deleted file mode 100644
index f19af8e..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/plugin/WebServiceAxis2CreationCorePlugin.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
- * 20070426   183046 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class WebServiceAxis2CreationCorePlugin extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.jst.ws.axis2.creation.core";
-
-	// The shared instance
-	private static WebServiceAxis2CreationCorePlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public WebServiceAxis2CreationCorePlugin() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#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 WebServiceAxis2CreationCorePlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java
deleted file mode 100644
index eeff2ec..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/AARFileWriter.java
+++ /dev/null
@@ -1,52 +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.axis2.creation.core.utils;
-
-import java.io.File;
-import java.io.IOException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Jar;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-
-public class AARFileWriter extends Jar{
-
-    public AARFileWriter() {
-        this.setProject(new Project());
-        this.getProject().init();
-        this.setTaskType(Axis2CreationUIMessages.JAR_TASK);
-        this.setTaskName(Axis2CreationUIMessages.JAR_TASK);
-        this.setOwningTarget(new org.apache.tools.ant.Target());
-    }
-
-    public void writeAARFile(File outputFolder,
-    						 String outputFileName,
-    						 File inputFileFolder) throws IOException,Exception {
-
-        if (!outputFolder.exists()){
-            outputFolder.mkdir(); //create the output path
-        }else{
-            if (!outputFolder.isDirectory())
-                return;
-        }
-
-        File targetFile = new File(outputFolder,outputFileName);
-        this.setBasedir(inputFileFolder);
-        this.setDestFile(targetFile);
-
-        //run the task
-        this.perform();
-    }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/CommonUtils.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/CommonUtils.java
deleted file mode 100644
index c1d04fd..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/CommonUtils.java
+++ /dev/null
@@ -1,50 +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
- * -------- -------- -----------------------------------------------------------
- * 20070110   168762 sandakith@wso2.com - Lahiru Sandakith, Initial code to introduse the Axis2 
- * 										  runtime to the framework for 168762
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.utils;
-
-
-public class CommonUtils {
-	
-	 public static String classNameFromQualifiedName(String qualifiedCalssName){
-		 //This was done due to not splitting with . Strange
-		 qualifiedCalssName = qualifiedCalssName.replace('.', ':');
-		 String[] parts = qualifiedCalssName.split(":");
-		 if (parts.length == 0){
-			 return "";
-		 }
-		 return parts[parts.length-1];
-	 }
-	  
-	 public static String packageNameFromQualifiedName(String qualifiedCalssName){
-		 //This was done due to not splitting with . Strange
-		 qualifiedCalssName = qualifiedCalssName.replace('.', ':');
-		 String[] parts = qualifiedCalssName.split(":");
-		 StringBuffer packageName = new StringBuffer();
-		 for (int i = 0; i < parts.length-1; i++) {
-			 packageName.append(parts[i]);
-			 if (! (i == parts.length-2)){
-				 packageName.append(".");
-			 }
-		 }
-		 return packageName.toString();
-	 }
-	 
-	 
-	 public static String packgeName2PathName(String packageName){
-		 packageName = packageName.replace('.', '/');
-		 return packageName;
-	 }
-	 
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java
deleted file mode 100644
index 6c24d22..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PathLoadingUtil.java
+++ /dev/null
@@ -1,83 +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
- * -------- -------- -----------------------------------------------------------
- * 20070330   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
- * 20070507   184740 sandakith@wso2.com - Lahiru Sandakith
- * 20070507   185686 sandakith@wso2.com - Lahiru Sandakith
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.utils;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.axis2.core.utils.FileUtils;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-
-public class PathLoadingUtil {
-	
-	//Model
-	private static  DataModel model = null;
-
-	//Paths
-	private static String tempCodegenOutputLocation = null;
-	private static String currentDynamicWebProjectDir = null;
-	private static String workspaceDirectory = null;
-	private static String currentProjectWebProjectName = null;
-	
-	//Already Computed
-	private static boolean alreadyInit = false;
-	private static boolean alreadyComputeTempCodegenOutputLocation = false;
-	private static boolean alreadyComputeCurrentDynamicWebProjectDir = false;
-	private static boolean alreadyComputeWorkspaceDirectory = false;
-	private static boolean requireToupdateModel = false;
-	
-	public static void init(DataModel inputModel){
-		requireToupdateModel = !alreadyInit || 
-		!currentProjectWebProjectName.equals(inputModel.getWebProjectName());
-		if(requireToupdateModel){
-		model = inputModel;
-		currentProjectWebProjectName = inputModel.getWebProjectName();
-		}
-		}
-
-	public	static String getWorkspaceDirectory() {
-		if (!alreadyComputeWorkspaceDirectory){
-			workspaceDirectory = ResourcesPlugin.getWorkspace().getRoot()
-			.getLocation().toOSString();
-			alreadyComputeWorkspaceDirectory = true;
-		}
-		return workspaceDirectory;
-	}
-	
-	public static String getCurrentDynamicWebProjectDir(){
-		if (!alreadyComputeCurrentDynamicWebProjectDir || requireToupdateModel){
-			currentDynamicWebProjectDir = FileUtils.addAnotherNodeToPath(
-			getWorkspaceDirectory(), model.getWebProjectName());
-			alreadyComputeCurrentDynamicWebProjectDir = true;
-		}
-		return currentDynamicWebProjectDir;
-	}
-	
-	
-	public static String getTempCodegenOutputLocation() {
-		if (!alreadyComputeTempCodegenOutputLocation){
-			String[] nodes = {	Axis2CreationUIMessages.DIR_DOT_METADATA,
-								Axis2CreationUIMessages.DIR_DOT_PLUGINS,
-								Axis2CreationUIMessages.AXIS2_PROJECT,
-								Axis2CreationUIMessages.CODEGEN_RESULTS};
-			tempCodegenOutputLocation = FileUtils.addNodesToPath(getWorkspaceDirectory(), nodes);
-			alreadyComputeTempCodegenOutputLocation = true;
-		}
-		return tempCodegenOutputLocation;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PluginLocationFinderUtil.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PluginLocationFinderUtil.java
deleted file mode 100644
index 88a4aa6..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/PluginLocationFinderUtil.java
+++ /dev/null
@@ -1,120 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.axis2.creation.core.utils;
-
-
-public class PluginLocationFinderUtil {
-//	/**
-//	 *  
-//	 * @return returns a Vector containing PluginData objects.
-//	 * Each PluginData object represents a Plugin found under any of the following 
-//	 * plugin directories
-//	 * a. the targetPlatformLocation\eclipse\plugins directory, 
-//	 * b. other plugin directories as specified by *.link files under 
-//	 *    targetPlatform\eclipse\links directory 
-//	 **/ 
-//	public static Vector getPluginsInTargetPlatform(){
-//		/**
-//		//step1: Get path of target platform.
-//		//step2: Prepare path of links folder.
-//		//step3: Get list of files in links folder.
-//		//step4: Parse each link file and get the path of linked Eclipse folder.
-//		//step5: Prepare a list of all plugin root folders 
-//		//       (Eclipse plugins and linked Eclipse plugins).
-//		//step6: 6a. For each plugin root folder, 
-//		//       6b. go to each plugin directory and get path of plugin.xml.
-//		//step7: Parse the plugin.xml file to get plugin id, plugin version, 
-//		//       and store in vectors, lists, etc.
-//		//step8: Go back to step 6 to continue with next plugin directory.
-//		**/
-//
-//		//step1: Get path of target platform. 
-//		//Fall back to Eclipse install location if targetplatform in not set.
-//		URL platFormURL = Platform.getInstallLocation().getURL();
-//		Location location = Platform.getInstallLocation();
-//		IPath eclipsePath = null ;		
-//
-//		//Get path of target platform against which the users of this tool 
-//		//will compile their code.	
-////		IPath targetPlatFormLocation = new Path(getTargetPlatformPath(true));
-////		IPath targetPlatFormLocation = new Path(System.getProperty("user.dir"));
-//
-////		if(_useTargetPlatform == false)
-//			eclipsePath = new Path(platFormURL.getPath());
-////		else
-////			eclipsePath = targetPlatFormLocation;
-//		
-////		showMessage("Considering target platform to be: " + 
-////					eclipsePath.toString());
-//		
-//		//step2: Prepare path of links folder.
-//		//step3: Get list of files in links folder.		
-//		//step4: Parse each link file and get the path of linked Eclipse folder.
-//		IPath linksPath = new Path( eclipsePath.toString() ).append("/links");
-//		String linkedPaths[] = getLinkedPaths(linksPath.toString());
-//		int linkedPathLength = 0;
-//		if(null != linkedPaths){
-//			linkedPathLength = linkedPaths.length;
-//		}
-//		
-//		//step5: Prepare a list of all plugin root folders 
-//		//       (Eclipse plugins and linked Eclipse plugins).
-//		IPath eclipsePluginRootFolders[] = new IPath[linkedPathLength + 1];
-//		eclipsePluginRootFolders[0] = 
-//			new Path( eclipsePath.toString() ).append("/plugins");
-//		if(null != linkedPaths){
-//			for(int i=0; i<linkedPaths.length; i++){
-//				eclipsePluginRootFolders[i+1] = 
-//				new Path(linkedPaths[i]).append("/eclipse/plugins");
-//			}
-//		}
-//
-//		//step6: 6a. For each plugin root folder, 
-//		//       6b. go to each plugin directory and get path of plugin.xml.
-//		//step7: Parse the plugin.xml file to get plugin id, plugin version, 
-//		//       and store in vectors, lists, etc.
-//		Vector vectorsInThisVector = new Vector();
-//		for(int i=0; i<eclipsePluginRootFolders.length; i++){
-//			System.out.println("\n========plugin IDs and Versions in " + 
-//			eclipsePluginRootFolders[i] + "========");
-//			Vector pluginDataObjs  = 
-//			getPluginDataForAllPlugins(
-//				eclipsePluginRootFolders[i].toString());
-//			vectorsInThisVector.add(pluginDataObjs);
-//			System.out.println(pluginDataObjs);
-//			System.out.println("\n===========|||=== end ===|||===========");
-//		}
-//		
-//		Vector pluginData = new Vector();
-//		Iterator outerIterator = vectorsInThisVector.iterator();
-//		while(outerIterator.hasNext()){
-//			Vector pluginDataObjs = (Vector)outerIterator.next();
-//			Iterator innerIterator = pluginDataObjs.iterator();
-//			while(innerIterator.hasNext()){
-//				PluginData pd = (PluginData)innerIterator.next();
-//				String pluginIdKey = pd.getPluginID();
-//				String versionValue = pd.getPluginVersion();
-//				String pluginPath = pd.getPluginLocation();
-//				pluginData.add(pd);
-//			}
-//		}
-//		
-//		int breakpoint=0;
-//
-//		return pluginData;
-//	}
-//
-//
-}
diff --git a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/ServiceXMLCreator.java b/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/ServiceXMLCreator.java
deleted file mode 100644
index 28d3be2..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.core/src/org/eclipse/jst/ws/axis2/creation/core/utils/ServiceXMLCreator.java
+++ /dev/null
@@ -1,58 +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.axis2.creation.core.utils;
-
-import java.util.ArrayList;
-
-public class ServiceXMLCreator {
-    private String serviceName;
-    private String serviceClass;
-    private ArrayList operations;
-
-    public ServiceXMLCreator(String serviceName, String serviceClass, ArrayList operations) {
-        this.serviceName = serviceName;
-        this.serviceClass = serviceClass;
-        this.operations = operations;
-    }
-
-    public String getServiceName() {
-        return serviceName;
-    }
-
-    public String getServiceClass() {
-        return serviceClass;
-    }
-
-    public ArrayList getOperations() {
-        return operations;
-    }
-
-    public String toString() {
-        String serviceXML = "<service name=\"" + serviceName + "\" >\n" +
-        "\t<description>\n" +
-        "\t\tPlease Type your service description here\n" +
-        "\t</description>\n" +
-        "\t<messageReceivers>\n" +
-        "\t\t<messageReceiver mep=\"http://www.w3.org/2004/08/wsdl/in-only\" " +
-        "class=\"org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver\" />\n" +
-        "\t\t<messageReceiver  mep=\"http://www.w3.org/2004/08/wsdl/in-out\"  " +
-        "class=\"org.apache.axis2.rpc.receivers.RPCMessageReceiver\"/>\n" +
-        "\t</messageReceivers>\n" + 
-        "\t<parameter name=\"ServiceClass\" locked=\"false\">" + serviceClass + "</parameter>\n" ; 
-        serviceXML = serviceXML + "</service>\n";
-        return serviceXML;
-    }
-
-}
\ No newline at end of file
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/.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 b5315a1..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +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.0
-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
-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/build.properties b/bundles/org.eclipse.jst.ws.axis2.creation.ui/build.properties
deleted file mode 100644
index df90978..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.creation.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 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
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 55a27dc..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,224 +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.widgets.bean;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.axis2.creation.core.data.DataModel;
-import org.eclipse.jst.ws.axis2.creation.core.messages.Axis2CreationUIMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-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 )
-	{
-		final Composite  mainComp = new Composite( parent, SWT.NONE );
-		GridLayout layout   = new GridLayout();
-		layout.numColumns = 14;
-		GridData   griddata = new GridData( GridData.FILL_HORIZONTAL );
-		Label      label    = new Label( mainComp, SWT.NONE );
-
-		griddata = new GridData( GridData.FILL_HORIZONTAL );
-		griddata.horizontalSpan = 14;
-		mainComp.setLayout( layout );
-		mainComp.setLayoutData( griddata );
-		label.setText( Axis2CreationUIMessages.LABEL_AXIS2_PREFERENCE_PAGE );
-		model.setGenerateServicesXML(true);
-		model.setServicesXML(false);
-
-		griddata = new GridData( GridData.FILL_HORIZONTAL );
-		griddata.horizontalSpan = 14;
-		haveServicesXML = new Button( mainComp, SWT.CHECK );
-		haveServicesXML.setText(Axis2CreationUIMessages.LABEL_HAVE_SERVICES_XML_FILE);	
-		haveServicesXML.setLayoutData(griddata);
-		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 );
-			}     
-		});
-		griddata = new GridData( GridData.FILL_HORIZONTAL );
-		griddata.horizontalSpan = 13;
-
-		servicesXMLPath = new Text( mainComp, SWT.BORDER );
-		servicesXMLPath.setText("");
-		servicesXMLPath.setLayoutData(griddata);
-		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 );
-			}
-		});
-
-		griddata = new GridData( );
-		griddata.horizontalSpan = 1;
-		griddata.minimumWidth = 50;
-		griddata.grabExcessHorizontalSpace = true;
-		browseButton = new Button( mainComp, SWT.NULL );
-		browseButton.setText(Axis2CreationUIMessages.LABEL_BROWSE);
-		browseButton.setLayoutData(griddata);
-		browseButton.addSelectionListener( new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleBrowse(mainComp.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 );
-			}     
-		}); 
-
-
-		griddata = new GridData( GridData.FILL_HORIZONTAL );
-		griddata.horizontalSpan = 14;
-		generateServicesXML = new Button( mainComp, SWT.CHECK );
-		generateServicesXML.setText( Axis2CreationUIMessages.LABEL_DEFAULT_SERVICES_XML_FILE );
-		generateServicesXML.setLayoutData(griddata);
-		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[] { Axis2CreationUIMessages.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 52fd5b4..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,519 +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
- *******************************************************************************/
-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.plugin.data.ServerModel;
-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 Button testCaseCheckBoxButton;
-	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;
-
-	public WSDL2JAVASkelConfigWidget( DataModel model )	{
-		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);
-
-		// generate test case option
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 3;
-		testCaseCheckBoxButton = new Button(mainComp, SWT.CHECK);
-		testCaseCheckBoxButton.setLayoutData(gd);
-		testCaseCheckBoxButton
-		.setText(Axis2CreationUIMessages.LABEL_GENERATE_TESTCASE_CAPTION);
-		testCaseCheckBoxButton.setSelection(ServerModel.isServiceTestcase());
-		model.setTestCaseCheck(ServerModel.isServiceTestcase());
-		testCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				model.setTestCaseCheck(testCaseCheckBoxButton.getSelection());
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		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(ServerModel.isServiceInterfaceSkeleton());
-		generateServerSideInterfaceCheckBoxButton.setText(Axis2CreationUIMessages.
-														  LABEL_GENERATE_SERVERSIDE_INTERFACE);
-		model.setGenerateAllCheck(ServerModel.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(ServerModel.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());
-            }
-          });
-        
-		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.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) {
-			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(Axis2CreationUIMessages.DATA_BINDING_ADB);
-		databindingTypeCombo.add(Axis2CreationUIMessages.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 e60f938..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,88 +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
- *******************************************************************************/
-
-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, 
-								Axis2CreationUIMessages.LABEL_DATA_MODEL, 
-								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/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 ba5c8e4..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,86 +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.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, 
-								 Axis2CreationUIMessages.LABEL_DATA_MODEL, 
-								 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 0f6abe4..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,113 +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
- *******************************************************************************/
-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.jst.ws.internal.axis2.creation.ui.command.Page1ComesUpBeforeThisBUCommand;
-//import org.eclipse.jst.ws.internal.axis2.creation.ui.command.Page1ComesUpBeforeThisTDCommand;
-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() ));
-		} 
-		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)
-	{
-		return null;
-	}
-}
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/.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 cdcf232..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.0
-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/build.properties b/bundles/org.eclipse.jst.ws.axis2.ui/build.properties
deleted file mode 100644
index d937ee6..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/build.properties
+++ /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
-# -------- -------- -----------------------------------------------------------
-# 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
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 3419d8a..0000000
--- a/bundles/org.eclipse.jst.ws.axis2.ui/src/org/eclipse/jst/ws/internal/axis2/consumption/ui/preferences/Axis2RuntimePreferencePage.java
+++ /dev/null
@@ -1,460 +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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis2.consumption.ui.preferences;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.axis2.core.plugin.data.ServerModel;
-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.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.events.SelectionListener;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.DirectoryDialog;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-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 Button browseButton; 
-	private Text axis2Path; 
-	private Label statusLabel;
-	@SuppressWarnings("unused")
-	private IStatus status = Status.OK_STATUS;
-	private boolean webappExist = false;
-	private boolean isWar = false;
-	private String statusBanner = null;
-	
-
-	  
-	protected Control createContents(Composite superparent) {
-		status = Status.OK_STATUS;
-		
-		final Composite  mainComp = new Composite( superparent, SWT.NONE );
-		
-		TabFolder axis2PreferenceTab = new TabFolder(mainComp, SWT.NONE);
-		TabItem runtimeInstalLocationItem = new TabItem(axis2PreferenceTab, SWT.NONE);
-		runtimeInstalLocationItem.setText(Axis2CoreUIMessages.AXIS2_RUNTIME);
-		runtimeInstalLocationItem.setToolTipText(Axis2CoreUIMessages.AXIS2_RUNTIME_TOOLTIP);
-		
-		//-----------------------------Axis2 Rintume Location Group------------------------------//
-		Group runtimeGroup = new Group(axis2PreferenceTab, SWT.NONE);
-		runtimeGroup.setText(Axis2CoreUIMessages.AXIS2_RUNTIME_LOCATION);
-		runtimeInstalLocationItem.setControl(runtimeGroup);
-		runtimeGroup.setToolTipText(Axis2CoreUIMessages.AXIS2_RUNTIME_TOOLTIP);
-		
-		Label label = new Label( runtimeGroup, SWT.NONE );
-		label.setText( Axis2CoreUIMessages.AXIS2_LOCATION );
-		label.setLocation(10,30);
-		label.setSize(100,20);
-		
-		axis2Path = new Text( runtimeGroup, SWT.BORDER );
-		String serverPath = null;
-		if (ServerModel.getAxis2ServerPath()==null||ServerModel.getAxis2ServerPath().equals("")){
-			serverPath = (RuntimePropertyUtils.getServerPathFromPropertiesFile() == null) ? "" 
-					: RuntimePropertyUtils.getServerPathFromPropertiesFile();
-			axis2Path.setText(serverPath);
-			ServerModel.setAxis2ServerPath( serverPath );
-		}else{
-			axis2Path.setText(ServerModel.getAxis2ServerPath());
-			serverPath = ServerModel.getAxis2ServerPath();
-		}
-
-		webappExist =runtimeExist(serverPath);
-		if(isWar){
-			updateWarStatus(true);
-		}else{
-			updateWarStatus(false);
-		}
-		axis2Path.setLocation(110,30);
-		axis2Path.setSize(400, 20);
-		axis2Path.addModifyListener( new ModifyListener(){
-			public void modifyText(ModifyEvent e){
-				ServerModel.setAxis2ServerPath( axis2Path.getText() );
-				webappExist =runtimeExist(axis2Path.getText());
-				status = RuntimePropertyUtils.writeServerPathToPropertiesFile(
-						axis2Path.getText());
-				if (webappExist) {
-					status = Status.OK_STATUS;
-					statusUpdate(true);
-				}else{
-					status = Status.CANCEL_STATUS;
-					statusUpdate(false);
-				}
-			}
-		});
-		browseButton = new Button( runtimeGroup, SWT.NONE );
-		browseButton.setText(Axis2CoreUIMessages.LABEL_BROUSE);
-		browseButton.setLocation(520,30);
-		browseButton.setSize(70, 20);
-		browseButton.addSelectionListener( new SelectionAdapter()
-		{
-			public void widgetSelected(SelectionEvent e)
-			{
-				handleBrowse(mainComp.getShell());
-			}     
-		}); 
-	
-		if(axis2Path.getText().equals(Axis2CoreUIMessages.NULL)){
-			status = new Status( IStatus.ERROR, 
-					"id", 
-					0, 
-					Axis2CoreUIMessages.ERROR_INVALID_AXIS2_SERVER_LOCATION, 
-					null ); 
-		}
-		
-		
-		statusLabel = new Label( runtimeGroup, SWT.NONE );
-		statusLabel.setLocation(20,100);
-		statusLabel.setSize(560,40);
-		statusLabel.setAlignment(SWT.CENTER);
-		
-		if (axis2Path.getText().equals("")) {
-			statusBanner = Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_NOT_EXIT;
-		} else if ( !axis2Path.getText().equals("") && (!webappExist)) {
-			statusBanner = Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD_ERROR;
-		}else{
-			statusBanner = Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD;
-		}
-		statusLabel.setText(statusBanner);
-		
-		webappExist =runtimeExist(axis2Path.getText());
-		
-		TabItem codegenPreferencesItem = new TabItem(axis2PreferenceTab, SWT.NONE);
-		codegenPreferencesItem.setText(Axis2CoreUIMessages.AXIS2_PREFERENCES);
-		codegenPreferencesItem.setToolTipText(Axis2CoreUIMessages.AXIS2_PREFERENCES_TOOLTIP);
-		
-		//--------------------------------Axis2 Runtime Preferences------------------------------//
-		
-		Group codegenGroup = new Group(axis2PreferenceTab, SWT.NONE);
-		codegenGroup.setText(Axis2CoreUIMessages.AXIS2_RUNTIME_PREFERENCES);
-		codegenPreferencesItem.setControl(codegenGroup);
-		codegenGroup.setToolTipText(Axis2CoreUIMessages.AXIS2_PREFERENCES_TOOLTIP);
-		
-		//Service Codegen Options
-		Label serviceCodegenLabel = new Label( codegenGroup, SWT.NONE );
-		serviceCodegenLabel.setText( Axis2CoreUIMessages.LABEL_WEB_SERVICE_CODEGEN);
-		serviceCodegenLabel.setLocation(10,30);
-		serviceCodegenLabel.setSize(200,20);
-		
-		//Data binding
-		Label databindingLabel = new Label( codegenGroup, SWT.NONE );
-		databindingLabel.setText( Axis2CoreUIMessages.LABEL_DATABINDING);
-		databindingLabel.setLocation(10,60);
-		databindingLabel.setSize(200,20);
-		
-		final Text databindingText = new Text( codegenGroup,SWT.BORDER );
-		databindingText.setText(ServerModel.getServiceDatabinding());
-		databindingText.addModifyListener( new ModifyListener() {
-			public void modifyText(ModifyEvent e){
-				ServerModel.setServiceDatabinding( databindingText.getText() );
-			}
-		});
-		databindingText.setLocation(220,60);
-		databindingText.setSize(100,20);
-		
-		// generate test case option
-		final Button testCaseCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
-		testCaseCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_TESTCASE_CAPTION);
-		testCaseCheckBoxButton.setSelection(ServerModel.isServiceTestcase());
-		testCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setServiceTestcase(testCaseCheckBoxButton.getSelection());
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		testCaseCheckBoxButton.setLocation(10, 90);
-		testCaseCheckBoxButton.setSize(300, 15);
-
-		//model.setServerXMLCheck(true);
-
-		//the server side interface option
-		final Button generateServerSideInterfaceCheckBoxButton = 
-							new Button(codegenGroup, SWT.CHECK);
-		generateServerSideInterfaceCheckBoxButton.setText(
-				Axis2CoreUIMessages.LABEL_GENERATE_SERVERSIDE_INTERFACE);
-		generateServerSideInterfaceCheckBoxButton.setSelection(
-									ServerModel.isServiceInterfaceSkeleton());
-		generateServerSideInterfaceCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setServiceInterfaceSkeleton(
-						generateServerSideInterfaceCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		generateServerSideInterfaceCheckBoxButton.setLocation(10, 120);
-		generateServerSideInterfaceCheckBoxButton.setSize(300, 15);
-
-		// generate all
-		final Button generateAllCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
-		generateAllCheckBoxButton.setSelection(ServerModel.isServiceGenerateAll());
-		generateAllCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_ALL);
-		generateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setServiceGenerateAll(generateAllCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		generateAllCheckBoxButton.setLocation(10, 150);
-		generateAllCheckBoxButton.setSize(350, 15);
-		
-		///////////////////////////////////////////////////////////////////////////////////////////
-		
-		//seperator
-		Label seperatorLabel0 = new Label( codegenGroup, SWT.SEPARATOR|SWT.BORDER);
-		seperatorLabel0.setLocation(10,185);
-		seperatorLabel0.setSize(570,1);
-		
-		///Client Codegen Options
-		Label clientCodegenLabel = new Label( codegenGroup, SWT.NONE );
-		clientCodegenLabel.setText( Axis2CoreUIMessages.LABEL_WEB_SERVICE_CLIENT_CODEGEN);
-		clientCodegenLabel.setLocation(10,200);
-		clientCodegenLabel.setSize(200,20);
-		
-		//Client type label 
-		Label clientLabel = new Label(codegenGroup, SWT.HORIZONTAL | SWT.NULL);
-		clientLabel.setText(Axis2CoreUIMessages.LABEL_CLIENT_SIDE);
-		clientLabel.setLocation(10,240);
-		clientLabel.setSize(70,20); 
-		
-		//client side buttons
-		final Button syncAndAsyncRadioButton = new Button(codegenGroup, SWT.RADIO);
-		syncAndAsyncRadioButton.setText(Axis2CoreUIMessages.LABEL_SYNC_AND_ASYNC);
-		syncAndAsyncRadioButton.setVisible(true);
-		syncAndAsyncRadioButton.setSelection(
-				((ServerModel.isAsync() || ServerModel.isSync())==false)
-				?true
-				:(ServerModel.isAsync() && ServerModel.isSync()));
-		syncAndAsyncRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setSync(syncAndAsyncRadioButton.getSelection());
-				ServerModel.setAsync(syncAndAsyncRadioButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		syncAndAsyncRadioButton.setLocation(80,240);
-		syncAndAsyncRadioButton.setSize(190,20); 
-		
-		final Button syncOnlyRadioButton = new Button(codegenGroup, SWT.RADIO);
-		syncOnlyRadioButton.setText(Axis2CoreUIMessages.LABEL_SYNC);
-		syncOnlyRadioButton.setSelection(ServerModel.isSync() && !ServerModel.isAsync() );
-		syncOnlyRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setSync(syncOnlyRadioButton.getSelection());
-				ServerModel.setAsync(!syncOnlyRadioButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		syncOnlyRadioButton.setLocation(280,240);
-		syncOnlyRadioButton.setSize(170,20); 
-
-		final Button asyncOnlyRadioButton = new Button(codegenGroup, SWT.RADIO);
-		asyncOnlyRadioButton.setText(Axis2CoreUIMessages.LABEL_ASYNC);
-		asyncOnlyRadioButton.setSelection(ServerModel.isAsync() && !ServerModel.isSync());
-		asyncOnlyRadioButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setAsync(asyncOnlyRadioButton.getSelection());
-				ServerModel.setSync(!asyncOnlyRadioButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		asyncOnlyRadioButton.setLocation(460,240);
-		asyncOnlyRadioButton.setSize(170,20);
-		
-		//Data binding
-		Label clientDatabindingLabel = new Label( codegenGroup, SWT.NONE );
-		clientDatabindingLabel.setText( Axis2CoreUIMessages.LABEL_DATABINDING);
-		clientDatabindingLabel.setLocation(10,270);
-		clientDatabindingLabel.setSize(200,20);
-		
-		final Text databindingText1 = new Text( codegenGroup, SWT.BORDER );
-		databindingText1.setText(ServerModel.getCleintDatabinding());
-		databindingText1.addModifyListener( new ModifyListener() {
-			public void modifyText(ModifyEvent e){
-				ServerModel.setAxis2ServerPath( databindingText1.getText() );
-			}
-		});
-		databindingText1.setLocation(220,270);
-		databindingText1.setSize(100,20);
-		
-		
-		// generate test case option
-		final Button clientTestCaseCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
-		clientTestCaseCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_TESTCASE_CAPTION);
-		clientTestCaseCheckBoxButton.setSelection(ServerModel.isClientTestcase());
-		clientTestCaseCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setClientTestcase(clientTestCaseCheckBoxButton.getSelection());
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		clientTestCaseCheckBoxButton.setLocation(10,300);
-		clientTestCaseCheckBoxButton.setSize(300, 15);
-
-
-		// generate all
-		final Button clientGenerateAllCheckBoxButton = new Button(codegenGroup, SWT.CHECK);
-		clientGenerateAllCheckBoxButton.setSelection(ServerModel.isClientGenerateAll());
-		clientGenerateAllCheckBoxButton.setText(Axis2CoreUIMessages.LABEL_GENERATE_ALL);
-		clientGenerateAllCheckBoxButton.addSelectionListener(new SelectionListener() {
-			public void widgetSelected(SelectionEvent e) {
-				ServerModel.setClientGenerateAll(clientGenerateAllCheckBoxButton.getSelection());
-			}
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		clientGenerateAllCheckBoxButton.setLocation(10, 330);
-		clientGenerateAllCheckBoxButton.setSize(400, 15);
-		
-		///////////////////////////////////////////////////////////////////////////////////////////
-
-		//seperator
-		Label seperatorLabel1 = new Label( codegenGroup, SWT.SEPARATOR|SWT.BORDER);
-		seperatorLabel1.setLocation(10,365);
-		seperatorLabel1.setSize(570,1);
-		
-		///AAR Options
-		Label aarLabel = new Label( codegenGroup, SWT.NONE );
-		aarLabel.setText( Axis2CoreUIMessages.LABEL_WEB_SERVICE_AAR);
-		aarLabel.setLocation(10,380);
-		aarLabel.setSize(200,20);
-		
-		//aar extention 
-		Label aarExtentionLabel = new Label( codegenGroup, SWT.NONE );
-		aarExtentionLabel.setText( Axis2CoreUIMessages.LABEL_AAR_EXTENTION);
-		aarExtentionLabel.setLocation(10,420);
-		aarExtentionLabel.setSize(200,20);
-		
-		final Text aarExtentionText = new Text( codegenGroup, SWT.BORDER);
-		aarExtentionText.setText(ServerModel.getAarExtention());
-		aarExtentionText.addModifyListener( new ModifyListener() {
-			public void modifyText(ModifyEvent e){
-				ServerModel.setAarExtention( aarExtentionText.getText() );
-			}
-		});
-		aarExtentionText.setLocation(220,420);
-		aarExtentionText.setSize(100,20);
-		
-
-		axis2PreferenceTab.setSize(640, 500);
-		
-	    return mainComp;
-	}
-
-	public void init(IWorkbench workbench) {
-		// TODO Auto-generated method stub
-	}
-	
-	  
-	/**
-	 * 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);
-			ServerModel.setAxis2ServerPath( axis2Path.getText() );
-			if(isWar){
-				updateWarStatus(true);
-			}else{
-				updateWarStatus(false);
-			}
-		}
-	}
-	
-	private void statusUpdate(boolean status){
-		if(statusLabel != null){
-			if(!axis2Path.getText().equals("")){
-		if (status) {
-			statusLabel.setText(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD);
-			this.setErrorMessage(null);
-		} else {
-			statusLabel.setText(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD_ERROR);
-					//this.setErrorMessage(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_LOAD_ERROR);
-		}
-			}else{
-				statusLabel.setText(Axis2CoreUIMessages.LABEL_AXIS2_RUNTIME_NOT_EXIT);
-			}
-		}
-	}
-	
-	private boolean runtimeExist(String path){
-		isWar=false;
-		File axis2HomeDir = new File(path);
-		if (axis2HomeDir.isDirectory()) {
-			String axis2LibPath = Axis2CoreUtils.addAnotherNodeToPath(
-													axis2HomeDir.getAbsolutePath(),
-													"lib");
-			String axis2WebappPath = Axis2CoreUtils.addAnotherNodeToPath(
-					axis2HomeDir.getAbsolutePath(),
-					"webapp");
-			if (new File(axis2LibPath).isDirectory() && new File(axis2WebappPath).isDirectory()) {
-				statusUpdate(true);
-				return true;
-			} else {
-				String axis2WarPath = Axis2CoreUtils.addAnotherNodeToPath(
-						path,
-						"axis2.war");
-				if (new File(axis2WarPath).isFile()) {
-					isWar = true;
-					statusUpdate(true);
-					return true;
-				} else {
-					statusUpdate(false);
-					return false;
-				}
-			}
-		}else{
-			statusUpdate(false);
-			return false;
-		}
-	}
-	
-	private void updateWarStatus(boolean status){
-		ServerModel.setAxis2ServerPathRepresentsWar(status);
-		RuntimePropertyUtils.writeWarStausToPropertiesFile(status);
-	}
-	
-}