1 files changed, 0 insertions, 38 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample53.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample53.wsdl
deleted file mode 100644
index e2e416af1..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/100WSDLsXSDDepends/sample53.wsdl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample53" xmlns:tns="http://www.example.org/sample53" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<wsdl:types>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/sample53">
-<xsd:element name="NewOperationResponse" type="xsd:string"/><xsd:element name="NewOperationRequest" type="xsd:string"/></xsd:schema>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.sample.org/sample53"><xsd:import namespace="http://www.sample.org/30" schemaLocation="sample30.xsd"/>
-</xsd:schema>
-</wsdl:types>
-<wsdl:message name="NewOperationResponse">
-<wsdl:part name="NewOperationResponse" element="tns:NewOperationResponse"/>
-</wsdl:message>
-<wsdl:message name="NewOperationRequest">
-<wsdl:part name="NewOperationRequest" element="tns:NewOperationRequest"/>
-</wsdl:message>
-<wsdl:portType name="sample">
-<wsdl:operation name="NewOperation">
-<wsdl:input message="tns:NewOperationRequest"/>
-<wsdl:output message="tns:NewOperationResponse"/>
-</wsdl:operation>
-</wsdl:portType>
-<wsdl:binding name="sampleSOAP" type="tns:sample">
-<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-<wsdl:operation name="NewOperation">
-<soap:operation soapAction="http://www.example.org/sample/NewOperation"/>
-<wsdl:input>
-<soap:body use="literal" parts=" NewOperationRequest"/>
-</wsdl:input>
-<wsdl:output>
-<soap:body use="literal" parts=" NewOperationResponse"/>
-</wsdl:output>
-</wsdl:operation>
-</wsdl:binding>
-<wsdl:service name="sample">
-<wsdl:port name="sampleSOAP" binding="tns:sampleSOAP">
-<soap:address location="http://www.example.org/"/>
-</wsdl:port>
-</wsdl:service>
-</wsdl:definitions>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
deleted file mode 100644
index 275b34c69..000000000
--- a/bundles/org.eclipse.jst.ws.axis.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
deleted file mode 100644
index 862f49caa..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project b/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
deleted file mode 100644
index 846a39435..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.consumption.core</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env.core</project>
-	</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index c9ce80bde..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc-axis.jar
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.internal.axis.consumption.core.command,
- org.eclipse.jst.ws.internal.axis.consumption.core.common,
- org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.j2ee.web,
- org.apache.axis11
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index ae8aedf32..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.wsc-axis.jar = src/
-bin.includes = wsc-axis.jar,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.html,\
-               META-INF/
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
deleted file mode 100644
index 5e9ff7c46..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web service Axis Consumption Core
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
deleted file mode 100644
index c911fbfbd..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension point="org.eclipse.jst.ws.consumption.wsfinder">
-      <wsfinder
-            id="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            name="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            description="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
-            class="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis">
-      </wsfinder>
-   </extension>
-
-</plugin>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
deleted file mode 100644
index 0038ec5d8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for AxisDeployCommand
-#
-MSG_ERROR_PROJECT_URL_PARAM_NOT_SET=IWAB0054E Web project URL for deployment of Web service is not set in AxisDeployCommand
-MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET=IWAB0488E Location of Axis deployment file is not set in AxisDeployCommand
-MSG_ERROR_AXIS_DEPLOY=IWAB0489E Error when deploying Web service to Axis runtime
-MSG_AXIS_DEPLOY=Deploying Web service to Axis run-time environment
-MSG_AXIS_DEPLOY_OK=Web service successfuly deployed to Axis run-time environment
-
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-#
-# Messages for Java2WSDLCommand
-#
-TASK_LABEL_JAVA_WSDL_COMMAND=Java2WSDLCommand
-TASK_DESC_JAVA_WSDL_COMMAND=Calls to AXIS Java2WSDLCommand.
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java
-
-#
-# Messages for WSDL2JavaCommand
-#
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
-
-#
-# Messages common for Java2WSDLCommand and  WSDL2JavaCommand
-#
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
deleted file mode 100644
index 46cb492ed..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends SimpleCommand
-{
-  private static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$
-
-  private JavaWSDLParameter javaWSDLParam;
-  private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-  /**
-   * Constructor for AxisDeployCommand.
-   * @param String description
-   * @param String name
-   * 
-   */
-  public AxisDeployCommand()
-  {
-    super("org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand");
-  }
-
-  public Status execute(Environment environment)
-  {
-    if (javaWSDLParam == null)
-    {
-      return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"), Status.ERROR);
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"), Status.ERROR);
-    }
-
-    environment.getProgressMonitor().report(getMessage("MSG_AXIS_DEPLOY"));
-
-    Status status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-    	environment.getStatusHandler().reportError(status);
-    }
-    
-    return status;
-  }
-
-  protected Status executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-        project = new Project();
-        project.init();
-        taskType = "axis"; //$NON-NLS-1$
-        taskName = "axis-admin"; //$NON-NLS-1$
-        target = new Target();
-      }
-    }
-
-    DeployTask adminClient = new DeployTask();
-    String url = javaWSDLParam.getProjectURL() + SERVICE_EXT;
-    adminClient.setUrl(url);
-    adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
-    // Since the admin server may not be available right away we will try
-    // several times to execute it.
-    try
-    {
-      BuildException lastException = null;
-      
-      for( int index = 0; index < 20; index++ )
-      {
-        try
-        {
-          lastException = null;
-          adminClient.execute();
-        }
-        catch( BuildException exc )
-        {
-          lastException = exc;
-          
-          try
-          {
-            Thread.sleep( 200 );
-          }
-          catch( InterruptedException threadException  )
-          {
-          }
-        }
-        
-        // If no exception occured then we should break out of the loop.
-        if( lastException == null ) break;
-      }
-      
-      // If after many tries we still get an exception, then we will re throw it.
-      if( lastException != null ) throw lastException;
-    }
-    catch (BuildException e)
-    {
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      Status[] childStatus = new Status[1];
-      childStatus[0] = new SimpleStatus("AxisDeployCommand", message, Status.ERROR);
-      return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
-      getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
-    getMessage("MSG_AXIS_DEPLOY_OK"), Status.OK);
-
-  }
-
-  private String getMessage(String messageId, String parm1)
-  {
-    String message = resource.getString(messageId);
-    return MessageFormat.format(message, new String[] { parm1 });
-  }
-
-  /**
-   * Returns the message string identified by the given key from plugin.properties.
-   * 
-   * @return The String message.
-   */
-  public String getMessage(String key)
-  {
-    return resource.getString(key);
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
deleted file mode 100644
index cdf8cf592..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-
-import org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask;
-import org.apache.axis.tools.ant.wsdl.NamespaceMapping;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends SimpleCommand {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-	
-	private String LABEL = "TASK_LABEL_JAVA_WSDL_COMMAND";
-	private String DESCRIPTION = "TASK_DESC_JAVA_WSDL_COMMAND";
-
-	public Java2WSDLCommand() {
-		super();
-	    setName (getMessage(LABEL));
-		setDescription(getMessage(DESCRIPTION));
-	}	
-	/**
-	 * Constructor for Java2WSDLCommand.
-	 */
-	public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
-		super();
-	    setName (getMessage(LABEL));
-		setDescription(getMessage(DESCRIPTION));
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public Status execute(Environment environment) {
-		Status status;
-		if (javaWSDLParam_ == null) {
-			status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-			getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (javaWSDLParam_.getBeanName() == null) {
-			status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-			getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		environment.getProgressMonitor().report(
-			getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ) );
-
-		return executeAntTask(environment);
-	}
-
-	protected Status executeAntTask(Environment environment) {
-
-		final class Emitter extends Java2WsdlAntTask {
-			public Emitter() {
-				project = new Project();
-				project.init();
-				taskType = "axis"; //$NON-NLS-1$
-				taskName = "axis-java2wsdl"; //$NON-NLS-1$
-				target = new Target();
-			}
-		}
-
-		Emitter emitter = new Emitter();
-		emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
-		environment.getLog().log(Log.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-		
-		emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
-		environment.getLog().log(Log.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-		
-		emitter.setServiceElementName(javaWSDLParam_.getServiceName());
-		environment.getLog().log(Log.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-		
-		emitter.setLocation(javaWSDLParam_.getUrlLocation());
-		environment.getLog().log(Log.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-		
-		emitter.setMethods(javaWSDLParam_.getMethodString());
-		environment.getLog().log(Log.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-		
-		emitter.setStyle(javaWSDLParam_.getStyle());
-		environment.getLog().log(Log.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-		
-		emitter.setUse(javaWSDLParam_.getUse());
-		environment.getLog().log(Log.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-		
-		emitter.setOutput(new File(javaWSDLParam_.getOutputWsdlLocation()));
-		environment.getLog().log(Log.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-		
-		emitter.setNamespace(javaWSDLParam_.getNamespace());
-		environment.getLog().log(Log.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-		
-		emitter.setClassName(javaWSDLParam_.getBeanName());
-		environment.getLog().log(Log.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-		
-		emitter.setImplClass(javaWSDLParam_.getBeanName());
-		
-		HashMap mappings = javaWSDLParam_.getMappings();
-		if(mappings != null){
-			Iterator keys = mappings.keySet().iterator();
-			while(keys.hasNext()){
-				String pakage = (String)keys.next();
-				String namespace = (String)mappings.get(pakage);
-				NamespaceMapping map = new NamespaceMapping();
-				map.setPackage(pakage);
-				map.setNamespace(namespace);
-				emitter.addMapping(map);		
-			}
-		}
-		
-	
-		try {
-			emitter.execute();
-		} catch (BuildException e) {
-			environment.getLog().log(Log.ERROR, 5018, this, "executeAntTask", e);
-			Status status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-			getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
-			+e.getCause().toString(), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return new SimpleStatus( "" );
-
-	}
-	
-	public Status undo(Environment environment) {
-		return null;
-	}
-
-	public Status redo(Environment environment) {
-		return null;
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	private String getMessage(String messageId, String parm1) {
-		String message = resource.getString(messageId);
-		return MessageFormat.format(message, new String[] { parm1 });
-	}
-
-	/**
-	* Returns the message string identified by the given key from
-	* plugin.properties.
-	* @return The String message.
-	*/
-	public String getMessage(String key) {
-		return resource.getString(key);
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParm) {
-		this.javaWSDLParam_ = javaWSDLParm;
-	}
-	
-	public String getWsdlURI()
-	{
-	  File file = new File(getJavaWSDLParam().getOutputWsdlLocation()); 
-	    String url = "";
-		  try {
-	    	url = file.toURL().toString();
-	    }
-		  catch(MalformedURLException mue){}
-		return url;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
deleted file mode 100644
index a7b7abdd1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class WSDL2JavaCommand extends SimpleCommand {
-
-	private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$
-	private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$
-	private JavaWSDLParameter javaWSDLParam;
-	private String wsdlURI;
-	private String httpBasicAuthUsername;
-	private String httpBasicAuthPassword;
-	private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-	private String LABEL = "TASK_LABEL_WSDL_JAVA_COMMAND";
-	private String DESCRIPTION = "TASK_DESC_WSDL_JAVA_COMMAND";
-	
-
-	public WSDL2JavaCommand() {
-		super();
-		setName(getMessage(LABEL));
-		setDescription(getMessage(DESCRIPTION));
-	}
-
-	public Status execute(Environment environment) {
-		Status status;
-		if (javaWSDLParam == null) {
-			status = new SimpleStatus("WSDL2JavaCommand", //$NON-NLS-1$
-					getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (wsdlURI != null) //bottom up case has already has the correct WSDL on javaWSDLParam
-		{
-			javaWSDLParam.setInputWsdlLocation(wsdlURI);
-		}
-		javaWSDLParam.setHTTPUsername(httpBasicAuthUsername);
-		javaWSDLParam.setHTTPPassword(httpBasicAuthPassword);
-		
-		Emitter wsdl2Java = new Emitter();
-		if (environment.getLog().isEnabled("emitter")) {
-			wsdl2Java.setVerbose(true);
-		} else {
-			wsdl2Java.setVerbose(false);
-		}
-		boolean serverSide = javaWSDLParam.getServerSide() == JavaWSDLParameter.SERVER_SIDE_BEAN;
-		wsdl2Java.setServerSide(serverSide);
-		if (serverSide) {
-			wsdl2Java.setSkeletonWanted(javaWSDLParam.isSkeletonDeploy());
-		}
-		if (javaWSDLParam.isMetaInfOnly()) {
-			// for the case Java2WSDL-WSDL2Java
-			wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getOutput()));
-			HashMap pck2nsMap = javaWSDLParam.getMappings();
-			if (pck2nsMap != null) {
-				HashMap ns2pckMap = new HashMap();
-				Iterator keys = pck2nsMap.keySet().iterator();
-				while (keys.hasNext()) {
-					String pakage = (String) keys.next();
-					String namespace = (String) pck2nsMap.get(pakage);
-					ns2pckMap.put(namespace, pakage);
-				}
-				wsdl2Java.setNamespaceMap(ns2pckMap);
-			}
-		} else {
-			//  for the case WSDL2Java
-			wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getJavaOutput()));
-			if (javaWSDLParam.getMappings() != null) {
-				wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
-			}
-		}
-		environment.getLog().log(Log.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
-		if (javaWSDLParam.getHTTPPassword() != null) {
-			wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
-			environment.getLog().log(Log.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
-		}
-		if (javaWSDLParam.getHTTPUsername() != null) {
-			wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
-			environment.getLog().log(Log.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
-		}
-		environment.getLog().log(Log.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
-		environment.getProgressMonitor().report(getMessage("MSG_PARSING_WSDL", javaWSDLParam.getInputWsdlLocation() ) );
-		try {
-			wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
-			if (serverSide) {
-				// set deployment files
-				List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
-				List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
-				ArrayList deplFiles = new ArrayList();
-				if (deploymentFiles1 != null && deploymentFiles2 != null) {
-					deploymentFiles1.addAll(deploymentFiles2);
-					for (int i = 0; i < deploymentFiles1.size(); i++) {
-						GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
-						deplFiles.add(entry.fileName);
-					}
-					String[] deplFilesArray = new String[deplFiles.size()];
-					deplFiles.toArray(deplFilesArray);
-					javaWSDLParam.setDeploymentFiles(deplFilesArray);
-				}
-				// set java files
-				List javaFiles = wsdl2Java.getGeneratedFileNames();
-				javaFiles.removeAll(deplFiles);
-				String[] javaFileNames = new String[javaFiles.size()];
-				javaFiles.toArray(javaFileNames);
-				javaWSDLParam.setJavaFiles(javaFileNames);
-			}
-			
-		} catch (Exception e) {
-			environment.getLog().log(Log.ERROR, 5021, this, "execute", e);
-			status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
-					getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
-							+ e.toString(), Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return new SimpleStatus("");
-	}
-
-	/*
-	 * Hack: Axis doesn't like file URLs
-	 */
-	private String removeFileProtocol(String s) {
-		if (s.startsWith("file:")) {
-			String newS = s.substring(5, s.length());
-			int i = newS.indexOf(':');
-			if (i != -1) {
-				String protocol = newS.substring(0, i);
-				int j = protocol.indexOf('/');
-				int k = protocol.indexOf('\\');
-				int max = Math.max(j, k);
-				if (max != -1)
-					newS = newS.substring(max + 1, newS.length());
-			}
-			return newS;
-		}
-		return s;
-	}
-
-	public Status undo(Environment environment) {
-		return null;
-	}
-
-	public Status redo(Environment environment) {
-		return null;
-	}
-
-	private String getMessage(String messageId, String parm1) {
-		String message = resource.getString(messageId);
-		return MessageFormat.format(message, new String[]{parm1});
-	}
-
-	/**
-	 * Returns the message string identified by the given key from
-	 * plugin.properties.
-	 * 
-	 * @return The String message.
-	 */
-	public String getMessage(String key) {
-		return resource.getString(key);
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam = javaWSDLParam;
-	}
-
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam;
-	}
-
-	/**
-	 * @param httpBasicAuthPassword
-	 *            The httpBasicAuthPassword to set.
-	 */
-	public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
-		this.httpBasicAuthPassword = httpBasicAuthPassword;
-	}
-
-	/**
-	 * @param httpBasicAuthUsername
-	 *            The httpBasicAuthUsername to set.
-	 */
-	public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
-		this.httpBasicAuthUsername = httpBasicAuthUsername;
-	}
-
-	public void setWsdlURI(String wsdlURI) {
-		this.wsdlURI = wsdlURI;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
deleted file mode 100644
index c3da781b3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-
-public class JavaWSDLParameter {
-
-	public static final byte SERVER_SIDE_NONE = 0;
-	public static final byte SERVER_SIDE_BEAN = 1;
-	public static final byte SERVER_SIDE_EJB = 2;
-
-	public static final String STYLE_RPC = "RPC"; //$NON-NLS-1$
-	public static final String STYLE_DOCUMENT = "DOCUMENT"; //$NON-NLS-1$
-	public static final String STYLE_WRAPPED = "WRAPPED"; //$NON-NLS-1$
-
-	public static final String USE_LITERAL = "LITERAL"; //$NON-NLS-1$
-	public static final String USE_ENCODED = "ENCODED"; //$NON-NLS-1$
-
-	private String beanName = null; // The name of the Java bean
-	private String classpath = null;
-	// The class path for loading the bean and command execution
-	private String beanPackage = null; // The package location of the bean
-	private String portTypeName = null; // The name of the port type element
-	private String serviceName = null; // The name of the service element
-	private String outputWsdlLocation = null;
-	// The output location of the WSDL file
-	private String inputWsdlLocation = null;
-	// The input location of the WSDL file
-	private String urlLocation = null; // The URL location of the web service
-	private Hashtable methods = null; // The array of method names
-	private String style = null;
-	// The style (RPC | DOCUMENT | WRAPPED) attribute for the generated WSDL
-	private String use = null;
-	// The use (LITERAL | ENCODED) attribtue for the generated WSDL
-	private String output = null;
-	// The output location for deployment descriptors & Java code (output from WSDL2Java command)
-	private String javaOutput = null;
-	// The output location for Java code (output from WSDL2Java command)
-	private boolean metaInfOnly = false; // META-INF-ONLY flag
-	private byte serverSide = SERVER_SIDE_NONE;
-	// server-side flag (SERVER_SIDE_NONE | SERVER_SIDE_BEAN | SERVER_SIDE_EJB)
-	private String namespace = null;
-	private boolean skeletonDeploy = true;
-	private String container = null;
-	private String[] deploymentFiles = null;
-	private String[] javaFiles = null;
-	private String projectURL = null;
-	private HashMap mappingPairs;
-	private String httpUsername_ = null;
-	private String httpPassword_ = null;
-
-	public void setContainer(String container) {
-		this.container = container;
-	}
-
-	public String getContainer() {
-		return container;
-	}
-
-	/**
-	 * Constructor for JavaWSDLParameter.
-	 */
-	public JavaWSDLParameter() {
-	}
-
-	/**
-	 * Returns the beanName.
-	 * @return String
-	 */
-	public String getBeanName() {
-		return beanName;
-	}
-
-	public String getBeanPackage() {
-		return beanPackage;
-	}
-
-	/**
-	 * Returns the portTypeName.
-	 * @return String
-	 */
-	public String getPortTypeName() {
-		return portTypeName;
-	}
-
-	/**
-	 * Returns the serviceName.
-	 * @return String
-	 */
-	public String getServiceName() {
-		return serviceName;
-	}
-
-	/**
-	 * Returns the output.
-	 * @return String
-	 */
-	public String getOutput() {
-		return output;
-	}
-
-	/**
-	 * Returns the methods.
-	 * @return String[]
-	 */
-	public Hashtable getMethods() {
-		return methods;
-	}
-
-	/**
-	 * Returns the comma seperated string represetation of the methods.
-	 * @return String
-	 */
-	public String getMethodString() {
-		String methodString = ""; //$NON-NLS-1$
-		Enumeration e = methods.keys();
- 		for (int i=0; e.hasMoreElements(); i++)
-    	{
-
-			String signature = (String) e.nextElement();
-			if (((Boolean) methods.get(signature)).booleanValue()){
-							int index = signature.indexOf('(');
-							String name = signature.substring(0, index);
-							methodString += name;
-			}
-	    	if (i != methods.size() -1) // this is not the last array item	
-			{
-				methodString += ",";
-			}
-		}
-		return methodString;
-	}
-
-	/**
-	 * Returns the style attribute.
-	 * @return String
-	 */
-	public String getStyle() {
-		return style;
-	}
-
-	/**
-	 * Returns the urlLocation.
-	 * @return String
-	 */
-	public String getUrlLocation() {
-		return urlLocation;
-	}
-
-	/**
-	 * Returns the use attribute.
-	 * @return String
-	 */
-	public String getUse() {
-		return use;
-	}
-
-	/**
-	 * Returns the outputWsdlLocation.
-	 * @return String
-	 */
-	public String getOutputWsdlLocation() {
-		return outputWsdlLocation;
-	}
-
-	/**
-	 * Sets the beanName.
-	 * @param beanName The beanName to set
-	 */
-	public void setBeanName(String beanName) {
-		this.beanName = beanName;
-	}
-
-	public void setBeanPackage(String beanPackage) {
-		this.beanPackage = beanPackage;
-	}
-
-	/**
-	 * Sets the portTypeName.
-	 * @param portTypeName The portTypeName to set
-	 */
-	public void setPortTypeName(String portTypeName) {
-		this.portTypeName = portTypeName;
-	}
-
-	/**
-	 * Sets the serviceName.
-	 * @param serviceName The serviceName to set
-	 */
-	public void setServiceName(String serviceName) {
-		this.serviceName = serviceName;
-	}
-
-	/**
-	 * Sets the output.
-	 * @param output The output to set
-	 */
-	public void setOutput(String output) {
-		this.output = output;
-	}
-
-	/**
-	 * Sets the methods.
-	 * @param methods The methods to set
-	 */
-	public void setMethods(Hashtable methods) {
-		this.methods = methods;
-	}
-
-	/**
-	 * Sets the style.
-	 * @param style The style to set
-	 */
-	public void setStyle(String style) {
-		this.style = style;
-	}
-
-	/**
-	 * Sets the urlLocation.
-	 * @param urlLocation The urlLocation to set
-	 */
-	public void setUrlLocation(String urlLocation) {
-		this.urlLocation = urlLocation;
-	}
-
-	/**
-	 * Sets the use.
-	 * @param use The use to set
-	 */
-	public void setUse(String use) {
-		this.use = use;
-	}
-
-	/**
-	 * Sets the outputWsdlLocation.
-	 * @param outputWsdlLocation The outputWsdlLocation to set
-	 */
-	public void setOutputWsdlLocation(String wsdlLocation) {
-		this.outputWsdlLocation = wsdlLocation;
-	}
-
-	/**
-	 * Returns the metaInfOnly.
-	 * @return boolean
-	 */
-	public boolean isMetaInfOnly() {
-		return metaInfOnly;
-	}
-
-	/**
-	 * Sets the metaInfOnly.
-	 * @param metaInfOnly The metaInfOnly to set
-	 */
-	public void setMetaInfOnly(boolean metaInfOnly) {
-		this.metaInfOnly = metaInfOnly;
-	}
-
-	/**
-	 * Returns the serverSide.
-	 * @return byte
-	 */
-	public byte getServerSide() {
-		return serverSide;
-	}
-
-	/**
-	 * Sets the serverSide.
-	 * @param serverSide The serverSide to set
-	 */
-	public void setServerSide(byte serverSide) {
-		this.serverSide = serverSide;
-	}
-
-	/**
-	 * Returns the inputWsdlLocation.
-	 * @return String
-	 */
-	public String getInputWsdlLocation() {
-		return inputWsdlLocation;
-	}
-
-	/**
-	 * Sets the inputWsdlLocation.
-	 * @param inputWsdlLocation The inputWsdlLocation to set
-	 */
-	public void setInputWsdlLocation(String inputWsdlLocation) {
-		this.inputWsdlLocation = inputWsdlLocation;
-	}
-
-	/**
-	 * Returns the namespace.
-	 * @return String
-	 */
-	public String getNamespace() {
-		return namespace;
-	}
-
-	/**
-	 * Sets the namespace.
-	 * @param namespace The namespace to set
-	 */
-	public void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	/**
-	 * Returns the Java output.
-	 * @return String
-	 */
-	public String getJavaOutput() {
-		return javaOutput;
-	}
-
-	/**
-	 * Sets the javaOutput.
-	 * @param javaOutput The Java output to set
-	 */
-	public void setJavaOutput(String javaOutput) {
-		this.javaOutput = javaOutput;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getClasspath() {
-		return classpath;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setClasspath(String string) {
-		classpath = string;
-	}
-
-	/**
-	 * @return
-	 */
-	public boolean isSkeletonDeploy() {
-		return skeletonDeploy;
-	}
-
-	/**
-	 * @param b
-	 */
-	public void setSkeletonDeploy(boolean b) {
-		skeletonDeploy = b;
-	}
-
-	/**
-	 * @return
-	 */
-	public String[] getDeploymentFiles() {
-		return deploymentFiles;
-	}
-
-	/**
-	 * @param strings
-	 */
-	public void setDeploymentFiles(String[] strings) {
-		deploymentFiles = strings;
-	}
-
-	/**
-	 * @return
-	 */
-	public String[] getJavaFiles() {
-		return javaFiles;
-	}
-
-	/**
-	 * @param strings
-	 */
-	public void setJavaFiles(String[] strings) {
-		javaFiles = strings;
-	}
-
-	/**
-	 * @return
-	 */
-	public String getProjectURL() {
-		return projectURL;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setProjectURL(String string) {
-		projectURL = string;
-	}
-	
-	public HashMap getMappings()
-	{
-			return mappingPairs;
-	}
-
-	public void setMappings(HashMap map)
-	{
-			mappingPairs = map;
-	}
-	
-	/**
-	 * Returns the user name for HTTP basic authentication
-	 * @return String
-	 */
-	public String getHTTPUsername()
-	{
-	  return httpUsername_;
-	}
-
-	/**
-	 * Sets the user name for HTTP basic authentication
-	 * @param String
-	 */
-	public void setHTTPUsername(String httpUsername)
-	{
-	  httpUsername_ = httpUsername;
-	}
-
-	/**
-	 * Returns the password for HTTP basic authentication
-	 * @return String
-	 */
-	public String getHTTPPassword()
-	{
-	  return httpPassword_;
-	}
-
-	/**
-	 * @param string
-	 */
-	public void setHTTPPassword(String httpPassword) {
-		httpPassword_ = httpPassword;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
deleted file mode 100644
index 84cd5f4d7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.LiveWSDLFilter;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.WSFinderCommon;
-
-public class WSFinderAxis extends WSFinderCommon
-{
-  public WSFinderAxis()
-  {
-    super();
-  }
-
-  public List find()
-  {
-    final Vector wsdlURLs = new Vector();
-    IProject[] projects = getWorkspaceProjects();
-    for (int i = 0; i < projects.length; i++)
-    {
-      J2EEWebNatureRuntime webNature = getWebNature(projects[i]);
-      if (webNature != null)
-      {
-        final String webProjectURL = ResourceUtils.getWebProjectURL(projects[i]);
-        if (webProjectURL != null && webProjectURL.length() > 0)
-        {
-          final IFolder folderWSDL = getFolderRootPublishable(webNature).getFolder("wsdl");
-          try
-          {
-            folderWSDL.accept(
-              new IResourceVisitor()
-              {
-                public boolean visit(IResource resource)
-                {
-                  if (resource.getType() == IResource.FILE)
-                  {
-                    String ext = resource.getFileExtension();
-                    if (ext != null && ext.equalsIgnoreCase("wsdl"))
-                    {
-                      String resPath = resource.getFullPath().toString();
-                      String folderPath = folderWSDL.getFullPath().toString();
-                      int index = resPath.indexOf(folderPath);
-                      if (index != -1)
-                        resPath = resPath.substring(index+folderPath.length(), resPath.length());
-                      StringBuffer sb = new StringBuffer(webProjectURL);
-                      sb.append("/wsdl");
-                      sb.append(resPath);
-                      wsdlURLs.add(sb.toString());
-                    }
-                  }
-                  return true;
-                }
-              }
-            );
-          }
-          catch (CoreException ce)
-          {
-          }
-        }
-      }
-    }
-    LiveWSDLFilter[] filters = new LiveWSDLFilter[wsdlURLs.size()];
-    for (int i = 0; i < filters.length; i++)
-    {
-      filters[i] = new LiveWSDLFilter((String)wsdlURLs.get(i));
-      filters[i].start();
-    }
-    for (int i = 0; i < filters.length; i++)
-    {
-      if (!filters[i].isFinish())
-      {
-        Thread.yield();
-        i = -1;
-      }
-    }
-    for (int i = 0; i < filters.length; i++)
-    {
-      if (!filters[i].isWSDLLive())
-        wsdlURLs.remove(filters[i].getWSDLURL());
-    }
-    return wsdlURLs;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
deleted file mode 100644
index 275b34c69..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
deleted file mode 100644
index a21e9e032..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
deleted file mode 100644
index cb0ee10ec..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.consumption.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-		<project>org.eclipse.jst.ws.axis.consumption.core</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.discovery.core</project>
-		<project>org.eclipse.jst.ws.ui</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.parser</project>
-	</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index cecc076d9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc-axis-ui.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command,
- org.eclipse.jst.ws.internal.axis.consumption.ui.env,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jem,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.modulecore,
- org.wsdl4j,
- org.apache.axis11
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
deleted file mode 100644
index e1038d6c1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.wsc-axis-ui.jar = src/
-bin.includes = wsc-axis-ui.jar,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
deleted file mode 100644
index cb7a83ddf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Consumption UI
-PLUGIN_PROVIDER=Eclipse.org
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
deleted file mode 100644
index 9bfda1ae6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <!-- Web Service Client Types -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceClientType">
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.32"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
-            id="SERVER_ID_TOMCAT32_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.40"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
-            id="SERVER_ID_TOMCAT40_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.41"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
-            id="SERVER_ID_TOMCAT41_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.50"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
-            id="SERVER_ID_TOMCAT50_LOCAL">
-      </webServiceServer>
-
-      <webServiceRuntime
-            label="%LABEL_RUNTIME_AXIS_11"
-            description="%DESC_RUNTIME_AXIS_11"
-            isDefault="false"
-            j2eeversion="13 14"
-            id="org.eclipse.jst.ws.runtime.axis11">
-      </webServiceRuntime>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT32_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat32Local">
-      </webServiceClientType>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT40_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat40Local">
-      </webServiceClientType>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT41_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat41Local">
-      </webServiceClientType>
-
-      <webServiceClientType
-            name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            clientType="org.eclipse.jst.ws.client.type.java"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
-            server="SERVER_ID_TOMCAT50_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat50Local">
-      </webServiceClientType>
-
-   </extension>
-
-   <!-- J2EE Service Reference Generator -->
-      
-   <extension
-         point="org.eclipse.jst.j2ee.WebServiceClientGenerator">
-     <generator
-           className="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator">
-        <runtime
-              serverTarget="Generic J2EE Container">
-        </runtime>         
-     </generator>
-   </extension>
-   
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisClientConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
-             class="org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisClientConfigWidgetFactory"/>
-    </extension> 
-
-</plugin>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
deleted file mode 100644
index 5a9b0bbbb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_READ_WSDL=IWAB0494E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_DEFINITION=IWAB0495E WSDL file at {0} has no definition element
-MSG_ERROR_WSDL_NO_PORT=IWAB0496E WSDL file at {0} has no port element
-MSG_ERROR_WRITE_WSDL=IWAB0497E Error in writing WSDL file {0}
-
-
-
-#
-# Messages for CopyClientWSDLTask
-#
-MSG_ERROR_IMPORT_WSDL=IWAB0531E Error in resolving WSDL file {0}, import WSDL file must have absolute URL or relative URL in the same directory
-
-
-#
-#DefaultsForClientJavaWSDLCommand
-#
-TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS=DefaultsForClientJavaWSDL
-TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for client side.
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-TASK_LABEL_JARS_TO_PROJECT=AddJarsToProjectBuildPathTask
-TASK_DESC_JARS_TO_PROJECT=Add Jars to project build path.
-MSG_WARN_NO_JAVA_NATURE=IWAB0502W The project is not a Java project.
-MSG_ERROR_BAD_BUILDPATH=IWAB0503E Unable to update Java build path. Please check your system environment.
-
-#
-#CopyAxisJarCommand
-#
-TASK_DESC_COPY_JARS_TO_PROJECT=CopyAxisJarCommand
-TASK_LABEL_COPY_JARS_TO_PROJECT=Copy required Axis runtime jars from plugin to web project.
-PROGRESS_INFO_COPY_AXIS_CFG=IWAB0505I Copying Axis jar files to web project.
-MSG_ERROR_FILECOPY=IWAB0506E Error when copying Axis jar files to web project
-
-#
-#RefreshProjectTask
-#
-TASK_LABEL_REFESH_PROJECT=RefreshProjectTask
-TASK_DESC_REFESH_PROJECT=Refresh the files on the project with the local file system.
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-
-#
-#WebServiceAxisProxyFragment
-#
-
-#
-#WebServiceAxisProxyPage
-#
-TOOLTIP_PWJB_PAGE=Page
-TOOLTIP_PWJB_TEXT_FOLDER=Folder for proxy to be generated for the selected binding.
-TOOLTIP_PWJB_CHECKBOX_GENPROXY=Check to enable/disable the generation of a proxy.
-
-PAGE_TITLE_WS_AXIS_PROXY=Web Service Proxy Page
-PAGE_DESC_WS_AXIS_PROXY=Select generate proxy if you want to generate proxy for your service.
-CHECKBOX_GENPROXY=Generate proxy
-LABEL_FOLDER_NAME=Output folder
-
-#
-# CheckAxisDeploymentDescriptorsTask
-#
-CHECK_WS_DD_TASK_DESCRIPTION=CheckAxisDeploymentDescriptorsTask
-CHECK_WS_DD_TASK_LABEL=CheckAxisDeploymentDescriptorsTask
-
-#
-#ClasspathUtils
-#
-MSG_ERROR_CLASSPATH_UTILS_IOEXCEPTION=IWAB0509E IOException in ClasspathUtils
-
-#
-# Messages for WebSerivceAxisMappingsPage
-#
-PAGE_TITLE_WS_BEAN2XML=Web Service package to namespace mapping
-PAGE_TITLE_WS_XML2PROXY=Web Service Client namespace to package mapping
-PAGE_DESC_P2N_MAPPINGS=Define custom mapping for package to namespace.
-LABEL_MAPPING_PAIRS=Mapping pairs
-TABLE_COLUMN_LABEL_PACKAGE=package
-TABLE_COLUMN_LABEL_NAMESPACE=namespace
-LABEL_EXPLORE_MAPPINGS_XML2BEAN=Define custom mapping for namespace to package.
-TOOLTIP_N2P_SHOW_MAPPINGS=Define namespace to package mapping for customization.
-
-#
-# Messages for CheckAxisDeploymentDescriptorsTask
-#
-MSG_ERROR_XML_FILE_OVERWRITE_DISABLED=IWAB0532E Do you want to overwrite the Apache Axis deployment descriptor?
-
-#
-#Messages for CopyClientWSDLCommand
-#
-TASK_DESC_COPY_CLIENT_WSDL=Copies WSDL to Client project
-TASK_LABEL_COPY_CLIENT_WSDL=Copy WSDL to Client project
-
-#
-#AxisClientInputCommand and AxisClientOutputCommand
-#
-
-TASK_LABEL_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_DESC_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_LABEL_AXIS_CLIENT_OUTPUT=Axis client output commmand
-TASK_DESC_AXIS_CLIENT_OUTPUT=Axis client output commmand
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
deleted file mode 100644
index b4ed22828..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Command to add axis.jar to the build path of a project as an external variable
- */
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-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.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class AddAxisJARToBuildPathCommand extends SimpleCommand
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  private MessageUtils msgUtils;
-  private String jarPluginId = "org.apache.axis11";
-  private String jarPluginRelPath = "lib";
-  private String jarName = "axis.jar";
-  private IProject project;
-  
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
-   */
-  public Status execute(Environment environment)
-  {
-    msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    Status status = new SimpleStatus("");
-
-    //Add JARs to the classpath
-    IClasspathEntry[] oldClasspath;
-    IClasspathEntry[] newClasspath;
-    IJavaProject javaProject;
-    
-    //Get the old classpath
-    try
-    {    
-      javaProject = JavaCore.create(project);    
-      if (javaProject == null)
-      {
-        Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-        return wStatus;
-      }
-
-      oldClasspath = javaProject.getRawClasspath();
-    }
-    catch (JavaModelException e)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-      return wStatus;
-    }
-    
-    //Check if the axis.jar is already on the build path
-    boolean found = false;
-	for (int i=0; i<oldClasspath.length; i++)
-	{
-	  found = found || oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
-    }
-
-	if (found) 
-	{
-	  return status;
-	}    
-    
-	//Add axis.jar to the build path
-	newClasspath = new IClasspathEntry[oldClasspath.length + 1];
-    int i = 0;
-    for (i=0 ; i < oldClasspath.length; i++)
-    {
-      newClasspath[i] = oldClasspath[i];
-    }
-    
-    IClasspathEntry newEntry = getClasspathEntry();
-    if (newEntry==null)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-      return wStatus;
-    }
-    newClasspath[i] = newEntry;
-    
-    try
-    {
-      javaProject.setRawClasspath(newClasspath,null);
-    }
-    catch (JavaModelException e)
-    {
-      Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
-      return wStatus;
-    }
-    
-    
-    return status;
-    
-  }
-  
-  private IClasspathEntry getClasspathEntry()
-  {
-    try
-    {
-      IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-      IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(jarPluginId);
-
-      StringBuffer theJar = new StringBuffer();
-      theJar.append(jarPluginRelPath);
-
-      if (jarPluginRelPath.length()>0)
-        theJar.append(IPath.SEPARATOR);
-
-      theJar.append(jarName);
-      
-      URL localURL = Platform.asLocalURL(new URL(pluginDescriptor.getInstallURL(),theJar.toString()));
-      Path jarPath =  new Path(localURL.getFile());
-      IClasspathEntry cpEntry = JavaCore.newLibraryEntry(jarPath, null, null);
-      return cpEntry;
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-    catch (IOException e)
-    {
-      return null;
-    }
-
-  }
- 
-  
-  /**
-   * @param project The project to set.
-   */
-  public void setProject(IProject project)
-  {
-    this.project = project;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
deleted file mode 100644
index 0dbdba1c6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- * AxisClientDefaultingCommand
- *  
- */
-public class AxisClientDefaultingCommand extends SimpleCommand 
-{
-    private boolean isClientScenario_  = true;
-	private boolean customizeMappings_ = false;
-	private boolean generateProxy_ = true;
-	private String clientRuntimeId_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject proxyProject_ = null;
-	private IProject clientProjectEAR_ = null;
-	private String wsdlURL_;
-	private boolean testProxySelected_;
-	private IServer clientExistingServer_;
-	private String clientServer_;
-	private String clientServerTypeId_;
-	private boolean clientIsExistingServer_;
-	private String proxyProjectFolder_;
-	private WebServicesParser webServicesParser_;
-	private String            moduleName_;
-	
-	
-	public AxisClientDefaultingCommand( String moduleName ) 
-	{
-	  moduleName_ = moduleName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
-	 */
-	public Status execute(Environment environment) {
-		Status status = new SimpleStatus("");
-		
-		clientExistingServer_ = getServerFromServerLabel();
-		if (clientExistingServer_ != null) {
-			clientServerTypeId_ = clientExistingServer_.getServerType().getId();
-		} else {
-			//TODO get the factory id for the type.
-		}
-		//javaWSDLParam
-		javaWSDLParam_ = new JavaWSDLParameter();
-		
-		// proxyProjectFolber_
-		
-		webServicesParser_ = WSDLParserFactory.getWSDLParser();
-		return status;
-	}
-
-	public void setClientRuntimeID(String clientRuntimeId) {
-		clientRuntimeId_ = clientRuntimeId;
-	}
-
-	public String getClientRuntimeID() {
-		return this.clientRuntimeId_;
-	}
-
-	/**
-	 * @return Returns the javaWSDLParam.
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * @return Returns the clientProject.
-	 */
-	public IProject getClientProject() {
-		return proxyProject_;
-	}
-
-	/**
-	 * @param clientProject
-	 *            The clientProject to set.
-	 */
-	public void setClientProject(IProject clientProject) {
-		this.proxyProject_ = clientProject;
-	}
-
-	/**
-	 * @return Returns the clientProjectEAR.
-	 */
-	public IProject getClientProjectEAR() {
-		return clientProjectEAR_;
-	}
-
-	/**
-	 * @param clientProjectEAR
-	 *            The clientProjectEAR to set.
-	 */
-	public void setClientProjectEAR(IProject clientProjectEAR) {
-		this.clientProjectEAR_ = clientProjectEAR;
-	}
-
-	/**
-	 * @return Returns the testProxySelected.
-	 */
-	public boolean getTestProxySelected() {
-		return testProxySelected_;
-	}
-
-	/**
-	 * @param testProxySelected
-	 *            The testProxySelected to set.
-	 */
-	public void setTestProxySelected(boolean testProxySelected) {
-		this.testProxySelected_ = testProxySelected;
-	}
-
-	/**
-	 * @return Returns the wsdlURL.
-	 */
-	public String getWsdlURL() {
-	  return wsdlURL_;
-	}
-
-	/**
-	 * @param wsdlURL
-	 *            The wsdlURL to set.
-	 */
-	public void setWsdlURL(String wsdlURL) {
-		this.wsdlURL_ = wsdlURL;
-	}
-
-	/**
-	 * @return Returns the clientServer.
-	 */
-	public IServer getClientExistingServer() {
-		return clientExistingServer_;
-	}
-
-	/**
-	 * @param clientServer
-	 *            The clientServer to set.
-	 */
-	public void setClientServer(String clientServer) {
-		this.clientServer_ = clientServer;
-	}
-
-	/**
-	 * @return Returns the clientIsExistingServer.
-	 */
-	public boolean isClientIsExistingServer() {
-		return clientIsExistingServer_;
-	}
-
-	/**
-	 * @param clientIsExistingServer
-	 *            The clientIsExistingServer to set.
-	 */
-	public void setClientIsExistingServer(boolean clientIsExistingServer) {
-		this.clientIsExistingServer_ = clientIsExistingServer;
-	}
-
-	public boolean getCustomizeClientMappings() {
-		return customizeMappings_;
-	}
-
-	public void setCustomizeClientMappings(boolean value) {
-		customizeMappings_ = value;
-	}
-
-	private IServer getServerFromServerLabel() {
-		if (true)
-		// rsk revisit if (clientIsExistingServer_)
-		{
-			// Maybe this should be in WebServiceServerRuntimeTypeRegistry
-			Vector serverIds = new Vector();
-			{
-				IServer[] servers = ServerCore.getServers();
-				if (servers != null && servers.length!=0) {
-					for (int i = 0; i < servers.length; i++) {
-						IServer server = (IServer) servers[i];
-						if ((server.getName()).equals(clientServer_))
-							return server;
-					}
-				}
-			}
-			//
-		} else {
-			//TODO create the server
-		}
-		return null;
-	}
-	/**
-	 * @return Returns the proxyProjectFolder.
-	 */
-	public String getProxyProjectFolder() {
-		if (proxyProject_!=null) {
-			proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ ).toString();
-		}		
-		return proxyProjectFolder_;  
-	}
-
-	/**
-	 * @return Returns the webServicesParser.
-	 */
-	public WebServicesParser getWebServicesParser() {
-		return webServicesParser_;
-	}
-	/**
-	 * @param webServicesParser The webServicesParser to set.
-	 */
-	public void setWebServicesParser(WebServicesParser webServicesParser) {
-		this.webServicesParser_ = webServicesParser;
-	}
-	/**
-	 * @return Returns the generateProxy.
-	 */
-	public boolean getGenerateProxy() {
-		return generateProxy_;
-	}
-	/**
-	 * @param generateProxy The generateProxy to set.
-	 */
-	public void setGenerateProxy(boolean generateProxy) {
-		this.generateProxy_ = generateProxy;
-	}
-	
-    /**
-     * @return Returns the isClientScenario_.
-     */
-    public boolean getIsClientScenario()
-    {
-      return isClientScenario_;
-    }
-    
-    /**
-     * @param isClientScenario_ The isClientScenario_ to set.
-     */
-    public void setIsClientScenario(boolean isClientScenario)
-    {
-      isClientScenario_ = isClientScenario;
-    }
-    
-    /**
-     * @param setEndpointMethod The setEndpointMethod to set.
-     */
-    public String getSetEndpointMethod()
-    {
-      return "setEndpoint";
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
deleted file mode 100644
index f1d53ac8c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceClientGenerator;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.env.J2EEEnvironment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- */
-public class AxisClientGenerator extends WebServiceClientGenerator 
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  public IStatus genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
-  {
-  	//get info from the model
-  	String wsdlURL = dataModel.getWSDLUrl();
-    String project = dataModel.getProjectName();
-    String outputWSDLFilePathName = dataModel.getOutputWSDLFileName();
-    String serviceQName = dataModel.getServiceQName();
-    boolean shouldDeploy = dataModel.shouldDeploy();
-    
-    
-    //Generate the artifacts
-    Status status = new SimpleStatus("");
-    //AxisClientDefaultingCommand
-    AxisClientDefaultingCommand axisClientDefaultingCommand = new AxisClientDefaultingCommand("");
-    axisClientDefaultingCommand.setWsdlURL(wsdlURL);
-    axisClientDefaultingCommand.setWebServicesParser(new WebServicesParserExt());
-    axisClientDefaultingCommand.setClientProject(ProjectUtilities.getProject(project));
-    axisClientDefaultingCommand.setTestProxySelected(false);
-    axisClientDefaultingCommand.setIsClientScenario(true);
-    axisClientDefaultingCommand.setGenerateProxy(true);
-    J2EEEnvironment j2eeEnvironment = new J2EEEnvironment();
-    status = axisClientDefaultingCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }
-    
-//  Figure out if this is a Web, EJB, or AppClient project
-    boolean isWebProject = ResourceUtils.isWebProject(axisClientDefaultingCommand.getClientProject());
-    
-    //DefaultsForHTTPBasicAuthCommand
-    DefaultsForHTTPBasicAuthCommand httpCommand = new DefaultsForHTTPBasicAuthCommand();
-    httpCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    httpCommand.setWsdlServiceURL(axisClientDefaultingCommand.getWsdlURL());
-    httpCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
-    status = httpCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }
-    
-    //CopyAxisJarCommand
-    //The code generated by the Axis WSDL2Java emitter requires axis.jar in order to compile.
-    //In the case of a Web project, we add it to the lib directory.
-    //In the case of an EJB or App Client project, we add it as an external JAR. This breaks
-    //the team environment scenario. We will have to think of a better way to deal with this 
-    //in the future.
-    if (isWebProject)
-    {
-	    CopyAxisJarCommand axjCommand = new CopyAxisJarCommand("");
-	    axjCommand.setProject(axisClientDefaultingCommand.getClientProject());
-	    status = axjCommand.execute(j2eeEnvironment);
-	    if (status.getSeverity()!=Status.OK)
-	    {
-	      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-	    }
-    }
-    else 
-    {
-      AddAxisJARToBuildPathCommand addAxisCommand = new AddAxisJARToBuildPathCommand();
-      addAxisCommand.setProject(axisClientDefaultingCommand.getClientProject());
-      status = addAxisCommand.execute(j2eeEnvironment);
-	  if (status.getSeverity() != Status.OK)
-      {
-        return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-      }      
-    }
-    
-    //AddJarsToProjectBuildPathTask
-    AddJarsToProjectBuildPathTask addJarsCommand = new AddJarsToProjectBuildPathTask();
-    addJarsCommand.setProject(axisClientDefaultingCommand.getClientProject());
-    status = addJarsCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    //DefaultsForClientJavaWSDLCommand
-    DefaultsForClientJavaWSDLCommand defClientCommand = new DefaultsForClientJavaWSDLCommand("");
-    defClientCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    defClientCommand.setProxyProject(axisClientDefaultingCommand.getClientProject());
-    defClientCommand.setWSDLServiceURL(axisClientDefaultingCommand.getWsdlURL());
-    status = defClientCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }        
-    
-    //ValidateWSDLCommand
-    ValidateWSDLCommand valWSDLCommand = new ValidateWSDLCommand();
-    valWSDLCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
-    valWSDLCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
-    status = valWSDLCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    //WSDL2JavaCommand
-    WSDL2JavaCommand w2jCommand = new WSDL2JavaCommand();
-    w2jCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    w2jCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
-    status = w2jCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-
-    //RefreshProjectCommand
-    RefreshProjectCommand refreshCommand = new RefreshProjectCommand();
-    refreshCommand.setProject(axisClientDefaultingCommand.getClientProject());
-    status = refreshCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    Stub2BeanCommand s2bCommand = new Stub2BeanCommand();
-    s2bCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
-    s2bCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
-    s2bCommand.setClientProject(axisClientDefaultingCommand.getClientProject());
-    status = s2bCommand.execute(j2eeEnvironment); 
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }
-
-    //CopyClientWSDLCommand
-    CopyClientWSDLCommand copyCommand = new CopyClientWSDLCommand();
-    copyCommand.setWsdlURL(axisClientDefaultingCommand.getWsdlURL());
-    copyCommand.setClientWSDLPathName(outputWSDLFilePathName);
-    copyCommand.setWsParser(axisClientDefaultingCommand.getWebServicesParser());
-    status = copyCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-    
-    
-    //BuildProjectCommand
-    BuildProjectCommand buildCommand = new BuildProjectCommand();
-    buildCommand.setProject(axisClientDefaultingCommand.getClientProject());
-    buildCommand.setForceBuild(true);
-    status = buildCommand.execute(j2eeEnvironment);
-    if (status.getSeverity()!=Status.OK)
-    {
-      return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-    }    
-        
-    //Calculate the service interface and service endpoint interface names
-    InterfaceNames interfaceNames = calculateSIandSEIName(axisClientDefaultingCommand.getWsdlURL(), serviceQName, axisClientDefaultingCommand.getWebServicesParser());
-    String siName = interfaceNames.getSiName(); 
-    String[] seiNames = interfaceNames.getSeiNames();
-    if (siName==null || siName.length()==0 || seiNames==null || seiNames.length==0)
-    {
-      return new org.eclipse.core.runtime.Status(IStatus.ERROR,pluginId_,0,"Problems!!",null);
-    }
-    
-    //Set info on the dataModel
-    dataModel.setServiceInterfaceName(siName);
-    dataModel.setServiceEndpointInterfaceNames(seiNames);
-    dataModel.setDidGenDescriptors(false);
-    
-    return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
-  }
-  
-  private InterfaceNames calculateSIandSEIName(String wsdlURL, String serviceQName, WebServicesParser wsParser)
-  {
-    InterfaceNames iNames = new InterfaceNames();
-    String serviceLocalPart = serviceQName.substring(serviceQName.lastIndexOf(':')+1);
-    Map pkg2nsMapping = null;
-    Definition def = wsParser.getWSDLDefinition(wsdlURL);
- 
-    Map services = def.getServices();
-    Service service = null;
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      service = (Service)it.next();
-      if (serviceLocalPart.equals(service.getQName().getLocalPart()))
-        break;
-    }        
-      
-    if (service!=null)
-    {
-      String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
-      String serviceClassName = service.getQName().getLocalPart();
-      String jndiName = serviceClassName;
-      Map ports = service.getPorts();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        if (serviceClassName.equals(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart()))
-        {
-          serviceClassName = serviceClassName + "_Service";
-          break;
-        }
-      }
-      ArrayList seiNames = new ArrayList();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        Port port = (Port)it2.next();
-        SOAPAddress soapAddress = null;
-        List extensibilityElements = port.getExtensibilityElements();
-        if (extensibilityElements != null)
-        {
-          for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
-          {
-            Object object = it3.next();
-            if (object instanceof SOAPAddress)
-            {
-              soapAddress = (SOAPAddress)object;
-              break;
-            }
-          }
-        }
-        if (soapAddress != null)
-        {
-          PortType portType = port.getBinding().getPortType();
-          QName portTypeQName = portType.getQName();
-          String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
-          String portTypeClassName = portTypeQName.getLocalPart();
-          if (jndiName.equals(portTypeClassName))
-              portTypeClassName = portTypeClassName + "_Port";
-          seiNames.add(portTypePkgName+"."+portTypeClassName); 
-        }
-      }
-      iNames.setSiName(servicePkgName+"."+serviceClassName);
-      iNames.setSEINames(convertToStringArray(seiNames.toArray()));
-    }    
-    return iNames;
-  }
-  
-  private String[] convertToStringArray(Object[] a)
-  {
-  	if (a==null) return new String[0];
-  	
-  	int length = a.length;
-  	String[] sa = new String[length];
-  	for (int i=0; i<length; i++)
-  	{
-  		Object obj = a[i];
-  		if (obj instanceof String)
-  		{
-  			sa[i] = (String)obj;
-  		}
-  	}
-  	return sa;
-  }  
-  private class InterfaceNames
-  {
-    private String siName_;
-    private String[] seiNames_;
-    
-    public String getSiName()
-    {
-      return siName_;
-    }
-
-    public String[] getSeiNames()
-    {
-      return seiNames_;
-    }
-    
-    
-    public void setSiName(String siName)
-    {
-      siName_ = siName;
-    }
-    
-    public void setSEINames(String[] seiNames)
-    {
-      seiNames_ = seiNames;
-    }
-    
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
deleted file mode 100644
index dd77be000..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_AXIS_CLIENT_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_INPUT";
-	
-	private IWebServiceClient wsc_;
-	private String serverProject_; 
-	private String serverModule_;
-	private IContext context_;
-
-	  private String serviceServerTypeID_;
-	  
-		private boolean generateProxy_ = true;
-		private JavaWSDLParameter javaWSDLParam_;
-		private String clientProject_ = null;
-		private String clientModule_ = null;
-		private String wsdlURL_;
-		private IServer clientExistingServer_;
-		private String clientServer_;
-		private WebServicesParser webServicesParser_;
-		
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientInputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			wsc_ = wsc;
-			context_ = context;
-			clientProject_ = project; 
-			clientModule_ = module;
-		}
-		
-	  public Status execute(Environment env)
-	  {
-	    
-		generateProxy_ = context_.getClient();
-		wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
-		clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-		
-		return new SimpleStatus("");
-	  }
-
-	public String getClientServer() {
-		return clientServer_;
-	}
-
-	public String getClientProject() {
-		return clientProject_;
-	}
-
-	public WebServicesParser getWebServicesParser() {
-		return webServicesParser_;
-	}
-
-	public String getWsdlURL() {
-		return wsdlURL_;
-	}
-
-	public String getClientModule() {
-		return clientModule_;
-	}
-	  
-		
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
deleted file mode 100644
index 12b9ac1c8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_AXIS_CLIENT_OUTPUT";
-	private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_OUTPUT";
-	
-	private IWebServiceClient wsc_;
-	private String proxyBean_;
-		
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientOutputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			wsc_ = wsc;
-		}
-		
-	  public Status execute(Environment env)
-	  {		
-		wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
-		return new SimpleStatus("");
-	  }
-
-	public void setProxyBean(String proxyBean) {
-		this.proxyBean_ = proxyBean;
-	}
-	  
-		
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
deleted file mode 100644
index 4515739c4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends SimpleCommand
-{
-  private String DESCRIPTION = "TASK_DESC_COPY_CLIENT_WSDL";
-  private String LABEL = "TASK_LABEL_COPY_CLIENT_WSDL";
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  private MessageUtils msgUtils_;  
-  private String wsdlURL_;
-  private String clientWSDLPathName_;
-  private WebServicesParser wsParser_;
-  
-  public CopyClientWSDLCommand()
-  {
-    msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-    setName(msgUtils_.getMessage(LABEL));    
-  }
-  
-  public Status execute(Environment env)
-  {
-    Status status = new SimpleStatus("");
-    Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
-    if(def==null)
-    {
-      status = new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION",new String[]{wsdlURL_}),Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    IPath clientWSDLPath = new Path(clientWSDLPathName_);
-    IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
-    status = resolveWSDL(workspaceRoot, def, clientWSDLPath,env);
-    return status;
-  }
-
-	private Status resolveWSDL(
-		IWorkspaceRoot workspace,
-		Definition wsdlDef,
-		IPath wsdlPath,
-		Environment env) {
-		try {
-			writeWSDLFile(workspace, wsdlDef, wsdlPath, env);
-			Map importDefs = wsdlDef.getImports();
-			Set keysSet = importDefs.keySet();
-			for (Iterator e = keysSet.iterator(); e.hasNext();) {
-				Object keyName = e.next();
-				Vector vector = (Vector) importDefs.get(keyName);
-				for (int i = 0; i < vector.size(); i++) {
-					Import importDef = (Import) vector.get(i);
-					Definition def = importDef.getDefinition();
-					String newPathString =
-						wsdlPath.toString().substring(
-							0,
-							wsdlPath.toString().lastIndexOf("/") + 1);	 //$NON-NLS-1$
-					if (isInvalidImportWSDL(importDef.getLocationURI())) {
-					    return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_IMPORT_WSDL",new String[]{importDef.getLocationURI()}), Status.ERROR);
-					}
-					IPath newPath =
-						new Path(newPathString + importDef.getLocationURI());
-					Status status = resolveWSDL(workspace, def, newPath, env);
-					if (status != null
-						&& status.getSeverity() == Status.ERROR) {
-						return status;
-					}
-				}
-			}
-		} catch (Exception e) {
-		    return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL",new String[] { wsdlPath.toString() }), Status.ERROR, e);
-		}
-		return new SimpleStatus("");
-	}
-
-	private boolean isInvalidImportWSDL(String wsdlPath) {
-
-		// relative url
-		if (!wsdlPath.toLowerCase().startsWith("http://")) { //$NON-NLS-1$
-
-			if (wsdlPath.indexOf("/") != -1) { //$NON-NLS-1$
-				if (!wsdlPath.startsWith("./")) { //$NON-NLS-1$
-					return true;
-				}
-			}
-
-		}
-		return false;
-	}
-
-	private void writeWSDLFile(
-		IWorkspaceRoot workspace,
-		Definition wsdlDef,
-		IPath wsdlPath,
-		Environment env)
-		throws Exception {
-
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		//WSDLFactory wsdlFactory = WSDLFactory.newInstance();
-		//WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-		WSDLWriter wsdlWriter = (new org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl()).newWSDLWriter();
-		wsdlWriter.writeWSDL(wsdlDef, baos);
-		byte[] b = baos.toByteArray();
-		ByteArrayInputStream bais = new ByteArrayInputStream(b);
-
-		ResourceContext context =
-			WebServicePlugin.getInstance().getResourceContext();
-		FileResourceUtils.createFile(
-			context,
-			wsdlPath.makeAbsolute(),
-			bais,
-			env.getProgressMonitor(),
-			env.getStatusHandler());
-
-		baos.close();
-		bais.close();
-
-	}  
-  
-  /**
-   * @param clientWSDLPathName_ The clientWSDLPathName_ to set.
-   */
-  public void setClientWSDLPathName(String clientWSDLPathName)
-  {
-    this.clientWSDLPathName_ = clientWSDLPathName;
-  }
-  /**
-   * @param wsdlURL_ The wsdlURL_ to set.
-   */
-  public void setWsdlURL(String wsdlURL)
-  {
-    this.wsdlURL_ = wsdlURL;
-  }
-  /**
-   * @param wsParser_ The wsParser_ to set.
-   */
-  public void setWsParser(WebServicesParser wsParser)
-  {
-    this.wsParser_ = wsParser;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
deleted file mode 100644
index bdd9d3584..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DefaultsForClientJavaWSDLCommand extends SimpleCommand {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject proxyProject_;
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private String moduleName_;
-	
-	private String LABEL = "TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS";
-	private String DESCRIPTION = "TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS";
-
-	public DefaultsForClientJavaWSDLCommand( String moduleName ) {
-		String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));		
-		
-		moduleName_ = moduleName;
-	}
-	
-	/**
-	 * Constructor for DefaultsForClientJavaWSDLCommand.
-	 */
-	public DefaultsForClientJavaWSDLCommand(
-		JavaWSDLParameter javaWSDLParam,
-		Model model) {
-		//super();
-		String       pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public Status execute(Environment environment) {
-		Status status;
-		if (javaWSDLParam_ == null) {
-			status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
-					coreMsgUtils_.getMessage(
-				"MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"),
-				Status.ERROR);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		javaWSDLParam_.setMetaInfOnly(false);
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
-		
-		IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ );
-		//String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
-		String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-//		String output = ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
-		javaWSDLParam_.setJavaOutput(output);
-
-
-		IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_, moduleName_);
-		if (webModuleContainer !=null)
-		{
-		  IPath webModulePath = webModuleContainer.getFullPath();
-		  //output =  PlatformUtils.getPlatformURL(webModulePath);
-		  IResource res = ResourceUtils.findResource(webModulePath);
-		  if (res!=null){
-			  output = res.getLocation().toString();
-		  } 
-		  javaWSDLParam_.setOutput(output);
-		}
-
-
-		if (WSDLServicePathname_ == null) {
-			
-			if (WSDLServiceURL_ == null) {
-				status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
-						msgUtils_.getMessage(
-					"MSG_ERROR_WSDL_LOCATION_NOT_SET"),
-					Status.ERROR);
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		} else {
-			WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
-		}
-
-		javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
-
-		return new SimpleStatus( "" );
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	/**
-	 * @param proxyProject_ The proxyProject_ to set.
-	 */
-	public void setProxyProject(IProject proxyProject) {
-		this.proxyProject_ = proxyProject;
-	}
-	/**
-	 * @param serviceURL_ The wSDLServiceURL_ to set.
-	 */
-	public void setWSDLServiceURL(String serviceURL) {
-		WSDLServiceURL_ = serviceURL;
-	}
-	/**
-	 * @param servicePathname_ The wSDLServicePathname_ to set.
-	 */
-	public void setWSDLServicePathname(String servicePathname) {
-		WSDLServicePathname_ = servicePathname;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
deleted file mode 100644
index 63e0ff4ce..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
- * 
- */
-public class J2EECommandManager implements CommandManager
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.CommandManager#isUndoEnabled()
-   */
-  public boolean isUndoEnabled()
-  {
-    return false;
-  }
-
-public DataMappingRegistry getMappingRegistry() {
-	return null;
-}
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
deleted file mode 100644
index d0536f46b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.JavaCompiler;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.SimpleURIFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.URIFactory;
-
-
-/**
-*
-*/
-public class J2EEEnvironment implements Environment
-{
-  J2EELog j2eeLog_;
-  J2EEProgressMonitor j2eeProgressMonitor_;
-  J2EEStatusHandler j2eeStatusHandler_;
-  SimpleURIFactory simpleURIFactory_;
-  J2EECommandManager j2eeCommandManager_;
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getLog()
-   */
-  public Log getLog()
-  {
-    if (j2eeLog_ == null)
-    {
-      j2eeLog_ = new J2EELog();
-    }
-    return j2eeLog_;
-    
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getProgressMonitor()
-   */
-  public ProgressMonitor getProgressMonitor()
-  {
-    if (j2eeProgressMonitor_==null)
-    {
-      j2eeProgressMonitor_ = new J2EEProgressMonitor();
-      
-    }
-    return j2eeProgressMonitor_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getStatusHandler()
-   */
-  public StatusHandler getStatusHandler()
-  {
-    if (j2eeStatusHandler_==null)
-    {
-      j2eeStatusHandler_ = new J2EEStatusHandler();
-    }
-    return j2eeStatusHandler_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getURIFactory()
-   */
-  public URIFactory getURIFactory()
-  {
-    if (simpleURIFactory_ == null)
-    { 
-      simpleURIFactory_ = new SimpleURIFactory();
-    }
-    return simpleURIFactory_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getJavaCompiler()
-   */
-  public JavaCompiler getJavaCompiler()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getCommandManager()
-   */
-  public CommandManager getCommandManager()
-  {
-    if(j2eeCommandManager_ == null)
-    {
-      j2eeCommandManager_ = new J2EECommandManager(); 
-    }
-    return j2eeCommandManager_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
deleted file mode 100644
index cbe455d34..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
-*
-*/
-public class J2EELog implements Log
-{
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#isEnabled()
-	 */
-	public boolean isEnabled() {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#isEnabled(java.lang.String)
-	 */
-	public boolean isEnabled(String option) {
-		// TODO Auto-generated method stub
-		return false;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
-	public void log(int severity, int messageNum, Object caller, String method,
-			Object object) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.common.Status)
-	 */
-	public void log(int severity, int messageNum, Object caller, String method,
-			Status status) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Throwable)
-	 */
-	public void log(int severity, int messageNum, Object caller, String method,
-			Throwable throwable) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Object)
-	 */
-	public void log(int severity, String option, int messageNum, Object caller,
-			String method, Object object) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.common.Status)
-	 */
-	public void log(int severity, String option, int messageNum, Object caller,
-			String method, Status status) {
-		// TODO Auto-generated method stub
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Throwable)
-	 */
-	public void log(int severity, String option, int messageNum, Object caller,
-			String method, Throwable throwable) {
-		// TODO Auto-generated method stub
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
deleted file mode 100644
index fec15b9c1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEProgressMonitor implements ProgressMonitor
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#report(java.lang.String)
-   */
-  public void report(String progress)
-  {
-    // TODO Auto-generated method stub
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#getChildProgressMonitor()
-   */
-  public ProgressMonitor getChildProgressMonitor()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#isCancelRequested()
-   */
-  public boolean isCancelRequested()
-  {
-    // TODO Auto-generated method stub
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
deleted file mode 100644
index 9a891abaa..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-/**
- * 
- */
-public class J2EEStatusHandler implements StatusHandler
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#report(org.eclipse.wst.command.internal.provisional.env.core.common.Status, org.eclipse.wst.command.internal.provisional.env.core.common.Choice[])
-   */
-  public Choice report(Status status, Choice[] choices)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#report(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
-   */
-  public void report(Status status) throws StatusException
-  {
-    // TODO Auto-generated method stub
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#reportError(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
-   */
-  public void reportError(Status status)
-  {
-    // TODO Auto-generated method stub
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#reportInfo(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
-   */
-  public void reportInfo(Status status)
-  {
-    // TODO Auto-generated method stub
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
deleted file mode 100644
index 233ba12c8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisConsumptionUIPlugin extends Plugin
-{
-
-	/**
-	* The identifier of the descriptor of this plugin in plugin.xml.
-	*/
-	public static final String ID =
-		"org.eclipse.jst.ws.axis.consumption.ui";
-
-	/**
-	* The reference to the singleton instance of this plugin.
-	*/
-	private static WebServiceAxisConsumptionUIPlugin instance_;
-	private Log log_;
-
-	/**
-	* Constructs a runtime plugin object for this plugin.
-	* The "plugin" element in plugin.xml should include the attribute
-	* class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
-	* @param descriptor The descriptor of this plugin.
-	*/
-	public WebServiceAxisConsumptionUIPlugin(IPluginDescriptor descriptor) {
-		super(descriptor);
-		if (instance_ == null) {
-			instance_ = this;
-		}
-		log_ = new EclipseLog();
-
-	}
-
-	/**
-	* Returns the singleton instance of this plugin. Equivalent to calling
-	* (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
-	* @return The WebServiceWasConsumptionPlugin singleton.
-	*/
-	static public WebServiceAxisConsumptionUIPlugin getInstance() {
-		return instance_;
-	}
-
-	/**
-	* Called once by the platform when this plugin is first loaded.
-	* @throws CoreException If this plugin fails to start.
-	*/
-	public void startup() throws CoreException {
-		log_.log(Log.INFO, 5066, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-		super.startup();
-	}
-
-	/**
-	* Called once by the platform when this plugin is unloaded.
-	* @throws CoreException If this plugin fails to shutdown.
-	*/
-	public void shutdown() throws CoreException {
-		log_.log(Log.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-		super.shutdown();
-	}
-
-	/**
-	* Returns the message string identified by the given key from
-	* the plugin.properties file for the appropriate locale.
-	* @param key The message key string prefixed by a "%" symbol.
-	* That is, the string passed in must be of the form "%KEY"
-	* where the plugin.properties file contains a line of the
-	* form: "KEY = value".
-	* @return The locale-specific message.
-	*/
-	public static String getMessage(String key) {
-		return instance_.getDescriptor().getResourceString(key);
-	}
-
-	/**
-	* Returns the message string identified by the given key from
-	* the plugin.properties file for the appropriate locale.
-	* Substitution sequences in the message string
-	* are replaced by the given array of substitution objects (which
-	* are most frequently strings). See java.text.MessageFormat for
-	* further details on substitution.
-	* @param key The message key string prefixed by a "%" symbol.
-	* That is, the string passed in must be of the form "%KEY"
-	* where the plugin.properties file contains a line of the
-	* form: "KEY = value".
-	* @param args The substitution values for the message
-	* as required by the message in plugin.properties and
-	* by the rules of class java.text.MessageFormat.
-	* @return The locale-specific message.
-	*/
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
deleted file mode 100644
index b4eeff87e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-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.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class AddJarsToProjectBuildPathTask extends SimpleCommand {
-
-	private String DESCRIPTION = "TASK_DESC_JARS_TO_PROJECT";
-	private String LABEL = "TASK_LABEL_JARS_TO_PROJECT";
-
-	private IJavaProject javaProject_;
-	private IClasspathEntry[] oldClasspath_;
-	private IClasspathEntry[] newClasspath_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private boolean isJ2EE_13 = true;
-	private MessageUtils msgUtils_;
-	
-	private IProject project;
-	private String module_;
-
-	public AddJarsToProjectBuildPathTask()
-	  {
-			String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-			msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-			setDescription(msgUtils_.getMessage(DESCRIPTION));
-			setName(msgUtils_.getMessage(LABEL));
-			module_ = J2EEUtils.getFirstWebModuleName(project);
-		}
-	
-	public AddJarsToProjectBuildPathTask(String module)
-  {
-		String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-		setDescription(msgUtils_.getMessage(DESCRIPTION));
-		setName(msgUtils_.getMessage(LABEL));
-		module_ = module;
-	}
-
-	/**
-	* Execute AddJarsToProjectBuildPathTask
-	*/
-	public Status execute(Environment env) {
-//		try {
-//			if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-//				J2EEWebNatureRuntime webNatureRuntime =
-//					(J2EEWebNatureRuntime) project.getNature(
-//						IWebNatureConstants.J2EE_NATURE_ID);
-//				isJ2EE_13 = webNatureRuntime.isJ2EE1_3();
-//			}
-//		} catch (Exception e) {
-//		}
-//    Status status = new SimpleStatus("");
-//		if (!isJ2EE_13)
-//		{
-//		//	AddJar(project, null, "XERCES_API_JAR", status, environment);
-//		}
-//		return status;
-		
-		Status status = new SimpleStatus("");
-//		 TODO: workaround for 90515 
-		//
-		   // Get the current classpath.
-		   //
-		   javaProject_ = null;
-		   oldClasspath_ = null;
-		   try
-		   {    
-			 javaProject_ = JavaCore.create(project);    
-			 if (javaProject_ != null)
-			 {
-			   oldClasspath_ = javaProject_.getRawClasspath();
-			 }
-			 else
-			 {
-			   status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);	
-			   env.getStatusHandler().reportError(status);
-			   return status;
-			 }
-		   }
-		   catch (JavaModelException e)
-		   {
-			   status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
-			   env.getStatusHandler().reportError(status);
-			   return status;	   	
-		   }
-
-
-			try {
-				
-				ArrayList aList = new ArrayList();
-				String classpathEntry = null;
-				IVirtualComponent component = ComponentCore.createComponent(project, module_);
-				if (component != null) {
-					
-					IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
-							"/WEB-INF/lib"));
-					if (webInfLib != null) {
-						IVirtualResource[] resources = webInfLib.members();
-						IResource aResource = null;
-						
-						for (int i = 0; i < resources.length; i++) {
-							aResource = resources[i].getUnderlyingResource();
-							classpathEntry = aResource.getLocation().toString();
-							if (!FoundClasspathEntry(classpathEntry)) {
-								aList.add(classpathEntry);
-							}
-						}
-					}
-				}
-				
-				int newListSize = aList.size();
-				
-				if (newListSize == 0) {
-					return status;
-				}
-				
-				// Update classpath
-				newClasspath_ = new IClasspathEntry[oldClasspath_.length + newListSize];
-				Iterator iter = aList.iterator();
-		
-				int j=0;
-				while (iter.hasNext()) {
-					newClasspath_[j] = JavaCore.newLibraryEntry(new Path((String)iter.next()), null, null);
-					j++;
-				}
-				for (int i=0; i<oldClasspath_.length; i++) {
-					newClasspath_[j+i] = oldClasspath_[i];
-				}
- 
-			   	 ProgressMonitor monitor = env.getProgressMonitor();
-			   	 IProgressMonitor eclipseMonitor = null;
-			   	 if (monitor instanceof EclipseProgressMonitor)
-			   	 {
-			   	 	eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
-			   	 }
-				 javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
-			}
-			   catch (JavaModelException e)
-			   {
-				 status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
-				 try
-				 {
-				 	env.getStatusHandler().report(status);	
-				 }
-				 catch(StatusException se)
-				 {
-				 	status = new SimpleStatus("", "User aborted", Status.ERROR);
-				 }
-			   }
-			 catch (CoreException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-//			 end of workaround
-			return status;
-		}  
-		   
-
-		private boolean FoundClasspathEntry(String classpathEntry)  {
-			   
-
-			   boolean found = false;
-			   for (int i=0; i<oldClasspath_.length && !found; i++)
-			   {
-				 if (oldClasspath_[i].getPath().toString().toLowerCase().equals(classpathEntry.toLowerCase())) {
-					 found=true;
-				 }
-			   }
-		   	 return found;
-		}
-
-	private void AddJar(IProject webProject, String pluginId, String jarName, Status status, Environment env)  {
-	   //
-	   // Get the current classpath.
-	   //
-	   javaProject_ = null;
-	   oldClasspath_ = null;
-	   try
-	   {    
-		 javaProject_ = JavaCore.create(webProject);    
-		 if (javaProject_ != null)
-		 {
-		   oldClasspath_ = javaProject_.getRawClasspath();
-		 }
-		 else
-		 {
-		   status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);	
-		   env.getStatusHandler().reportError(status);
-		   return;
-		 }
-	   }
-	   catch (JavaModelException e)
-	   {
-		   status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
-		   env.getStatusHandler().reportError(status);
-		   return;	   	
-	   }
-
-	   boolean found = false;
-	   for (int i=0; i<oldClasspath_.length; i++)
-	   {
-		 found = found || oldClasspath_[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
-	   }
-
-	   if (found) 
-	   {
-		 return;
-	   }
-
-	   newClasspath_ = new IClasspathEntry[oldClasspath_.length + 1];
-	   int i=0;
-	   while (i<oldClasspath_.length)
-	   {
-		 newClasspath_[i] = oldClasspath_[i];
-		 i++;
-	   }
-
-	   try
-	   {
-		 if(pluginId!=null)
-		 {
-		   newClasspath_[i++] = JavaCore.newLibraryEntry(getTheJarPath(pluginId,jarName), null, null);
-		 }
-		 else
-		 {
-		   newClasspath_[i++] = JavaCore.newVariableEntry(getTheJarPath(pluginId,jarName), null, null);
-		 }
-	   }
-	   catch (CoreException e)
-	   {
-		 status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
-		 try
-		 {
-		 	env.getStatusHandler().report(status);
-		 }
-		 catch(StatusException se)
-		 {
-		 	status = new SimpleStatus("","User aborted",Status.ERROR);
-		 }
-		 return;
-	   }
-
-	   //
-	   // Then update the project classpath.
-	   //
-	   try
-	   {
-	   	 ProgressMonitor monitor = env.getProgressMonitor();
-	   	 IProgressMonitor eclipseMonitor = null;
-	   	 if (monitor instanceof EclipseProgressMonitor)
-	   	 {
-	   	 	eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
-	   	 }
-		 javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
-	   }
-	   catch (JavaModelException e)
-	   {
-		 status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
-		 try
-		 {
-		 	env.getStatusHandler().report(status);	
-		 }
-		 catch(StatusException se)
-		 {
-		 	status = new SimpleStatus("", "User aborted", Status.ERROR);
-		 }
-		 return;
-	   }
-	 }
-
-	//
-	// Returns the local native pathname of the jar.
-	//
-	private IPath getTheJarPath(String pluginId, String theJar)
-		throws CoreException {
-		try {
-			if (pluginId != null) {
-				IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-				IPluginDescriptor pluginDescriptor =
-					pluginRegistry.getPluginDescriptor(pluginId);
-				URL localURL =
-					Platform.asLocalURL(
-						new URL(pluginDescriptor.getInstallURL(), theJar));
-				return new Path(localURL.getFile());
-			} else {
-				return new Path(theJar);
-			}
-		} catch (MalformedURLException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisConsumptionUIPlugin.ID,
-					0,
-					msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
-					e));
-		} catch (IOException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisConsumptionUIPlugin.ID,
-					0,
-					msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
-					e));
-		}
-	}
-
-	public void setProject(IProject project)
-	{
-	  this.project = project;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
deleted file mode 100644
index 7edd10a66..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-
-public class CheckAxisDeploymentDescriptorsTask extends SimpleCommand {
-	
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serverProject;
-	private String   moduleName_;
-    
-  public CheckAxisDeploymentDescriptorsTask( String moduleName )
-  {
-    String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-    setDescription(msgUtils_.getMessage("CHECK_WS_DD_TASK_DESCRIPTION"));
-    setName(msgUtils_.getMessage("CHECK_WS_DD_TASK_LABEL"));
-	
-	moduleName_ = moduleName;
-  }
-	
-	public Status execute(Environment env) {
-		Status status = new SimpleStatus( "" );
-		if(EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
-      return status;
-		}
-
-	  IPath    filePath = null;
-      IProject project = serverProject;
-	  	  
-
-      filePath = J2EEUtils.getWebInfPath( project, moduleName_ );
-      filePath = filePath.append("/server-config.wsdd");
-
-	  if(filePath==null || filePath.isEmpty())
-		{
-			status = new SimpleStatus("", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-			env.getStatusHandler().reportError(status);
-			return status;			
-		}
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled())   {
-			status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_XML_FILE_OVERWRITE_DISABLED"), Status.WARNING);
-			try
-			{
-				env.getStatusHandler().report(status);
-			}
-			catch(StatusException se)
-			{
-				status = new SimpleStatus("", "User aborted",Status.ERROR);
-			}
-			
-			return status;
-		}
-		return status;
-	}
-
-	public void setServerProject(IProject serverProject)
-	{
-	  this.serverProject = serverProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
deleted file mode 100644
index 70cc60b34..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-
-
-public class CopyAxisJarCommand extends SimpleCommand {
-
-  public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis11"; //$NON-NLS-1$
-  public static String[] JARLIST = new String[] {
-	  "axis-ant.jar",
-	  "axis.jar",
-	  "commons-discovery.jar",
-	  "commons-logging.jar",
-	  "jaxrpc.jar",
-	  "log4j-1.2.8.jar",
-	  "saaj.jar",
-	  "wsdl4j.jar"
-	  
-  };
-
-  private String DESCRIPTION = "TASK_DESC_COPY_JARS_TO_PROJECT";
-  private String LABEL = "TASK_LABEL_COPY_JARS_TO_PROJECT";
-
-  private MessageUtils msgUtils_;
-  private MessageUtils baseConMsgUtils_;
-  private IProject project;
-  private Boolean projectRestartRequired_ = Boolean.FALSE;
-  private String  moduleName_;
-
-  /**
-   * Default CTOR;
-   */
-  public CopyAxisJarCommand( String moduleName ) {
-    String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-    setDescription(msgUtils_.getMessage(DESCRIPTION));
-    setName(msgUtils_.getMessage(LABEL));
-	
-	moduleName_ = moduleName;
-  }
-
-  /**
-   * Execute the command
-   */
-  public Status execute(Environment env) {
-    Status status = new SimpleStatus("");
-    env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_COPY_AXIS_CFG"));
-    copyAxisJarsToProject(project, status, env);
-    return status;
-
-  }
-
-  private void copyAxisJarsToProject(IProject project, Status status, Environment env) {
-//    IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
-	IPath webModulePath = J2EEUtils.getWebContentPath( project, moduleName_ );
-    if (webModulePath == null) {
-      status = new SimpleStatus("", baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
-      env.getStatusHandler().reportError(status);
-      return;
-    }
-	
-	for (int i=0; i<JARLIST.length; ) {
-		copyIFile("lib/"+JARLIST[i], webModulePath, "WEB-INF/lib/"+JARLIST[i++], status, env); 
-	    if (status.getSeverity() == Status.ERROR)
-	      return;
-	}
-    return;
-  }
-
-  /**
-   *  
-   */
-  private void copyIFile(String source, IPath targetPath, String targetFile, Status status, Environment env) {
-    IPath target = targetPath.append(new Path(targetFile));
-    env.getProgressMonitor().report(baseConMsgUtils_.getMessage("PROGRESS_INFO_COPYING_FILE"));
-
-    try {
-      ResourceContext context = new TransientResourceContext();
-      context.setOverwriteFilesEnabled(true);
-      context.setCreateFoldersEnabled(true);
-      context.setCheckoutFilesEnabled(true);
-      IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-      IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(AXIS_RUNTIME_PLUGIN_ID);
-      Plugin axisrt_plugin = pluginDescriptor.getPlugin();
-      IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-      if (!resource.exists()) {
-        IFile file = FileResourceUtils.createFile(context, target, axisrt_plugin.openStream(new Path(source)), env.getProgressMonitor(), env
-            .getStatusHandler());
-        if (projectRestartRequired_.booleanValue() == false && file.exists()) {
-          projectRestartRequired_ = Boolean.TRUE;
-        }
-
-      }
-    }
-    catch (Exception e) {
-      status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_FILECOPY"), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-
-    }
-  }
-
-  public void setProject(IProject project) {
-    this.project = project;
-  }
-
-  public boolean getProjectRestartRequired() {
-    return projectRestartRequired_.booleanValue();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
deleted file mode 100644
index 1ffb7d090..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class DefaultsForHTTPBasicAuthCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlServiceURL;
-  private JavaWSDLParameter javaWSDLParam;
-  private Model model;
-
-  public DefaultsForHTTPBasicAuthCommand()
-  {
-    super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand");
-  }
-  
-  public Status execute(Environment env)
-  {
-    //WebServiceElement wse = WebServiceElement.getWebServiceElement(model);
-    //setWebServicesParser((WebServicesParser)wse.getWSParser());
-    //setWsdlServiceURL(wse.getWSDLServiceURL());
-    //if (wsdlServiceURL == null || wsdlServiceURL.length() <= 0)
-    //  setWsdlServiceURL((new Utils()).toFileSystemURI(wse.getWSDLServicePathname()));
-    
-    if (wsdlServiceURL != null && wsdlServiceURL.length() > 0)
-    {
-      if (webServicesParser == null)
-      {
-        webServicesParser = new WebServicesParserExt();
-        //wse.setWSParser(webServicesParser);
-      }
-      WebServiceEntity wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
-      if (wsEntity == null || !wsEntity.isEntityResolved())
-      {
-        webServicesParser.setURI(wsdlServiceURL);
-        try
-        {
-          webServicesParser.parse(WebServicesParser.PARSE_NONE);
-        }
-        catch (WWWAuthenticationException wwwae)
-        {
-          DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-          dialog.handleWWWAuthentication(wwwae);
-          String username = dialog.getUsername();
-          String password = dialog.getPassword();
-          if (username != null && password != null)
-          {
-            webServicesParser.setHTTPBasicAuthUsername(username);
-            webServicesParser.setHTTPBasicAuthPassword(password);
-            try
-            {
-              webServicesParser.parse(WebServicesParser.PARSE_NONE);
-            }
-            catch (Throwable t)
-            {
-            }
-            webServicesParser.setHTTPBasicAuthUsername(null);
-            webServicesParser.setHTTPBasicAuthPassword(null);
-          }
-        }
-        catch (Throwable t)
-        {
-        }
-        wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
-      }
-      if (wsEntity != null && wsEntity.getType() == WebServiceEntity.TYPE_WSDL)
-      {
-        String httpUsername = wsEntity.getHTTPUsername();
-        String httpPassword = wsEntity.getHTTPPassword();
-        if (httpUsername != null && httpPassword != null)
-        {
-          javaWSDLParam.setHTTPUsername(httpUsername);
-          javaWSDLParam.setHTTPPassword(httpPassword);
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @param model The model to set.
-   */
-  public void setModel(Model model) {
-    this.model = model;
-  }
-
-  /**
-   * @param wsdlServiceURL The wsdlServiceURL to set.
-   */
-  public void setWsdlServiceURL(String wsdlServiceURL) {
-    this.wsdlServiceURL = wsdlServiceURL;
-  }
-
-  /**
-   * @return Returns the javaWSDLParam.
-   */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    return javaWSDLParam;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
deleted file mode 100644
index ae95c0f8b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-public class RefreshProjectCommand extends SimpleCommand
-{
-	private static final String LABEL = "TASK_LABEL_REFESH_PROJECT";
-	private static final String DESCRIPTION = "TASK_DESC_REFESH_PROJECT";
-	
-	private IProject project;
-	private MessageUtils msgUtils_;
-
-	public RefreshProjectCommand()
-	{
-		msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-		setName( msgUtils_.getMessage( LABEL ) );
-		setDescription( msgUtils_.getMessage( DESCRIPTION ));
-	}
-
-	/**
-	* Execute RefreshProjectTask
-	*/
-	public Status execute(Environment env)
-	{
-		try
-		{
-			if (project!=null)
-			project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
-		}
-		catch (CoreException e)
-		{
-		  Status status = new SimpleStatus(WebServiceAxisConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_REFRESH_PROJECT"), Status.ERROR, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;
-		}
-		return new SimpleStatus("");
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public void setProject(IProject project) {
-		this.project = project;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
deleted file mode 100644
index 8cba8ba3f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam_;
-  private String discoveredWsdlPortElementName;
-  private Vector portTypes_;
-  private String proxyBean_;
-  
-  private String module_ = "";
-  
-  private IProject clientProject_;
-
-  public Stub2BeanCommand()
-  {
-    super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
-    portTypes_ = new Vector();
-    //setRunInWorkspaceModifyOperation(false);
-  }
-  
-  public Stub2BeanCommand(String moduleName){
-	  super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
-	  portTypes_ = new Vector();	  
-	  module_ = moduleName;
-  }
-
-  /**
-  * Execute
-  */
-  public Status execute(Environment env)
-  {        
-    String inputWsdlLocation = javaWSDLParam_.getInputWsdlLocation();
-    Definition def = webServicesParser.getWSDLDefinition(inputWsdlLocation);
-    /*
-    * Hack: Axis is not using a proper java.net.URL as its inputWsdlLocation.
-    * We need to convert it to a proper file URL.
-    */
-    if (def == null)
-    {
-      File file = new File(inputWsdlLocation);
-      if (file.exists())
-      {
-        try
-        {
-          def = webServicesParser.getWSDLDefinition(file.toURL().toString());
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-    }
-    Map pkg2nsMapping = javaWSDLParam_.getMappings();
-    Map services = def.getServices();
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      Service service = (Service)it.next();
-      String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
-      String serviceClassName = computeClassName(service.getQName().getLocalPart());
-      String jndiName = serviceClassName;
-      Map ports = service.getPorts();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        if (serviceClassName.equals(computeClassName(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart())))
-        {
-          serviceClassName = serviceClassName + "_Service";
-          break;
-        }
-      }
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-        Port port = (Port)it2.next();
-        if (discoveredWsdlPortElementName != null && !discoveredWsdlPortElementName.equals(port.getName()))
-          continue;
-        SOAPAddress soapAddress = null;
-        List extensibilityElements = port.getExtensibilityElements();
-        if (extensibilityElements != null)
-        {
-          for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
-          {
-            Object object = it3.next();
-            if (object instanceof SOAPAddress)
-            {
-              soapAddress = (SOAPAddress)object;
-              break;
-            }
-          }
-        }
-        if (soapAddress != null)
-        {
-          PortType portType = port.getBinding().getPortType();
-          QName portTypeQName = portType.getQName();
-          StringBuffer portTypeID = new StringBuffer();
-          portTypeID.append(portTypeQName.getNamespaceURI());
-          portTypeID.append("#");
-          portTypeID.append(portTypeQName.getLocalPart());
-          if (!portTypes_.contains(portTypeID.toString()))
-          {
-            portTypes_.add(portTypeID.toString());
-            Stub2BeanInfo stub2BeanInfo = new Stub2BeanInfo();
-            stub2BeanInfo.setClientProject(clientProject_);
-            stub2BeanInfo.setClientModuleName(module_);
-            String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
-            String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
-            stub2BeanInfo.setPackage(portTypePkgName);
-            stub2BeanInfo.setClass(portTypeClassName + "Proxy");
-            proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
-            if (jndiName.equals(portTypeClassName))
-              portTypeClassName = portTypeClassName + "_Port";
-            stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, port.getName());
-            try
-            {              
-              stub2BeanInfo.write( env.getProgressMonitor(), env.getStatusHandler() );
-              if (discoveredWsdlPortElementName != null)
-              {
-                // The discovered port was processed. Ignore all other ports and services.
-                return new SimpleStatus("");
-              }
-            }
-            catch (CoreException ce)
-            {
-            }
-            catch (IOException ioe)
-            {
-            }
-          }
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-  
-  private final char UNDERSCORE = '_';
-
-  private String computeClassName(String className)
-  {
-    String classNameCopy = className;
-    int i = classNameCopy.indexOf(UNDERSCORE);
-    while (i != -1)
-    {
-      char c = classNameCopy.charAt(i+1);
-      if (Character.isLowerCase(c))
-      {
-        StringBuffer sb = new StringBuffer();
-        sb.append(classNameCopy.substring(0, i+1));
-        sb.append(Character.toUpperCase(c));
-        sb.append(classNameCopy.substring(i+2, classNameCopy.length()));
-        classNameCopy = sb.toString();
-      }
-      i = classNameCopy.indexOf(UNDERSCORE, i+1);
-    }
-    char[] cArray = new char[classNameCopy.length()];
-    boolean foundDigit = false;
-    for (int j = 0; j < cArray.length; j++)
-    {
-      char c = classNameCopy.charAt(j);
-      if (Character.isDigit(c))
-      {
-        cArray[j] = c;
-        foundDigit = true;
-      }
-      else
-      {
-        if (foundDigit)
-          cArray[j] = Character.toUpperCase(c);
-        else
-          cArray[j] = c;
-        foundDigit = false;
-      }
-    }
-    return new String(cArray);
-  }
-
-  /**
-  * Returns the javaWSDLParam.
-  * @return JavaWSDLParameter
-  */
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam_;
-  }
-
-  /**
-  * Sets the javaWSDLParam.
-  * @param javaWSDLParam The javaWSDLParam to set
-  */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-    javaWSDLParam_ = javaWSDLParam;
-  }
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-
-
-  /**
-   * @param discoveredWsdlPortElementName The discoveredWsdlPortElementName to set.
-   */
-  public void setDiscoveredWsdlPortElementName(String discoveredWsdlPortElementName) {
-    this.discoveredWsdlPortElementName = discoveredWsdlPortElementName;
-  }
-
-  /**
-	* @param clientProject The clientProject to set.
-	*/
-  public void setClientProject(IProject clientProject) {
-		this.clientProject_ = clientProject;
-  }
-	
-	/**
-	 * @return Returns the proxyBean.
-	 */
-	public String getProxyBean() {
-		return proxyBean_;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
deleted file mode 100644
index 04b3ab142..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,678 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-public class Stub2BeanInfo
-{
-  private final String NEW_LINE = System.getProperty("line.separator");
-
-  private int indentCount;
-
-  private String package_;
-  private StringBuffer imports_;
-  private StringBuffer seis_;
-  private StringBuffer services_;
-  private StringBuffer jndiNames_;
-  private StringBuffer ports_;
-  private String class_;
-  private Vector usedNames;
-  
-  private IProject clientProject_;
-  private String moduleName_;
-  
-  public Stub2BeanInfo()
-  {
-    indentCount = 0;
-    package_ = null;
-    imports_ = new StringBuffer();
-    seis_ = new StringBuffer();
-    services_ = new StringBuffer();
-    jndiNames_ = new StringBuffer();
-    ports_ = new StringBuffer();
-    class_ = "SEIBean";
-    usedNames = new Vector();
-  }
-
-  public void setClientProject(IProject clientProject) {
-  	this.clientProject_ =  clientProject;
-  }
-  
-  public void setClientModuleName(String moduleName) {
-	  this.moduleName_ = moduleName;
-  }
-
-  public void setPackage(String pkgName)
-  {
-    if (pkgName != null && pkgName.length() > 0)
-      package_ = manglePackageName(pkgName);
-  }
-
-  public void addImports(String pkgName, String className)
-  {
-    imports_.append(toFullyQualifiedClassName(pkgName, className));
-    imports_.append(";");
-  }
-
-  public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String portName)
-  {
-    addSEI(seiPkgName, seiClassName, servicePkgName, serviceClassName, serviceClassName, portName);
-  }
-
-  public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String jndiName, String portName)
-  {
-    seis_.append(toFullyQualifiedClassName(seiPkgName, seiClassName));
-    seis_.append(";");
-    services_.append(toFullyQualifiedClassName(servicePkgName, serviceClassName));
-    services_.append(";");
-    jndiNames_.append(jndiName);
-    jndiNames_.append(";");
-    ports_.append(portName);
-    ports_.append(";");
-  }
-
-  public void setClass(String className)
-  {
-    if (className != null && className.length() > 0)
-      class_ = mangleClassName(className);
-  }
-
-  private String toFullyQualifiedClassName(String pkgName, String className)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(manglePackageName(pkgName));
-    sb.append(".");
-    sb.append(mangleClassName(className));
-    return sb.toString();
-  }
-
-  private String getPackageName(String qname)
-  {
-    int index = qname.lastIndexOf(".");
-    if (index != -1)
-      return qname.substring(0, index);
-    else
-      return qname;
-  }
-
-  private String getClassName(String qname)
-  {
-    int index = qname.lastIndexOf(".");
-    if (index != -1)
-      return qname.substring(index+1, qname.length());
-    else
-      return qname;
-  }
-
-  private String manglePackageName(String s)
-  {
-    return replaceInvalidJavaChars(s);
-  }
-
-  private String mangleClassName(String s)
-  {
-    s = firstCharToUpperCase(WSDLUtils.resolveDotInPortName(s));
-    return replaceInvalidJavaChars(s);
-  }
-
-  private String replaceInvalidJavaChars(String s)
-  {
-    char[] c = s.toCharArray();
-    for (int i = 0; i < c.length; i++)
-    {
-      if (!Character.isJavaIdentifierPart(c[i]))
-        c[i] = '.';
-    }
-    return new String(c);
-  }
-
-  private String firstCharToUpperCase(String s)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(s.substring(0, 1).toUpperCase());
-    sb.append(s.substring(1, s.length()));
-    return sb.toString();
-  }
-
-  private String firstCharToLowerCase(String s)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(s.substring(0, 1).toLowerCase());
-    sb.append(s.substring(1, s.length()));
-    return sb.toString();
-  }
-
-  private String trimArraySymbol(String s)
-  {
-    int index = s.indexOf("[");
-    if (index != -1)
-      return s.substring(0, index);
-    else
-      return s;
-  }
-
-  private String getFullyQualifiedName(JavaHelpers javaHelpers)
-  {
-    if (javaHelpers.isPrimitive())
-      return javaHelpers.getJavaName();
-    else
-      return javaHelpers.getQualifiedName();
-  }
-
-  public void write(ProgressMonitor progressMonitor, StatusHandler statusMonitor) throws CoreException, IOException
-  {
-    StringWriter sw = new StringWriter(2048);
-    writePackage(sw);
-    writeImports(sw);
-    writeClass(sw);
-    sw.close();
-    byte[] bytes = sw.getBuffer().toString().getBytes();
-    StringBuffer sb = new StringBuffer();
-    if (package_ != null && package_.length() > 0)
-    {
-      sb.append(package_);
-      sb.append(".");
-    }
-    sb.append(class_);
-    sb = new StringBuffer(sb.toString().replace('.', '/'));
-    sb.append(".java");
-
-    JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
-    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-    IPath sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_, moduleName_);
-    IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
-    IPath filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
-    FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, bais, progressMonitor, statusMonitor);
-  }
-
-  private void writePackage(Writer w) throws IOException
-  {
-    if (package_ != null && package_.length() > 0)
-    {
-      w.write("package ");
-      w.write(package_);
-      w.write(";");
-      newLine(w);
-    }
-  }
-
-  private void writeImports(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(imports_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write("import ");
-      w.write(st.nextToken());
-      w.write(";");
-      newLine(w);
-    }
-  }
-
-  private void writeClass(Writer w) throws IOException, CoreException
-  {
-    newLine(w);
-    w.write("public class ");
-    w.write(class_);
-    w.write(" ");
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    if (st.hasMoreTokens())
-      w.write("implements ");
-    while (st.hasMoreTokens())
-    {
-      w.write(st.nextToken());
-      if (st.hasMoreTokens())
-        w.write(", ");
-    }
-    w.write(" {");
-    incrementIndent();
-    newLine(w);
-    writeFieldsDeclarations(w);
-    writeConstructor(w);
-    writeInit(w);
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    writeUseJNDI(w);
-    */
-    writeGetSetEndpoint(w);
-    writeSEIGetters(w);
-    writeSEIMethods(w);
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-  }
-
-  private void writeFieldsDeclarations(Writer w) throws IOException
-  {
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    w.write("private boolean _useJNDI = true;");
-    newLine(w);
-    */
-    w.write("private String _endpoint = null;");
-    usedNames.add("_endpoint");
-    newLine(w);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write("private ");
-      String sei = st.nextToken();
-      w.write(sei);
-      w.write(" ");
-      String stubName = firstCharToLowerCase(getClassName(sei));
-      w.write(stubName);
-      usedNames.add(stubName);
-      w.write(" = null;");
-      newLine(w);
-    }
-  }
-
-  private void writeConstructor(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public ");
-    w.write(class_);
-    w.write("() {");
-    incrementIndent();
-    newLine(w);
-    w.write("_init");
-    w.write(class_);
-    w.write("();");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeInit(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("private void _init");
-    w.write(class_);
-    w.write("() {");
-    incrementIndent();
-    newLine(w);
-    w.write("try {");
-    incrementIndent();
-    newLine(w);
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    w.write("if (_useJNDI) {");
-    incrementIndent();
-    newLine(w);
-    */
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    StringTokenizer serviceTokens = new StringTokenizer(services_.toString(), ";");
-    StringTokenizer jndiNameTokens = new StringTokenizer(jndiNames_.toString(), ";");
-    StringTokenizer portTokens = new StringTokenizer(ports_.toString(), ";");
-    /*
-    if (st.hasMoreTokens())
-    {
-      w.write("javax.naming.InitialContext ctx = new javax.naming.InitialContext();");
-      newLine(w);
-    }
-    while (st.hasMoreTokens())
-    {
-      w.write(firstCharToLowerCase(getClassName(st.nextToken())));
-      w.write(" = ((");
-      w.write(serviceTokens.nextToken());
-      w.write(")ctx.lookup(\"java:comp/env/service/");
-      w.write(jndiNameTokens.nextToken());
-      w.write("\")).get");
-      w.write(mangleClassName(portTokens.nextToken()));
-      w.write("();");
-      newLine(w);
-    }
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    w.write("else {");
-    incrementIndent();
-    newLine(w);
-    st = new StringTokenizer(seis_.toString(), ";");
-    serviceTokens = new StringTokenizer(services_.toString(), ";");
-    portTokens = new StringTokenizer(ports_.toString(), ";");
-    */
-    while (st.hasMoreTokens())
-    {
-      String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
-      w.write(seiName);
-      w.write(" = (new ");
-      w.write(serviceTokens.nextToken());
-      w.write("Locator()).get");
-      w.write(replaceInvalidJavaChars(WSDLUtils.resolveDotInPortName(portTokens.nextToken())));
-      w.write("();");
-      newLine(w);
-      w.write("if (");
-      w.write(seiName);
-      w.write(" != null) {");
-      incrementIndent();
-      newLine(w);
-      w.write("if (_endpoint != null)");
-      incrementIndent();
-      newLine(w);
-      w.write("((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
-      decrementIndent();
-      newLine(w);
-      w.write("else");
-      incrementIndent();
-      newLine(w);
-      w.write("_endpoint = (String)((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._getProperty(\"javax.xml.rpc.service.endpoint.address\");");
-      decrementIndent();
-      decrementIndent();
-      newLine(w);
-      w.write("}");
-      newLine(w);
-    }
-    /*
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    */
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    /*
-    w.write("catch (javax.naming.NamingException namingException) {}");
-    newLine(w);
-    */
-    w.write("catch (javax.xml.rpc.ServiceException serviceException) {}");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeSetPropertyEndpoint(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
-      w.write("if (");
-      w.write(seiName);
-      w.write(" != null)");
-      incrementIndent();
-      newLine(w);
-      w.write("((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
-      decrementIndent();
-      newLine(w);
-    }
-  }
-
-  private void writeUseJNDI(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public void useJNDI(boolean useJNDI) {");
-    incrementIndent();
-    newLine(w);
-    w.write("_useJNDI = useJNDI;");
-    newLine(w);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write(firstCharToLowerCase(getClassName(st.nextToken())));
-      w.write(" = null;");
-      newLine(w);
-    }
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeSEIGetters(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      String seiClassName = getClassName(sei);
-      String seiFieldName = firstCharToLowerCase(seiClassName);
-      newLine(w);
-      w.write("public ");
-      w.write(sei);
-      w.write(" get");
-      w.write(seiClassName);
-      w.write("() {");
-      incrementIndent();
-      newLine(w);
-      w.write("if (");
-      w.write(seiFieldName);
-      w.write(" == null)");
-      incrementIndent();
-      newLine(w);
-      w.write("_init");
-      w.write(class_);
-      w.write("();");
-      decrementIndent();
-      newLine(w);
-      w.write("return ");
-      w.write(seiFieldName);
-      w.write(";");
-      decrementIndent();
-      newLine(w);
-      w.write("}");
-      newLine(w);
-    }
-  }
-
-  private void writeSEIMethods(Writer w) throws IOException, CoreException
-  {
-    newLine(w);
-    //WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
-    if (clientProject_ == null) return;//wse.getProxyProject();
-    JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      JavaClass javaClass = (JavaClass)JavaClassImpl.reflect(getPackageName(sei), getClassName(sei), javaMOF.getResourceSet());
-      if (javaClass != null)
-      {
-        List methods = javaClass.getMethods();
-        for (Iterator it = methods.iterator(); it.hasNext();)
-        {
-          Method method = (Method)it.next();
-          if (!method.isConstructor() && !method.isNative() && method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
-            writeSEIMethods(w, javaClass, method);
-        }
-      }
-    }
-  }
-
-  private void writeSEIMethods(Writer w, JavaClass javaClass, Method method) throws IOException
-  {
-    w.write("public ");
-    // isVoid
-    if (method.isVoid())
-      w.write("void ");
-    else
-    {
-      w.write(getFullyQualifiedName(method.getReturnType()));
-      w.write(" ");
-    }
-    // method name
-    w.write(method.getName());
-    w.write("(");
-    // input parameters
-    JavaParameter[] inputParams = method.listParametersWithoutReturn();
-    for (int i = 0; i < inputParams.length; i++)
-    {
-      if (i > 0)
-        w.write(", ");
-      JavaHelpers javaHelpers = inputParams[i].getJavaType();
-      w.write(getFullyQualifiedName(javaHelpers));
-      w.write(" ");
-      String paramName = getClassName(inputParams[i].getQualifiedName());
-      w.write(getUnusedName(paramName));
-    }
-    w.write(")");
-    // exceptions
-    List exceptions = method.getJavaExceptions();
-    if (!exceptions.isEmpty())
-      w.write(" throws ");
-    for (Iterator it = exceptions.iterator(); it.hasNext();)
-    {
-      JavaClass exception = (JavaClass)it.next();
-      w.write(exception.getQualifiedNameForReflection());
-      if (it.hasNext())
-        w.write(", ");
-    }
-    // method body
-    w.write("{");
-    incrementIndent();
-    newLine(w);
-    String stubName = firstCharToLowerCase(javaClass.getName());
-    w.write("if (");
-    w.write(stubName);
-    w.write(" == null)");
-    incrementIndent();
-    newLine(w);
-    w.write("_init");
-    w.write(class_);
-    w.write("();");
-    decrementIndent();
-    newLine(w);
-    if (!method.isVoid())
-      w.write("return ");
-    w.write(stubName);
-    w.write(".");
-    w.write(method.getName());
-    w.write("(");
-    for (int i = 0; i < inputParams.length; i++)
-    {
-      if (i > 0)
-        w.write(", ");
-      String paramName = getClassName(inputParams[i].getQualifiedName());
-      w.write(getUnusedName(paramName));
-    }
-    w.write(");");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    newLine(w);
-  }
-
-  private void writeGetSetEndpoint(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public String getEndpoint() {");
-    incrementIndent();
-    newLine(w);
-    w.write("return _endpoint;");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    newLine(w);
-    w.write("public void setEndpoint(String endpoint) {");
-    incrementIndent();
-    newLine(w);
-    w.write("_endpoint = endpoint;");
-    newLine(w);
-    writeSetPropertyEndpoint(w);
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void createParentFolder(IResource res) throws CoreException
-  {
-    IResource parent = res.getParent();
-    if (parent != null && parent != res && parent instanceof IFolder)
-    {
-      IFolder folder = (IFolder)parent;
-      if (!folder.exists())
-      {
-        createParentFolder(folder);
-        folder.create(true, true, null);
-      }
-    }
-  }
-
-  private void incrementIndent()
-  {
-    indentCount++;
-  }
-
-  private void decrementIndent()
-  {
-    indentCount--;
-  }
-
-  private void indent(Writer w) throws IOException
-  {
-    for (int i = 0; i < indentCount; i++)
-      w.write("  ");
-  }
-
-  private void newLine(Writer w) throws IOException
-  {
-    w.write(NEW_LINE);
-    indent(w);
-  }
-  
-  private String getUnusedName(String name)
-  {
-    if (usedNames.contains(name))
-    {
-      for (int i = 0; i < 100; i++)
-      {
-        String newName = (new StringBuffer(name)).append(String.valueOf(i)).toString();
-        if (!usedNames.contains(newName))
-          return newName;
-      }
-    }
-    return name;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
deleted file mode 100644
index 8b973b2e3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends SimpleCommand
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-
-  public ValidateWSDLCommand()
-  {
-    super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand");
-  }
-
-  public Status execute(Environment env)
-  {
-	MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-	
-    if (wsdlURI != null && wsdlURI.length() > 0)
-    {
-      Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (definition != null)
-      {
-        int numServices = definition.getServices().size();
-        if (numServices < 1)
-        {
-          Status status = new SimpleStatus(WebServiceConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT", new Object[] {wsdlURI}), Status.ERROR, null);
-          env.getStatusHandler().reportError(status);
-          return status;
-        }
-      }
-    }
-    return new SimpleStatus("");
-  }
-
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
deleted file mode 100644
index 2c074cc8b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-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.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathUtils {
-
-	//	Copyright
-	public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
-	private static ClasspathUtils instance_; //$NON-NLS-1$
-	private static String DIR_CLASSES = "classes"; //$NON-NLS-1$
-	private static String DIR_LIB = "lib"; //$NON-NLS-1$
-	private static String DOT_JAR = ".jar"; //$NON-NLS-1$
-	private static String JAR = "jar"; //$NON-NLS-1$
-	private static String WEBINF_LIB = "/WEB-INF/lib"; //$NON-NLS-1$
-	private static String WEBINF = "WEB-INF"; //$NON-NLS-1$
-
-	private ClasspathUtils() {
-	}
-
-	public static ClasspathUtils getInstance() {
-		if (instance_ == null)
-			instance_ = new ClasspathUtils();
-		return instance_;
-	}
-	
-	public String getClasspathString(IProject project, String module) {
-		StringBuffer classpath = new StringBuffer();
-		String[] classpathEntries = getClasspath(project, false, module);
-
-		Vector classpathVector = new Vector();
-		for (int i = 0; i < classpathEntries.length; i++) {
-			if (!classpathVector.contains(classpathEntries[i])) {
-				classpathVector.add(classpathEntries[i]);
-				classpath.append(classpathEntries[i]);
-				classpath.append(";"); //$NON-NLS-1$
-			}
-		}
-		return classpath.toString();
-	}
-
-		
-	private String[] getClasspath(IProject project, boolean isDependent, String inputModule) {
-//		 inputModule is valid only if it's not a dependent project
-		String[] moduleClasspath = new String[0];
-		ArrayList projectClasspath = new ArrayList();
-		boolean needJavaClasspath = false;
-		StructureEdit mc = null;
-		IFolder webModuleServerRoot = null;
-		String resourceLocation = null;
-		IFolder webModuleClasses = null;
-		
-		try {
-			String module;
-			mc = StructureEdit.getStructureEditForRead(project);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			for (int i = 0; i < wbcs.length; i++) {
-				module = wbcs[i].getName();
-				// get the module's classpath
-				if (J2EEUtils.isEARComponent(project, module)) {
-					moduleClasspath = getClasspathForEARProject(project, module);
-				} else if (J2EEUtils.isWebComponent(project, module)) {
-					webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[i]);
-					if (webModuleServerRoot != null) { 
-						webModuleClasses = webModuleServerRoot.getFolder(WEBINF).getFolder(DIR_CLASSES);
-						if (webModuleClasses != null)
-							moduleClasspath = new String[] { webModuleClasses.getLocation().toOSString() };
-					}
-				} else if (J2EEUtils.isJavaComponent(project, module)) {
-					needJavaClasspath = true;
-					webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[i]);
-					if (webModuleServerRoot != null) { 
-						moduleClasspath = new String[] { webModuleServerRoot.getLocation().toOSString() };
-					}
-				}
-				
-				// add module classpath to project classpath
-				for (int j = 0; j < moduleClasspath.length; j++) {
-					projectClasspath.add(moduleClasspath[j]);
-				}
-			}
-			if (!isDependent) {
-				if (J2EEUtils.isWebComponent(project, inputModule)) {
-					needJavaClasspath = true;
-					moduleClasspath = getWEBINFLib(project, inputModule);
-					for (int j = 0; j < moduleClasspath.length; j++) {
-						projectClasspath.add(moduleClasspath[j]);
-					}
-				}
-			}
-			
-			// If there are Web or Java module in the project, get the project's Java classpath
-			if (needJavaClasspath) {
-				String[] javaClasspath;
-				try {
-					IJavaProject javaProj = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
-					if (javaProj != null) {
-						javaClasspath = getClasspathForJavaProject(javaProj);
-						for (int j = 0; j < javaClasspath.length; j++) {
-							projectClasspath.add(javaClasspath[j]);
-						}
-					}
-				} catch (CoreException e) {
-					// not able to get Java classpath, just ignore
-				}	
-			}
-		} finally {
-			if (mc != null)
-				mc.dispose();
-		}
-		return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
-	}
-
-	// Need to get all modules in the project. If there's a EAR module, get the utility JARs 
-	private String[] getUtilityJarClasspath(IProject project) {
-		String[] moduleClasspath = new String[0];
-		ArrayList utilityJarsClasspath = new ArrayList();
-		StructureEdit mc = null;
-		try {
-			String module;
-			mc = StructureEdit.getStructureEditForRead(project);
-			WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-			for (int i = 0; i < wbcs.length; i++) {
-				module = wbcs[i].getName();
-				if (J2EEUtils.isEARComponent(project, module)) {
-					moduleClasspath = getClasspathForEARProject(project, module);
-					for (int j = 0; j < moduleClasspath.length; j++) {
-						utilityJarsClasspath.add(moduleClasspath[j]);
-					}
-				}
-			}
-
-		} finally {
-			if (mc != null)
-				mc.dispose();
-		}
-		return (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
-	}
-	
-	private String[] getClasspathForEARProject(IProject project, String module) {
-		IPath projectPath =
-			project.getProject().getLocation().addTrailingSeparator().append(module).addTrailingSeparator();
-		return getDirectoryJarFiles(projectPath);
-	}
-
-	private String[] getDirectoryJarFiles(IPath iPath) {
-		File dir = iPath.toFile();
-		Vector jarsVector = new Vector();
-		if (dir.exists() && dir.isDirectory()) {
-			String[] filenames = dir.list();
-			for (int i = 0; i < filenames.length; i++) {
-				if (filenames[i].endsWith(DOT_JAR))
-					jarsVector.add(path2String(iPath) + filenames[i]);
-			}
-		}
-		String[] jars = new String[jarsVector.size()];
-		jarsVector.copyInto(jars);
-		return jars;
-	}
-
-	private String[] getWEBINFLib(IProject project, String module) {
-		String[] webinfLibJars = new String[0];
-		ArrayList anArrayList = new ArrayList();
-		try {
-			String resourceLocation = null;
-					IVirtualComponent component = ComponentCore.createComponent(project, module);
-					if (component != null) {
-						
-						IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
-								WEBINF_LIB));
-						if (webInfLib != null) {
-							IVirtualResource[] resources = webInfLib.members();
-							IResource aResource = null;
-							for (int i = 0; i < resources.length; i++) {
-								aResource = resources[i].getUnderlyingResource();
-								if (JAR.equalsIgnoreCase(aResource.getFileExtension()))
-									anArrayList.add( aResource.getLocation().toOSString());
-							}
-							if (anArrayList.size() != 0)
-								webinfLibJars = (String[]) anArrayList.toArray(new String[anArrayList.size()]);
-							}
-					}
-				} catch (CoreException e) {
-				}
-		return webinfLibJars;
-	}
-
-	private String[] getClasspathForJavaProject(IJavaProject javaProject) {
-		ArrayList projectClasspath = new ArrayList();
-		try {
-			IClasspathEntry[] buildPath =
-				javaProject.getResolvedClasspath(true);
-			for (int i = 0; i < buildPath.length; i++) {
-				String[] buildPathString =
-					classpathEntry2String(
-						buildPath[i],
-						javaProject.getProject());
-				for (int j = 0; j < buildPathString.length; j++) {
-					projectClasspath.add(buildPathString[j]);
-				}
-			}
-		} catch (JavaModelException jme) {
-		}
-
-		String[] utilityJarsClasspath;
-		IProject project = javaProject.getProject();
-		IProject[] referencingProjects = project.getReferencingProjects();
-		for (int i = 0; i < referencingProjects.length; i++) {
-			utilityJarsClasspath = getUtilityJarClasspath(referencingProjects[i]);
-			for (int j = 0; j < utilityJarsClasspath.length; j++) {
-				projectClasspath.add(utilityJarsClasspath[j]);
-			}
-		}
-
-		return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
-	}
-
-	private String[] classpathEntry2String(
-		IClasspathEntry entry,
-		IProject project) 
-	{
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_LIBRARY :
-			{
-				return new String[] { path2String(entry.getPath())};	
-			}
-			case IClasspathEntry.CPE_PROJECT :
-			{			
-				return getClasspath(
-					ResourcesPlugin.getWorkspace().getRoot().getProject(
-						entry.getPath().lastSegment()), true, "");
-			}
-			case IClasspathEntry.CPE_SOURCE :
-				{
-					IPath path = entry.getPath();
-					if (path.segment(0).equals(project.getName()))
-						path = path.removeFirstSegments(1);
-					return new String[] {
-						path2String(
-							project
-								.getLocation()
-								.addTrailingSeparator()
-								.append(
-								path))};
-				}
-			case IClasspathEntry.CPE_VARIABLE :
-			{
-				return classpathEntry2String(
-					JavaCore.getResolvedClasspathEntry(entry),
-					project);
-			}
-			default :
-			{
-				return new String[] { path2String(entry.getPath())};
-			}
-		}
-	}
-
-	private String path2String(IPath path) {
-		return path.toOSString();
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
deleted file mode 100644
index 68269d186..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class FileUtil
-{
-  public FileUtil()
-  {
-    super();
-  }
-
-  public static void copyFile(String src, String dest)
-  {
-    InputStream is = null;
-    FileOutputStream fos = null;
-    try
-    {
-      is = new FileInputStream(src);
-      byte buff[] = new byte[1024];
-      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)
-    {
-    }
-    finally
-    {
-      try
-      {
-        fos.close();
-        is.close();
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  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 void deleteDirectories(File dir) throws Exception
-  {
-    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();
-  }
-
-  /**
-   * Creates a folder and all parent folders if not existing Project must exist
-   */
-  public static void createFolder(IFolder folder, boolean force, boolean local) throws CoreException
-  {
-    if (!folder.exists())
-    {
-      IContainer parent = folder.getParent();
-      if (parent instanceof IFolder)
-      {
-        createFolder((IFolder)parent, force, local);
-      }
-      folder.create(force, local, new NullProgressMonitor());
-    }
-  }
-
-  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())
-    {
-      FileUtil.createFileAndParentDirectories(targetFileName);
-      FileUtil.copyFile(sourceFileName, targetFileName);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
deleted file mode 100644
index cb652a18a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-public class PlatformUtils {
-
-	public static final String PLATFORM_ROOT = "platform:/resource";
-	public static final String WIN_FILE_PROTOCOL = "file:/";
-	public static final String LNX_FILE_PROTOCOL = "file://";
-	public static final String PLATFORM = "platform";
-	public static final String RESOURCE = "/resource";
-
-	private PlatformUtils() {
-	}
-
-	/**
-	* Returns the string representation of platform URL given an IPath
-	* @param IPath path
-	* @return String platformURL
-	*/
-	public static String getPlatformURL(IPath path) {
-		String platformURL;
-		platformURL = URI.createPlatformResourceURI(path.toString()).toString();
-		// old method: file system representation
-		// 	platformURL = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation().toString();
-		return platformURL;
-	}
-
-	/**
-	* Returns the URL representation of the Platform URL given an IPath
-	* The PlatformResourceManager underdstands this format and therefore
-	* this is suited for command URL's
-	* @param IPath path
-	* @return URL Platform URL
-	*/
-	public static URL getCommandPlatformURL(IPath path) {
-		URL url = null;
-		try {
-			url = new URL(PLATFORM, null, RESOURCE + path.toString());
-		} catch (MalformedURLException e) {
-			return url;
-		}
-		return url;
-	}
-
-	/**
-	* Returns the string representation of path given platform URL string
-	* @param String platform URL string
-	* @return String path string
-	*/
-	public static String getPathFromPlatform(String platformStr) {
-		String pathStr = platformStr;
-
-		String rootLocation;
-		rootLocation = PLATFORM_ROOT;
-		// old method: file system representation
-		//	rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-		if (platformStr.startsWith(rootLocation))
-			pathStr = platformStr.substring(rootLocation.length());
-		return pathStr;
-	}
-
-	/**
-	* Returns the string representation of platform URL given the path string
-	* @param String path string
-	* @return String platform URL string
-	*/
-	public static String getPlatformFromPath(String pathStr) {
-		String platformStr = pathStr;
-
-		String rootLocation;
-		rootLocation = PLATFORM_ROOT;
-		// old method: file system representation
-		//	rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-		platformStr = rootLocation + pathStr;
-		return platformStr;
-	}
-
-	/**
-	* Returns the string representation of the local file system file given platform URL string
-	* @param String platform URL string
-	* @return String file string
-	*/
-	public static String getFileFromPlatform(String platformStr) {
-		String fileStr = platformStr;
-		String pathStr = getPathFromPlatform(platformStr);
-
-		fileStr =
-			ResourcesPlugin
-				.getWorkspace()
-				.getRoot()
-				.getFile(new Path(pathStr))
-				.getLocation()
-				.toString();
-
-		// old method: file system representation
-		//	Do nothing
-
-		return fileStr;
-	}
-
-	/**
-	* Returns the file protocol representation of the local file system file given platform URL string
-	* @param String platform URL string
-	* @return String the file protocol uri
-	*/
-	public static String getFileURLFromPlatform(String platformStr) {
-		String fileStr = platformStr;
-		String pathStr = getPathFromPlatform(platformStr);
-		try {
-			fileStr =
-				ResourcesPlugin
-					.getWorkspace()
-					.getRoot()
-					.getFile(new Path(pathStr))
-					.getLocation()
-					.toFile()
-					.toURL()
-					.toString();
-		} catch (MalformedURLException murle) {
-			fileStr = getFileURLFromPath(new Path(pathStr));
-		}
-		return fileStr;
-	}
-
-	/**
-	* Returns the file protocol representation of a local file
-	* @param IPath the Path object representing the file
-	* @return String the file protocol uri
-	*/
-	public static String getFileURLFromPath(IPath path) {
-
-		String file = null;
-		if (path != null) {
-			if (!path.isAbsolute()) {
-				file =
-					ResourcesPlugin
-						.getWorkspace()
-						.getRoot()
-						.getFile(path)
-						.getLocation()
-						.toString();
-				if (file.charAt(0) == IPath.SEPARATOR) {
-					file = LNX_FILE_PROTOCOL + file;
-				} else {
-					file = WIN_FILE_PROTOCOL + file;
-				}
-			} else {
-				file = path.toString();
-			}
-			if (file != null && file.charAt(0) == IPath.SEPARATOR) {
-				file = LNX_FILE_PROTOCOL + file;
-			} else {
-				file = WIN_FILE_PROTOCOL + file;
-			}
-		}
-		return file == null ? null : file;
-
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
deleted file mode 100644
index 42afccbb1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import org.apache.axis.wsdl.toJava.Utils;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public class WSDLUtils {
-
-  private static final String DOT = ".";
-  private static final String SLASH = "/";
-  private static final String PROTOCOL_SUFFIX = "://";
-
-  /**
-   * Tokens in a namespace that are treated as package name part separators.
-   * Used by normalizePackageName.
-   */
-  private static final char[] pkgSeparators = { ':', '\\', '/' };
-
-  /**
-  * These are java keywords as specified at the following URL (sorted alphabetically).
-  * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
-  * Note that false, true, and null are not strictly keywords; they are literal values,
-  * but for the purposes of this array, they can be treated as literals.
-  */
-  static final String keywords[] =
-  {
-      "abstract",  "boolean",      "break",      "byte",      "case",
-      "catch",     "char",         "class",      "const",     "continue",
-      "default",   "do",           "double",     "else",      "extends",
-      "false",     "final",        "finally",    "float",     "for",
-      "goto",      "if",           "implements", "import",    "instanceof",
-      "int",       "interface",    "long",       "native",    "new",
-      "null",      "package",      "private",    "protected", "public",
-      "return",    "short",        "static",     "strictfp",  "super",
-      "switch",    "synchronized", "this",       "throw",     "throws",
-      "transient", "true",         "try",        "void",      "volatile",
-      "while"
-  };
-
-  /** Collator for comparing the strings */
-  static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
-
-  /** Use this character as suffix */
-  static final char keywordPrefix = '_';
-
-  private WSDLUtils() {
-  }
-
-  /**
-  * Returns the name of the first service element in the WSDL definition.
-  * @return String service element name
-  */
-  public static String getServiceElementName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-  	return service.getQName().getLocalPart();
-  }
-
-  /**
-  * Returns the name of the port type element points to by the first service and port element in the WSDL definition.
-  * @return String port type element name
-  */
-  public static String getPortTypeName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-    while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) {
-           Binding binding = port.getBinding();
-           return binding.getPortType().getQName().getLocalPart();
-        }
-      }
-    }
-    return "";
-  
-  }
-
-  /**
-  * Returns the name of the port element in the WSDL definition.
-  * @return String port name
-  */
-  public static String getPortName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-    while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) 
-          return port.getName();
-      }  
-    }
-     return "";
-  }
-
-
-
-  public static String makeNamespace (String clsName) {
-	  return makeNamespace(clsName, "http");
-  }
-
-  /**
-   * Make namespace from a fully qualified class name
-   * and the given protocol
-   *
-   * @param clsName fully qualified class name
-   * @param protocol protocol String
-   * @return namespace namespace String
-   */
-  public static String makeNamespace (String clsName, String protocol) {
-	  if (clsName.lastIndexOf('.') == -1)
-		  return protocol + "://" + "DefaultNamespace";
-	  String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
-	  return makeNamespaceFromPackageName(packageName, protocol);       
-  }
-
-    
-  private static String makeNamespaceFromPackageName(String packageName, String protocol) {
-	  if (packageName == null || packageName.equals(""))
-		  return protocol + "://" + "DefaultNamespace";
-	  StringTokenizer st = new StringTokenizer( packageName, "." );
-	  String[] words = new String[ st.countTokens() ];
-	  for(int i = 0; i < words.length; ++i)
-		  words[i] = st.nextToken();
-
-	  StringBuffer sb = new StringBuffer(80);
-	  for(int i = words.length-1; i >= 0; --i) {
-		  String word = words[i];
-		  // seperate with dot
-		  if( i != words.length-1 )
-			  sb.append('.');
-		  sb.append( word );
-	  }
-	  return protocol + "://" + sb.toString();
-  }
-
-  /**
-  * Return a Definition for the wsdl url given 
-  *
-  */
-  public static Definition getWSDLDefinition(String wsdlURL)
-  {
-    if(wsdlURL == null) return null;
-
-    WSDLFactory wsdlFactory;
-    Definition definition = null;
-    String wsdlLocation = null;
-    try {
-      wsdlFactory = new WSDLFactoryImpl();
-      WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-      definition = wsdlReader.readWSDL(wsdlURL);
-    } 
-    catch (Exception e) { // can be WSDLException or IOException
-      return null;
-    }
-    return definition;
-  }
-
-  public static String getPackageName(Definition definition)
-  {
-     if (definition != null)
-     {
-        String namespace = definition.getTargetNamespace();
-        return namespaceURI2PackageName(namespace);
-     }
-     return "";
-  }
-
-  public static String getPackageNameForBindingImpl(Port port, Map ns2pkgMap)
-  {
-    if (port != null && ns2pkgMap != null)
-    {
-      Binding binding = port.getBinding();
-      QName bndQName = binding.getQName();
-      String namespace = bndQName.getNamespaceURI();
-      Object pkg = ns2pkgMap.get(namespace);
-      if (pkg != null)
-        return (String)pkg;
-    }
-    return getPackageNameForBindingImpl(port);
-  }
-
-  public static String getPackageNameForBindingImpl(Definition definition, Map ns2pkgMap)
-  {
-    if (definition != null && ns2pkgMap != null)
-    {
-      Service service = (Service) definition.getServices().values().iterator().next();
-      Port port = (Port) service.getPorts().values().iterator().next();
-      return getPackageNameForBindingImpl(port, ns2pkgMap);
-    }
-    return getPackageNameForBindingImpl(definition);
-  }
-
-  public static String getPackageNameForBindingImpl(Definition definition)
-  {
-    Port port = null;
-    if (definition != null)
-    {
-      Service service = (Service)definition.getServices().values().iterator().next();
-      port = (Port)service.getPorts().values().iterator().next();
-    }
-    return getPackageNameForBindingImpl(port);
-  }
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the binding namespace as the package name
-// of the BindingImpl class.
-public static String getPackageNameForBindingImpl(Port port)
-{
-   if (port != null)
-   {
-	  Binding binding = port.getBinding();
-//	  PortType portType = binding.getPortType();
-	  QName bndQName = binding.getQName();
-	  String namespace = bndQName.getNamespaceURI();
-	  return namespaceURI2PackageName(namespace);
-   }
-   return "";
-}
-
-/**
-* Get the namespace for the Port Type
-* 
-*/
-public static String getPortTypeNamespace(Definition definition)
-{
-  String namespace = "";
-  if (definition != null)
-  {
-	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-	while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress){ 
-	      PortType portType = port.getBinding().getPortType();
-	      QName bndQName = portType.getQName();
-	      namespace = bndQName.getNamespaceURI();
-      	}  
-	  }
-  	}
-  }  
-  return namespace;
-}
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the porttype namespace as the package name
-// of the Java class (in ejb).
-public static String getPackageNameForPortType(Definition definition)
-{
-   if (definition != null)
-   {
-	  String namespace = getPortTypeNamespace(definition);
-	  return namespaceURI2PackageName(namespace);
-    }
-    return "";
-}
-
-  /**
-  * checks if the input string is a valid java keyword.
-  * @return boolean true/false
-  */
-  public static boolean isJavaKeyword(String keyword) {
-    return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
-  }
-
-  /**
-  * Turn a java keyword string into a non-Java keyword string.  (Right now
-  * this simply means appending an underscore.)
-  */
-  public static String makeNonJavaKeyword(String keyword){
-    return  keywordPrefix + keyword;
-  }
-
-  public static String getFullyQualifiedPortTypeName(Definition definition)
-  {
-    StringBuffer beanName = new StringBuffer();
-    beanName.append(getPackageNameForPortType(definition)); 
-    beanName.append(DOT);
-    beanName.append(getPortTypeName(definition));
-    return beanName.toString();
-
-  }
-
-  /**
-   * getName
-   * @param uri String
-   * @return get the file name after the last \ and /
-   */
-  public static String getName(String uri) {
-
-	// Get everything after last slash or backslash
-	int bslash = uri.lastIndexOf("\\");
-	int slash = uri.lastIndexOf("/");
-	int i =  bslash > slash ? bslash : slash;
-	String fileName = uri.substring(i+1).replace('?', '.');
-
-	return fileName;
-  }
-
-
-/**
- * getWSDLName
- * @param uri String
- * @return get the file name after the last \ and /, trimmed, defaulted to
- *         "default.wsdl" if there is no name, and ending with ".wsdl".
- */
- public static String getWSDLName(String uri) {
-
-	// Get everything after last slash or backslash from input URI
-	// with no whitespace.
-	String WSDLName = getName(uri).trim();
-
-	// if empty, return the default "default.wsdl"
-	if ( WSDLName.equals( "" ) ) {
-		WSDLName = "default.wsdl";
-	}
-
-	// make sure name ends with ".wsdl", lower case.
-	else {
-		if ( ! WSDLName.endsWith( ".wsdl" ) ) {
-			if ( WSDLName.toLowerCase().endsWith( ".wsdl" ) ) {
-				int lastDot = WSDLName.lastIndexOf(".");
-				WSDLName = WSDLName.substring( 0, lastDot ) + ".wsdl";
-			}
-			else {
-				WSDLName = WSDLName + ".wsdl";
-			}
-		}
-	}
-
-	return WSDLName;
- }
-
- /**
-  * getPortTypeNameFromBeanName
-  * @param beanname String
-  * @return get the port type name based on the bean name
-  */
-  public static String getPortTypeNameFromBeanName(String beanName) {
-    return beanName.substring(beanName.lastIndexOf('.') + 1);	
-  }
-
-  public static String getPackageName(Service service, Map ns2pkgMap)
-  {
-    if (service != null)
-    {
-      String namespace = service.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-  public static String getPackageName(Port port, Map ns2pkgMap)
-  {
-    if (port != null)
-      return getPackageName(port.getBinding(), ns2pkgMap);
-    else
-      return "";
-  }
-
-  public static String getPackageName(Binding binding, Map ns2pkgMap)
-  {
-    if (binding != null)
-    {
-      String namespace = binding.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-  public static String getPackageName(PortType portType, Map ns2pkgMap)
-  {
-    if (portType != null)
-    {
-      String namespace = portType.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-
-  /**
-   * namespaceURI2PackageName
-   * @param namespaceURI
-   * @return package name based on namespace
-   */
-  public static String namespaceURI2PackageName(String namespaceURI)
-  {
-  	/**
-  	 * TODO:  The makePackageName method from 
-  	 * org.apache.axis.wsdl.toJava.Utils in axis-1_1 is called to map namespace to package name.  
-  	 * This will be replaced with an extension point to plug in runtime emitter specific namespace to 
-  	 * package mapping algorithm 
-  	 */
-  	return Utils.makePackageName(namespaceURI);
-  	
-//    StringBuffer sb = new StringBuffer(80);
-//    if (namespaceURI != null && namespaceURI.length() > 0)
-//    {
-//      String hostname = null;
-//      try
-//      {
-//        hostname = new URL(namespaceURI).getHost();
-//      }
-//      catch (MalformedURLException e)
-//      {
-//        int index = namespaceURI.indexOf(":");
-//        if (index > -1)
-//        {
-//          hostname = namespaceURI.substring(index+1);
-//          index = hostname.indexOf("/");
-//          if (index > -1)
-//            hostname = hostname.substring(0, index);
-//        }
-//        else
-//          hostname = namespaceURI;
-//      }
-//      
-//	  // if we didn't file a hostname, bail
-//	  if (hostname == null) {
-//		  return null;
-//	  }
-//
-//      //convert illegal java identifier
-//      hostname = hostname.replace('-', '_');
-//      // tokenize the hostname and reverse it
-//      StringTokenizer st = new StringTokenizer(hostname, ".");
-//      String[] words = new String[st.countTokens()];
-//      for (int i = 0; i < words.length; ++i)
-//        words[i] = st.nextToken();
-//      for(int i = words.length-1; i >= 0; --i)
-//      {
-//        String word = words[i];
-//        if (isJavaKeyword(word))
-//          word = makeNonJavaKeyword(word);
-//        // seperate with dot
-//        if (i != words.length-1)
-//          sb.append('.');
-//        // convert digits to underscores
-//        if (Character.isDigit(word.charAt(0)))
-//          sb.append('_');
-//          sb.append(word);
-//      }
-//    }
-//    return normalizePackageName(sb.toString(), DOT.charAt(0));
-  }
-
-  /**
-   * normalizePackageName
-   * @param pkg
-   * @param separator
-   * @return normalize a String (package name) and repalcing 
-   *         ':', '\\', '/' by separator (DOT).
-   */
-  private static String normalizePackageName(String pkg, char separator)
-  {
-	if (pkg == null) {
-		return pkg;
-	}
-	for(int i=0; i<pkgSeparators.length; i++)
-	   pkg = pkg.replace(pkgSeparators[i], separator);
-	return pkg;
-  }
-  
-  public static String resolveDotInPortName(String name) {
-	if(name.indexOf(".")<0)
-	{
-		return name;
-	}
-    StringBuffer sb = new StringBuffer();
-    boolean afterDot = false;
-    for(int i=0; i<name.length(); i++)
-    {
-    	if(name.charAt(i)=='.')
-    	{
-    		afterDot = true;
-    	}
-    	else if(afterDot)
-    	{
-    		sb.append(name.substring(i,i+1).toUpperCase());
-    		afterDot=false;
-    	}
-    	else
-    	{
-    		sb.append(name.charAt(i));
-    	}
-    }
-    return sb.toString();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
deleted file mode 100644
index bf515af3a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class AxisClientCommandsFragment extends BooleanFragment
-{
-  private boolean genProxy_;
-  
-  public AxisClientCommandsFragment()
-  {
-    SequenceFragment root = new SequenceFragment();
-    
-    root.add(new SimpleFragment(new DefaultsForHTTPBasicAuthCommand(), ""));
-    //root.add(new SimpleFragment(new CopyAxisJarCommand(), ""));
-    root.add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
-    //root.add(new SimpleFragment(new DefaultsForClientJavaWSDLCommand(), "")); 
-    root.add(new SimpleFragment(new ValidateWSDLCommand(), ""));
-    root.add(new SimpleFragment(new WSDL2JavaCommand(), "")); 
-    root.add(new SimpleFragment(new RefreshProjectCommand(), ""));
-    root.add(new SimpleFragment(new Stub2BeanCommand(), ""));
-    root.add(new SimpleFragment(new BuildProjectCommand(), ""));
-    
-    setCondition( new Condition()
-                  {
-                    public boolean evaluate()
-                    {
-                      return genProxy_;
-                    }
-                  });
-    setTrueFragment( root );
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    genProxy_ = genProxy;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
deleted file mode 100644
index 9048ea8d2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class AxisClientFragment extends SequenceFragment 
-{
-
-	public AxisClientFragment() 
-	{
-		//add(new SimpleFragment(new AxisClientDefaultingCommand(), ""));
-		add(new SimpleFragment("AxisClientStart"));
-		add(new MappingFragment());
-		add(new AxisClientCommandsFragment());
-		// TODO: Look into AddWSDLtoWSILCommand for the client scenario
-	}
-	
-	public void registerDataMappings(DataMappingRegistry registry) 
-	{
-		// AxisClientDefaultingCommand
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
-				new StringToIProjectTransformer());
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-				null);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-				"ClientProjectEAR", new StringToIProjectTransformer());
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", AxisClientDefaultingCommand.class, "WsdlURL", null); // URI
-																																	// to
-		// URL
-		// transformer
-		// req'd??
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-				"TestProxySelected", null);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
-		registry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
-		// DefaultsForHTTPBasicAuthCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
-	    registry.addMapping(AxisClientDefaultingCommand.class, "CustomizeClientMappings", MappingFragment.class );    
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "ServiceProject",
-		// CreateWebProjectCommand.class);
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "EJBProjectName",
-		// CreateWebProjectCommand.class);
-		// CopyAxisJarCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-		// AddJarsToProjectBuildPathTask()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.class, "Project", null);
-		// DefaultsForClientJavaWSDLCommand() // javaParam_, model_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
-				null);
-		//		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
-		// DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
-		// //
-		// URL to URL??
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
-		// to
-		// URL??
-		// ValidateWSDLCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-		// WSDL2JavaCommand() // javaParam_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
-																													// to
-																													// URI??
-		// RefreshProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
-		// Stub2BeanCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
-		// BuildProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-		registry.addMapping(Stub2BeanCommand.class, "ProxyBean", ClientExtensionOutputCommand.class, "ProxyBean", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
-	}
-
-	public class MappingFragment extends BooleanFragment {
-
-		private boolean showMappings_;
-		public MappingFragment() {
-
-			super();
-			setTrueFragment(new SimpleFragment("AxisClientBeanMapping"));
-			setCondition(new Condition() {
-
-				public boolean evaluate() {
-
-					return showMappings_;
-				}
-			});
-		}
-		public void setCustomizeClientMappings(boolean showMappings) {
-
-			showMappings_ = showMappings;
-		}
-	}
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
deleted file mode 100644
index 267156313..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class AxisMappingsFragment extends BooleanFragment
-{
-  private boolean showMappings_;
-
-  public AxisMappingsFragment()
-  {
-    super();
-    setTrueFragment( new SimpleFragment( "AxisMappingsWidget" ));
-    setCondition( new Condition()
-                  {
-                    public boolean evaluate()
-                    {
-                      return showMappings_;
-                    }
-                  } );
-  }
-  
-  public void setShowMapping( boolean showMappings )
-  {
-    showMappings_ = showMappings;
-  }      
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
deleted file mode 100644
index adada38bb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class AxisMappingsWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  private TableViewerWidget mappings_;
-
-  private byte mode_;
-  private JavaWSDLParameter javaParameter_;
-
-  public static final byte MODE_BEAN2XML = (byte)0;
-  public static final byte MODE_XML2BEAN = (byte)1;
-  public static final byte MODE_XML2PROXY = (byte)2;
-  public static final byte MODE_XML2EJB = (byte)3;
-  public static final byte MODE_EJB2XML = (byte)4;
-  
-  private final String DEFAULT_PACKAGE = "default.javapackage";
-  private final String DEFAULT_NAMESPACE = "http://default.namespace";
-  
-  /*CONTEXT_ID PWJM0001 for the WSDL to Java Mappings Page*/
-  private String INFOPOP_PWJM_PAGE = "PWJM0001"; //$NON-NLS-1$
-  
-  public AxisMappingsWidget( byte mode )
-  {
-    mode_ = mode;
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-        
-    // TODO The TOOLTIP_PWJM_PAGE key doesn't seem to exist anywhere???
-	//parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWJM_PAGE" ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJM_PAGE );
-    
-    Text mappingLabel = new Text( parent, SWT.READ_ONLY | SWT.WRAP );
-    mappingLabel.setText( msgUtils.getMessage( "LABEL_MAPPING_PAIRS" ) );
-                                               
-    List initValues = new ArrayList();
-    
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML) 
-    {
-		String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE"),
-		                     msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE" )};
-		mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_PACKAGE, DEFAULT_NAMESPACE}, TableViewerWidget.MAP_ONE_TO_ONE); //$NON-NLS-1$
-    }
-	else 
-	{
-      	String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE"),
-		                     msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE")};
-		mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_NAMESPACE, DEFAULT_PACKAGE }, TableViewerWidget.MAP_MANY_TO_ONE); //$NON-NLS-1$
-	}
-    
-	mappings_.addControls( parent, statusListener );
-   
-    return this;
-  }
-  
-  public Status getStatus()
-  {
-    return mappings_.getStatus();  
-  }
-  
-  public void setJavaParameter( JavaWSDLParameter parameter )
-  {
-    javaParameter_ = parameter;
-  }
-  
-  public JavaWSDLParameter getJavaParameter()
-  {
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML || mode_ == MODE_XML2BEAN || mode_ == MODE_XML2PROXY)
-    {
-      //Set the mappings on javaParameter
-      TableItem[] pairs = mappings_.getItems();
-  	  HashMap map = new HashMap();
-  	  for (int i=0; i<pairs.length; i++)
-  	  {
-  		map.put(pairs[i].getText(0),pairs[i].getText(1));
-  	  }
-  	  javaParameter_.setMappings(map);
-  	  
-  	  //Set the namespace on the javaParameter
-  	  String beanName = javaParameter_.getBeanName();
-	  if(beanName != null && !beanName.equals(""))
-	  {
-		String packageName = beanName.substring(0, beanName.lastIndexOf('.'));
-		if(map.containsKey(packageName))
-		{
-		  String tns = (String)map.get(packageName);
-		  javaParameter_.setNamespace(tns);
-		}		
-	  }
-
-    }
-    return javaParameter_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
deleted file mode 100644
index ffe4c672b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class AxisProxyWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
-  private final String INFOPOP_PWJB_PAGE = "PWJB0001";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_PAGE = "TOOLTIP_PWJB_PAGE";
-		
-  private Text folderText_;
-  /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
-  private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_TEXT_FOLDER = "TOOLTIP_PWJB_TEXT_FOLDER";
-
-  private Button genProxyCheckbox_;
-  /*CONTEXT_ID PWJB0009 Indicates whether to generate a proxy or not. */
-  private final String INFOPOP_PWJB_CHECKBOX_GENPROXY = "PWJB0009";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_CHECKBOX_GENPROXY = "TOOLTIP_PWJB_CHECKBOX_GENPROXY";
-		
-  private Button showMappingsCheckbox_;
-  /*CONTEXT_ID PWJB0016 for the Show Mappings checkbox of the Bean Methods Page*/
-  private String INFOPOP_N2P_SHOW_MAPPINGS = "PWJB0016"; //$NON-NLS-1$
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ );
-    
-	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PWJB_PAGE ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." +  INFOPOP_PWJB_PAGE);
-    
-    genProxyCheckbox_ = uiUtils.createCheckbox( parent, "CHECKBOX_GENPROXY",
-                                                TOOLTIP_PWJB_CHECKBOX_GENPROXY,
-                                                INFOPOP_PWJB_CHECKBOX_GENPROXY );
-    genProxyCheckbox_.addListener( SWT.Selection, statusListener );
-    
-    genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
-                                            {
-                                              public void widgetSelected( SelectionEvent evt )
-                                              {
-                                                handleGenProxy();  
-                                              }
-                                            });
-    
-    Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-    
-    folderText_ = uiUtils.createText( textGroup, "LABEL_FOLDER_NAME",
-                                      TOOLTIP_PWJB_TEXT_FOLDER,
-                                      INFOPOP_PWJB_TEXT_FOLDER,
-                                      SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    folderText_.addListener( SWT.Modify, statusListener );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
-                                                    "TOOLTIP_N2P_SHOW_MAPPINGS",
-                                                    INFOPOP_N2P_SHOW_MAPPINGS );
-    // Since this widget affects whether the next page is shown or not we
-    // need to add the statusListener.
-    showMappingsCheckbox_.addListener( SWT.Selection, statusListener );
-    
-    return this;
-  }
-  
-  private void handleGenProxy()
-  {
-    boolean enabled = genProxyCheckbox_.getSelection();
-    
-    folderText_.setEnabled( enabled );
-    showMappingsCheckbox_.setEnabled( enabled );
-  }
-  
-  public void setProxyFolder( String proxyFolder )
-  {
-    folderText_.setText( proxyFolder );  
-  }
-  
-  public String getProxyFolder()
-  {
-     return folderText_.getText();  
-  }
-  
-  public void setGenerateProxy( Boolean genProxy )
-  {
-    genProxyCheckbox_.setSelection( genProxy.booleanValue() );
-  }    
-  
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( genProxyCheckbox_.getSelection() );
-  }   
-  
-  public void setCustomizeClientMappings( boolean showMappings )
-  {
-    showMappingsCheckbox_.setSelection( showMappings );
-  }            
-  
-  public boolean getCustomizeClientMappings()
-  {
-    return showMappingsCheckbox_.getSelection() && genProxyCheckbox_.getSelection();
-  }   
-  
-  public void setIsClientScenario( boolean isClientScenario )
-  {
-    genProxyCheckbox_.setEnabled( !isClientScenario ); 
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
deleted file mode 100644
index 05446c960..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-public class DefaultsForClient extends SimpleCommand
-{
-  private boolean customizeMappings_ = true;
-  
-  public boolean getCustomizeClientMappings()
-  {
-    return customizeMappings_;
-  } 
-  
-  public void setCustomizeClientMappings( boolean value )
-  {
-    customizeMappings_ = value; 
-  }
-  
-  public String getProxyFolder()
-  {
-     return "/proxyproject/myfolder";  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
deleted file mode 100644
index a892c8141..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-  * Developers who are adding web service clients into the wizard should create
-  * a class that implements this interface.  
-**/
-public class WebServiceClientAxisType implements CommandWidgetBinding 
-{
-
-	
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-  	// AxisClientDefaultingCommand  	
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "CustomizeClientMappings", AxisProxyWidget.class );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);    
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);    
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-    
-    // AxisProxyWidget
-    dataRegistry.addMapping( AxisProxyWidget.class, "CustomizeClientMappings", AxisClientFragment.MappingFragment.class );
-    dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", AxisClientCommandsFragment.class );
-    dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
-    
-    //AxisMappingsWidget
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForClientJavaWSDLCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ValidateWSDLCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Stub2BeanCommand.class, "JavaWSDLParam", null); //OK
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    String       pluginId_     = "org.eclipse.jst.ws.consumption.ui";
-    String       axisPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    MessageUtils axisMsgUtils = new MessageUtils( axisPluginId_ + ".plugin", this );
-    
-    widgetRegistry.add( "AxisClientStart", 
-        axisMsgUtils.getMessage("PAGE_TITLE_WS_AXIS_PROXY"),
-        axisMsgUtils.getMessage("PAGE_DESC_WS_AXIS_PROXY"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisProxyWidget();
-          }
-        } );
-    
-    widgetRegistry.add( "AxisClientBeanMapping", 
-        axisMsgUtils.getMessage("PAGE_TITLE_WS_XML2PROXY"),
-        msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
-          }
-        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new AxisClientFragment(); 
-             }
-           };
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
deleted file mode 100644
index fb2a5e220..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Text;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/*
- * Add the stuff below to the properties file to make this work. 
-#
-#Test only - do not commit
-#
-wsdlURI=wsdlURI
-clientProject=clientProject
-serviceQName=serviceQName
-outputWSDLpath=outputWSDLpath
-GO=GO
-pop1=pop1
-pop2=pop2
-*/
-public class TestWizardPage extends WizardPage
-{
-  private String pluginId_= "org.eclipse.jst.ws.axis.consumption.ui";
-  private MessageUtils msgUtils_;
-  
-  private Text wsdlURIText_;
-  private Text clientProjectText_;
-  private Text serviceQNameText_;
-  private Text outputWSDLPathText_;
-  private Button goButton_;
-  private Button pop1Button_;
-  private Button pop2Button_;
-  
-  public TestWizardPage(String name)
-  {
-    super(name);
-    setTitle("Test Page");
-    setDescription("Test page description");
-  }
-  
-  public void createControl(Composite parent)
-  {
-    Composite page = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    page.setLayout(gl);
-    GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
-    page.setLayoutData(gd);
-    page.setSize(500,500);
-
-   
-	//Composite outerGroup_ = new Composite(page,SWT.H_SCROLL | SWT.V_SCROLL);
-	Composite outerGroup_ = new Composite(page,SWT.NONE);
-	GridLayout gl2 = new GridLayout();
-	gl2.numColumns = 2;
-	gl2.marginHeight = 0;
-	gl2.marginWidth = 0;
-	outerGroup_.setLayout(gl2);
-	//GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-	GridData gd2 = new GridData(GridData.FILL_BOTH);
-	outerGroup_.setLayoutData(gd2);
-	
-	msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-    
-    wsdlURIText_ = uiUtils.createText(outerGroup_,"wsdlURI","wsdlURI","wsdlURI",SWT.SINGLE|SWT.BORDER);
-    clientProjectText_ = uiUtils.createText(outerGroup_,"clientProject","clientProject","clientProject",SWT.SINGLE|SWT.BORDER);
-    serviceQNameText_ = uiUtils.createText(outerGroup_,"serviceQName","serviceQName","",SWT.SINGLE|SWT.BORDER);
-    outputWSDLPathText_ = uiUtils.createText(outerGroup_,"outputWSDLpath","outputWSDLpath","",SWT.SINGLE|SWT.BORDER);
-    goButton_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"GO","GO","");
-    goButton_.addSelectionListener(new SelectionListener()
-        {
-          public void widgetSelected(SelectionEvent e)
-          {
-            handleGOPushed();
-          }
-          public void widgetDefaultSelected(SelectionEvent e)
-          {
-            handleGOPushed();
-        }
-        });
-    pop1Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop1","pop1","");
-    pop1Button_.addSelectionListener(new SelectionListener()
-        {
-          public void widgetSelected(SelectionEvent e)
-          {
-            handlePop1Pushed();
-          }
-          public void widgetDefaultSelected(SelectionEvent e)
-          {
-            handlePop1Pushed();
-        }
-        });    
-    pop2Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop2","pop2","");
-    pop2Button_.addSelectionListener(new SelectionListener()
-        {
-          public void widgetSelected(SelectionEvent e)
-          {
-            handlePop2Pushed();
-          }
-          public void widgetDefaultSelected(SelectionEvent e)
-          {
-            handlePop2Pushed();
-        }
-        });    
- 
-    setControl(page);
-  }
-  
-  private void handlePop1Pushed()
-  {
-    wsdlURIText_.setText("http://www.xmethods.net/sd/2001/TemperatureService.wsdl");
-    clientProjectText_.setText("cwp");
-    serviceQNameText_.setText("http://www.xmethods.net/sd/TemperatureService.wsdl:TemperatureService");
-    outputWSDLPathText_.setText("/cwp/Web Content/WEB-INF/wsdl/TemperatureService.wsdl");
-  }
-  
-  private void handlePop2Pushed()
-  {
-    wsdlURIText_.setText("file:/D:/Eclipse/eclipse/runtime-workspace_t1/wp2/Web Content/Converters.wsdl");
-    clientProjectText_.setText("cwp2");
-    serviceQNameText_.setText("http://sample.converters:ConvertDistanceService");
-    outputWSDLPathText_.setText("/cwp2/Web Content/WEB-INF/wsdl/Converters.wsdl");
-  }
-
-  private void handleGOPushed()
-  {
-    AxisClientGenerator generator = new AxisClientGenerator();
-    TestWSCDataHelper dataModel = new TestWSCDataHelper();
-    dataModel.populate(wsdlURIText_.getText(), serviceQNameText_.getText(), clientProjectText_.getText(), outputWSDLPathText_.getText(),false);
-    
-    generator.genWebServiceClientArtifacts(dataModel);
-    System.out.println("Generated service interface= "+dataModel.getServiceInterfaceName());
-    String[] seis = dataModel.getServiceEndpointInterfaceNames();
-    System.out.println("Generated service endpoint interfaces:");
-    for (int i=0;i<seis.length;i++)
-    {
-    	System.out.println(seis[i]);
-    }
-    System.out.println("Touched descriptors? "+dataModel.shouldGenDescriptors());
-  }
-  
-  private class TestWSCDataHelper implements WebServicesClientDataHelper
-  {
-  	private String wsdlUrl_;
-  	private String serviceQName_;
-  	private String projectName_;
-  	private String outputWSDLFileName_;
-  	private String serviceInterfaceName_;
-  	private String[] serviceEndpointInterfaceNames_;
-  	private boolean shouldDeploy_;
-  	private boolean shouldGenDescriptors_;
-  	
-  	public void populate(String wsdlURL, String serviceQName, String projectName, String outputWSDLFileName, boolean shouldDeploy)
-  	{
-  		wsdlUrl_ = wsdlURL;
-  		serviceQName_ = serviceQName;
-  		projectName_ = projectName;
-  		outputWSDLFileName_ = outputWSDLFileName;
-  		shouldDeploy_ = shouldDeploy;
-  	}
-	/**
-	 * @return the URL for the associated original WSDL file referenced by the client
-	 */
-	public String getWSDLUrl()
-	{
-		return wsdlUrl_;
-	}
-	
-	/**
-	 * @return the QName for the associated web service for the client
-	 */
-	public String getServiceQName()
-	{
-		return serviceQName_;
-	}
-	
-	/**
-	 * @return the name of the target project for the web service client
-	 */
-	public String getProjectName()
-	{
-		return projectName_;
-	}
-	
-	/**
-	 * @return the fileName location for the copied WSDL file into the client project
-	 */
-	public String getOutputWSDLFileName()
-	{
-		return outputWSDLFileName_;
-	}
-	
-	/**
-	 * @return the qualified classname of the generated Service Interface
-	 */
-	public String getServiceInterfaceName()
-	{
-		return serviceInterfaceName_;
-	}
-	
-	/**
-	 * @return the qualified classname of the generated Service Endpoint Interface
-	 */
-	public String[] getServiceEndpointInterfaceNames()
-	{
-		return serviceEndpointInterfaceNames_;
-	}
-	
-	/**
-	 * @return should generate code for deployment?
-	 */
-	public boolean shouldDeploy()
-	{
-		return shouldDeploy_;
-	}
-	
-	/**
-	 * @return whether the extension generated the descriptors or not
-	 */
-	public boolean shouldGenDescriptors()
-	{
-		return shouldGenDescriptors_;
-	}
-	
-	/**
-	 * Set the SI classname for the web service client
-	 */
-	public void setServiceInterfaceName(String name)
-	{
-		serviceInterfaceName_ = name;
-	}
-
-	/**
-	 * Set the SEI classnames for the web service client
-	 */
-	public void setServiceEndpointInterfaceNames(String[] names)
-	{
-		serviceEndpointInterfaceNames_ = names;
-	}
-
-	/**
-	 * Set whether descriptors were generated
-	 */
-	public void setDidGenDescriptors(boolean b)
-	{
-		shouldGenDescriptors_ = b;
-	}
-	
-	/**
-	 * This method will invoke any operations required to set up web services client, SI, and SEI
-	 */
-	public void genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
-	{
-		// Do nothing. This shouldn't be on the interface!
-	}
-	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
deleted file mode 100644
index 551c8d2b5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class WebServiceTestWizard extends Wizard implements INewWizard
-{
-
-  public WebServiceTestWizard()
-  {
-    super();
-
-    TestWizardPage page = new TestWizardPage("Test page");
-  }
-
-
-
-  /**
-  * Initializes this "New" wizard.
-  * @param workbench The workbench that launched this wizard.
-  * @param selection The selection context of this wizard.
-  * @return This wizard.
-  */
-  public void init ( IWorkbench workbench, IStructuredSelection selection )
-  {
-    //Do nothing
-  }
-
-
-  public void addPages()
-  {
-
-    TestWizardPage page = new TestWizardPage("Test page");
-    addPage(page);
-  }
-
-  public boolean performFinish()
-  {
-    //Always allow finish
-    return true;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index dbb43b648..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             proxyConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private AxisProxyWidget                     proxyWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisClientConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WebServiceClientAxisType() );
-	  
-	  proxyConfigWidget_ = adapter_.getWidget( "AxisClientStart" );
-	  proxyWidget_       = (AxisProxyWidget)proxyConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisClientBeanMapping" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return proxyConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == proxyConfigWidget_ && proxyWidget_.getCustomizeClientMappings() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index 33b674c73..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientInputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientOutputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment.MappingFragment;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{		
-
-	public AxisWebServiceClient(WebServiceClientInfo info)
-	{
-		super(info);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		registerDataMappings( env.getCommandManager().getMappingRegistry());
-		
-		Vector commands = new Vector();
-		commands.add(new AxisClientInputCommand(this, ctx, project, module));
-		commands.add(new AxisClientDefaultingCommand(module));
-//		commands.add(new SimpleFragment("AxisClientStart"));
-//		commands.add(new SimpleFragment("AxisClientBeanMapping"));
-		commands.add(new DefaultsForHTTPBasicAuthCommand());
-		commands.add(new CopyAxisJarCommand(module));
-		commands.add(new AddJarsToProjectBuildPathTask(module));
-		commands.add(new DefaultsForClientJavaWSDLCommand(module));
-		commands.add(new ValidateWSDLCommand());
-		commands.add(new WSDL2JavaCommand());
-		commands.add(new RefreshProjectCommand());
-		commands.add(new Stub2BeanCommand(module));
-		commands.add(new AxisClientOutputCommand(this,ctx,module));
-		commands.add(new BuildProjectCommand());
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-		
-	public void registerDataMappings(DataMappingRegistry registry) 
-	{
-		// AxisClientDefaultingCommand
-		registry.addMapping(AxisClientInputCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
-				new StringToIProjectTransformer());
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-//				null);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-//				"ClientProjectEAR", new StringToIProjectTransformer());
-		registry.addMapping(AxisClientInputCommand.class, "WsdlURL", AxisClientDefaultingCommand.class); // URI
-																																	// to
-		// URL
-		// transformer
-		// req'd??
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-//				"TestProxySelected", null);
-		registry.addMapping(AxisClientInputCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
-		registry.addMapping(AxisClientInputCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
-		// DefaultsForHTTPBasicAuthCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
-	    registry.addMapping(AxisClientDefaultingCommand.class, "CustomizeClientMappings", MappingFragment.class );    
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "ServiceProject",
-		// CreateWebProjectCommand.class);
-		//registry.addMapping(AxisClientDefaultingCommand.class,
-		// "EJBProjectName",
-		// CreateWebProjectCommand.class);
-		// CopyAxisJarCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-		// AddJarsToProjectBuildPathTask()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.class, "Project", null);
-		// DefaultsForClientJavaWSDLCommand() // javaParam_, model_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
-				null);
-		//		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
-		// DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
-		// //
-		// URL to URL??
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
-		// to
-		// URL??
-		// ValidateWSDLCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-		// WSDL2JavaCommand() // javaParam_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
-																													// to
-																													// URI??
-		// RefreshProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
-		// Stub2BeanCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
-		// BuildProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-		
-		registry.addMapping(Stub2BeanCommand.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index 275b34c69..000000000
--- a/bundles/org.eclipse.jst.ws.axis.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.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index 8bb59e1f7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 0a3d1e91a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.creation.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-		<project>org.eclipse.jst.ws.axis.consumption.core</project>
-		<project>org.eclipse.jst.ws.axis.consumption.ui</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.creation.ui</project>
-		<project>org.eclipse.jst.ws.discovery.core</project>
-		<project>org.eclipse.jst.ws.ui</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.parser</project>
-	</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 632f6d6b4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wss-axis-ui.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.creation.ui,
- org.eclipse.jst.ws.internal.axis.creation.ui.command,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin,
- org.eclipse.jst.ws.internal.axis.creation.ui.task,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.jem.workbench,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 2d7efc95c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.wss-axis-ui.jar = src/
-bin.includes = wss-axis-ui.jar,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               deploy.xsl
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164ac..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt"
-    xmlns:ns1="http://xml.apache.org/axis/wsdd/"
-    xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-    <xsl:output method="xml" encoding="UTF-8"/>
-  
-   <xsl:param name="newClassName" select="ss"/>
-   
-    <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
-    <xsl:copy>
-       <xsl:attribute name="name">className</xsl:attribute>
-       	 <xsl:attribute name="value"> 	
-  			<xsl:value-of select="$newClassName"/>  	 	
-       	 </xsl:attribute>
-       	<xsl:apply-templates/>
-       	</xsl:copy>
-    </xsl:template>
-    
-    <xsl:template match="@*|node()">
-    	<xsl:copy>
-    		<xsl:apply-templates select="@*|node()"/>
-    	</xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index 4d4dd705a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse.org
-
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index 8d41aad90..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <!-- Web Service Server Types -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
-      <webServiceRuntime
-            label="%LABEL_RUNTIME_AXIS_11"
-            description="%DESC_RUNTIME_AXIS_11"
-            isDefault="false"
-            j2eeversion="13 14"
-            id="org.eclipse.jst.ws.runtime.axis11">
-      </webServiceRuntime>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.32"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
-            id="SERVER_ID_TOMCAT32_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.40"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
-            id="SERVER_ID_TOMCAT40_LOCAL">
-      </webServiceServer>
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.41"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
-            id="SERVER_ID_TOMCAT41_LOCAL">
-      </webServiceServer> 
-
-      <webServiceServer
-            factoryId="org.eclipse.jst.server.tomcat.50"
-            isDefault="false"
-            runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
-            id="SERVER_ID_TOMCAT50_LOCAL">  
-      </webServiceServer>    
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_BEANAXIS"
-            type="org.eclipse.jst.ws.type.java"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
-            server="SERVER_ID_TOMCAT50_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT50LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_WSDLAXIS"
-            type="org.eclipse.jst.ws.type.wsdl"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
-            server="SERVER_ID_TOMCAT50_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT50LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_BEANAXIS"
-            type="org.eclipse.jst.ws.type.java"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
-            server="SERVER_ID_TOMCAT41_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT41LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_WSDLAXIS"
-            type="org.eclipse.jst.ws.type.wsdl"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
-            server="SERVER_ID_TOMCAT41_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT41LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_BEANAXIS"
-            type="org.eclipse.jst.ws.type.java"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
-            server="SERVER_ID_TOMCAT40_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT40LOCAL">
-      </webServiceServerRuntimeType>
-
-      <webServiceServerRuntimeType
-            requireEJBModule="false"
-            requireWebModule="true"
-            name="%WS_NAME_WSDLAXIS"
-            type="org.eclipse.jst.ws.type.wsdl"
-            runtime="org.eclipse.jst.ws.runtime.axis11"
-            assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
-            server="SERVER_ID_TOMCAT40_LOCAL"
-            id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT40LOCAL">
-      </webServiceServerRuntimeType>
-
-   </extension>
-
-   <!-- Server Defaulters -->
-   
-   <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
-      <serverDefaulter
-         class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
-      </serverDefaulter>
-   </extension>
-   
-   <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
-  	<webServiceRuntime
-    id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-    label="%LABEL_RUNTIME_AXIS_11"
-    serviceTypes="org.eclipse.jst.ws.serviceType.java"
-    clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
-    servletLevels="23 24"
-    j2eeLevels="13 14"
-    servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50 org.eclipse.jst.server.tomcat.55 org.eclipse.jst.server.geronimo.10"
-    class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-  	</webServiceRuntime>
-	</extension> 
-
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisBeanConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors"
-             class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisBeanConfigWidgetFactory"/>
-    </extension> 
-    
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisSkeletonConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors"
-             class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
-    </extension> 
-
-</plugin>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
deleted file mode 100644
index 07b7fc5a3..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_INTERAL=IWAB0512E Internal error
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_READ_WSDL=IWAB0516E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_PORT=IWAB0518E WSDL file at {0} has no port element
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-MSG_ERROR_LITERAL_SUPPORT_MESSAGE=IWAB0536E Axis 1.1 support for Document/Literal and Document/Literal (Wrapped) is minimal, thus the generated code may contain errors. RPC/Encoded is the recommended style and encoding selection.
-MSG_ERROR_INITIAL_SELECTION=IWAB0018E Error getting initial selection.
-
-
-#
-#JavaToWSDLMethodCommand
-#
-TASK_LABEL_JAVA_TO_WSDL=Create deployment descriptor document model from Java bean.
-TASK_DESC_JAVA_TO_WSDL=Creating deployment descriptor document model from Java bean.
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#DefaultsForServerJavaWSDLTask
-#
-TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS=DefaultsForJavaWSDLServer
-TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for server side.
-
-#
-#UpdateWEBXMLCommand
-#
-TASK_LABEL_UPDATE_WEB_XML=UpdateWEBXMLCommand
-TASK_DESC_UPDATE_WEB_XML=Update project's web.xml file with Axis servlets
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#DefaultsForWSDL2SkeletonTask
-#
-
-#
-#MoveDeploymentFilesTask
-#
-TASK_LABEL_MOVE_DEPLOYMENT_FILES=MoveDeploymentFilesTask
-TASK_DESC_MOVE_DEPLOYMENT_FILES=Move deploy.wsdd and undeploy.wsdd from Java Source to Web Content/WEB-INF
-
-#
-#MoveJavaFilesTask
-#
-TASK_LABEL_MOVE_JAVA_FILES=MoveJavaFilesTask
-TASK_DESC_MOVE_JAVA_FILES=Move server side java files
-
-#
-#Skeleton2WSDLTask
-#
-TASK_LABEL_SKELETON_WSDL=DefaultsForSkeleton2WSDLTask
-TASK_DESC_SKELETON_WSDL=Creates WSDL for a Java bean skeleton.
-
-#
-#UpdateAxisWSDDFileTask
-#
-TASK_LABEL_UPDATE_AXIS_WSDD=UpdateAxisWSDDFileTask
-TASK_DESC_UPDATE_AXIS_WSDD=Update Axis deploy.wsdd with actual service implementation class name
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigFragment
-#
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL Folder:
-LABEL_OUTPUT_FILE_NAME=WSDL File:
-
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-WS_DESC_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-
-#
-#WebServiceAxisBeanClassFragment
-#
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigFragment
-#
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and Use
-STYLE_RPC_LITERAL=Document/ Literal
-STYLE_DOC_LITERAL=Document/ Literal (Wrapped)
-STYLE_RPC_ENCODED=RPC/ Encoded
-
-#
-#WSDLConsumptionTaskFactory
-#
-
-#
-#CopyAxisServerConfigTask
-#
-
-TASK_LABEL_COPY_SERVER_CONFIG_FILES=Copy server-config.wsdd from the server location to the Web Project
-TASK_DESC_COPY_SERVER_CONFIG_FILES=Coping server-config.wsdd from the server location to the Web Project
-
-
-#
-#LiteralSupportMessageTask
-#
-TASK_LABEL_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-TASK_DESC_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-
-#
-#BUAxisInputCommand and BUAxisOutputCommand
-#
-
-TASK_LABEL_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_DESC_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_LABEL_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-TASK_DESC_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index a65876c70..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class AxisOutputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_BU_AXIS_OUTPUT";
-	private static String DESCRIPTION = "TASK_DESC_BU_AXIS_OUTPUT";
-	
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-
-	private String            wsdlURI_;
-	  
-	  private boolean isWebProjectStartupRequested_ = false;
-	  
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisOutputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public AxisOutputCommand(AxisWebService ws) {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			ws_ = ws;
-		}
-		
-		public Status execute(Environment env){
-		  	
-		  	Status status = new SimpleStatus("");  	
-		  	ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
-			AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
-			axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
-			ws_.setAxisWebServiceInfo(axisWSInfo);		    
-		  	
-		  	return status;      	
-		  }
-
-		  /**
-		   * @param wsdlURI
-		   *            The wsdlURI to set.
-		   */
-		  public void setWsdlURI(String wsdlURI)
-		  {
-		    wsdlURI_ = wsdlURI;
-		  }
-
-		public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
-			this.javaWSDLParam_ = javaWSDLParam_;
-		}
-		  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index de3a51569..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class AxisRunInputCommand extends SimpleCommand{
-	
-	private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-	
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private String serverProject_; 
-	private String serverModule_;
-	  
-	private MessageUtils msgUtils_;
-	
-	public AxisRunInputCommand() {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-	}
-	
-	public AxisRunInputCommand(AxisWebService ws, String project, String module) {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		ws_ = ws;
-		serverProject_ = project; 
-		serverModule_ = module;
-	}
-	
-	 public Status execute(Environment env)
-	  {
-	    
-	  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    
-		javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-		
-		return new SimpleStatus("");
-	  }
-	
-	 /**
-	   * @return Returns the serverProject.
-	   */
-	  public String getServerProject()
-	  {
-		  return serverProject_;
-	  }
-	  
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b78..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
-   */
-  public ServerInfo recommendDefaultServer(IProject project)
-  {    
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index 316fa71b5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-	
-	private IWebService ws_;
-	private String serverProject_; 
-	private String serverModule_;
-	private String javaBeanName_;
-
-	  private String serviceServerTypeID_;
-	  
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public BUAxisInputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public BUAxisInputCommand(IWebService ws, String project, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			ws_ = ws;
-			serverProject_ = project; 
-			serverModule_ = module;	}
-		
-	  public Status execute(Environment env)
-	  {
-	    
-	  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    
-		String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
-		String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
-		javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-		
-		IServer serviceExistingServer=null;
-		
-		if (serverInstanceId != null) { // server exists
-	    	serviceExistingServer = ServerCore.findServer(serverInstanceId);
-			if (serviceExistingServer != null)
-		    {
-		      serviceServerTypeID_ = serviceExistingServer.getServerType().getId();
-		    }
-	    }
-	    else
-	    {
-	    	serviceServerTypeID_ = serverFactoryId;
-	    }
-		
-		return new SimpleStatus("");
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServiceServerTypeID()
-		  {
-		    return serviceServerTypeID_;
-		  }
-
-		public String getServerModule() {
-			return serverModule_;
-		}
-
-		public String getJavaBeanName() {
-			return javaBeanName_;
-		}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
deleted file mode 100644
index 1007507ef..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends SimpleCommand
-{
-  private List classNames;
-  //private String wsdlURI;
-  //private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParameter;
-
-  public ComputeAxisSkeletonBeanCommand()
-  {
-  }
-
-  public Status execute(Environment environment)
-  {
-    classNames = new Vector();
-    if (javaWSDLParameter != null)
-    {
-      String beanName = javaWSDLParameter.getBeanName();
-      if (beanName != null)
-        classNames.add(beanName);
-    }
-    return new SimpleStatus("");
-  }
-
-  public List getClassNames()
-  {
-    return classNames;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    //this.webServicesParser = webServicesParser;
-  }
-
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    //this.wsdlURI = wsdlURI;
-  }
-  
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParameter)
-  {
-    this.javaWSDLParameter = javaWSDLParameter;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index 7aa3ad24e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class JavaToWSDLMethodCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_JAVA_TO_WSDL";
-	private static String DESCRIPTION = "TASK_DESC_JAVA_TO_WSDL";
-	private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-	private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
-	private Hashtable fMethodNames;
-	private String fClassName;
-	private String fBeanName;
-	private String fbeanBaseName;
-	private IProject fProject;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	private MessageUtils msgUtils_;
-
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand() {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-	}
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand(
-		JavaWSDLParameter javaParameter,
-		IProject serviceProject) {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		javaWSDLParam_ = javaParameter;
-		serviceProject_ = serviceProject;
-
-	}
-
-	/**
-	* JavaToToWSDLMethod execute
-	*/
-	public Status execute(Environment environment) {
-		fbeanBaseName = javaWSDLParam_.getBeanName();
-		environment.getLog().log(Log.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
-		Status status;
-		try {
-			//Get the qualified bean name; my.package.MyClass
-			fMethodNames = new Hashtable();
-			Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
-			String qName = fbeanBaseName;
-
-			if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
-				|| qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
-				qName = qName.substring(0, qName.lastIndexOf('.'));
-			}
-
-			JavaEMFNature jMOF =
-				(JavaEMFNature) JavaEMFNature.createRuntime(
-					serviceProject_);
-			JavaClass javaClass =
-				(JavaClass) JavaClassImpl.reflect(qName, jMOF.getResourceSet());
-			if (!javaClass.isExistingType()) {
-				environment.getLog().log(Log.ERROR, 5022, this, "execute", msgUtils_.getMessage(
-						"MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
-						new String[] { qName }));
-				
-				status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
-						msgUtils_.getMessage(
-					"MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
-					new String[] { qName }),
-					Status.ERROR);
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-
-			// Get the qualified name
-			fClassName = javaClass.getQualifiedName();
-			fBeanName = fClassName;
-			String beanName;
-			if (fClassName.lastIndexOf('.') != -1) {
-				beanName =
-					fClassName.substring(
-						fClassName.lastIndexOf('.') + 1,
-						fClassName.length());
-			} else
-				beanName = fClassName;
-
-			// Walk the java class and get the method names
-			gatherMethods(javaClass, beanName, oldMethodsNames);
-			/*
-			Iterator m = javaClass.getPublicMethodsExtended().iterator();
-			while (m.hasNext()) {
-				Method method = (Method) m.next();  
-				if ( ! method.isConstructor()){ 
-				if (!beanName.equals(method.getName())
-					&& !(isDuplicateMethodName(method
-						.getMethodElementSignature()))
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("javax.ejb.EJBObject"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("javax.ejb.EJBObject[]"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("java.lang.Object"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("java.lang.Object[]"))) {	//$NON-NLS-1$
-					// add the method name to our list of method names
-					String methodName =method.getMethodElementSignature();
-		          Boolean isSelected = new Boolean(true);
-        		  if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
-          			isSelected = (Boolean)oldMethodsNames.get(methodName);
-		          fMethodNames.put(methodName, isSelected);
-				} 
-				}
-			}
-			*/
-			javaWSDLParam_.setMethods(fMethodNames);
-			
-			return new SimpleStatus( "" );
-
-		} catch (Exception e) {
-			environment.getLog().log(Log.ERROR, 5023, this, "execute", msgUtils_.getMessage("MSG_ERROR_READ_BEAN"));
-		
-			status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
-					msgUtils_.getMessage(
-				"MSG_ERROR_JAVA_TO_METHOD"),
-				Status.ERROR, e);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-	}
-
-  private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
-  {
-    String javaName = javaClass.getJavaName();
-    if (!javaClass.isInterface()
-        && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
-        && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
-        && !javaName.equalsIgnoreCase("java.lang.Object[]")
-        && !javaName.equalsIgnoreCase("java.lang.Object"))
-    {
-      List publicMethods = javaClass.getPublicMethods();
-      for (Iterator it = publicMethods.iterator(); it.hasNext();)
-      {
-        Method method = (Method)it.next();
-        if (!method.isConstructor()
-            && !beanName.equals(method.getName())
-            && !(isDuplicateMethodName(method.getMethodElementSignature())))
-        {
-          // add the method name to our list of method names
-          String methodName = method.getMethodElementSignature();
-          Boolean isSelected = new Boolean(true);
-          if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
-            isSelected = (Boolean)oldMethodsNames.get(methodName);
-          fMethodNames.put(methodName, isSelected);
-        }
-      }
-      gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
-    }
-  }
-	  
-	//Returns true if the provided method name already exists in the 
-	//fMethodNames vector. This method is used to detect overloaded 
-	//methods in Beans and EJBs, which are currently unsupported.
-	private boolean isDuplicateMethodName(String methodName) {
-		return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
-	}
-	
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index 64b89753f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends SimpleCommand {
-
-	private static String LABEL = "TASK_LABEL_TD_AXIS_INPUT";
-	private static String DESCRIPTION = "TASK_DESC_TD_AXIS_INPUT";
-	
-	private IWebService ws_;
-	private String serverProject_; 
-	private String serverModule_;
-
-	  private String serverServer_;
-	  private String wsdlURI_;
-	  
-	  private MessageUtils msgUtils_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public TDAxisInputCommand() {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-		}
-		
-		public TDAxisInputCommand(IWebService ws, String project, String module) {
-			String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-		    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		    setName (msgUtils_.getMessage(LABEL));
-			setDescription( msgUtils_.getMessage(DESCRIPTION));
-			ws_ = ws;
-			serverProject_ = project;
-			serverModule_ = module;
-		}
-		
-	  public Status execute(Environment env)
-	  {
-	    
-	  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    
-		serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();	
-		wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-		
-		return new SimpleStatus("");
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServerServer()
-		  {
-		    return serverServer_;
-		  }
-
-		public String getWsdlURI() {
-			return wsdlURI_;
-		}
-
-		public String getServerModule() {
-			return serverModule_;
-		}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index 8ecc02fad..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class UpdateWEBXMLCommand extends SimpleCommand {
-
-	private String LABEL = "TASK_LABEL_UPDATE_WEB_XML";
-	private String DESCRIPTION = "TASK_DESC_UPDATE_WEB_XML";
-
-	private MessageUtils msgUtils_;
-	private IProject serverProject;
-	private String   moduleName_;
-
-  public UpdateWEBXMLCommand( String moduleName )
-  {
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    setName (msgUtils_.getMessage(LABEL));
-    setDescription( msgUtils_.getMessage(DESCRIPTION));
-	
-	moduleName_ = moduleName;
-  }
-
-	public Status execute(Environment environment) {
-		if (serverProject != null) {
-			Status status = null;
-			status = addServlet(serverProject, moduleName_, getAxisServletDescriptor());
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-			addServlet(serverProject, moduleName_, getAdmintServletDescriptor());
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		}
-		return new SimpleStatus( "" );
-	}
-
-	private ServletDescriptor getAxisServletDescriptor() {
-
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "AxisServlet"; //$NON-NLS-1$
-		sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
-										"*.jws", //$NON-NLS-1$
-										"/services/*" }; //$NON-NLS-1$
-		return sd;
-	}
-
-	private ServletDescriptor getAdmintServletDescriptor() {
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "AdminServlet"; //$NON-NLS-1$
-		sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
-		sd._loadOnStartup = new Integer(100);
-		return sd;
-	}
-
-	private ServletDescriptor getSoapMonitorServletDescriptor() {
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "SOAPMonitorService"; //$NON-NLS-1$
-		sd._displayName = "SOAPMonitorService"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.monitor.SOAPMonitorService"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/SOAPMonitor" }; //$NON-NLS-1$
-		sd._loadOnStartup = new Integer(100);
-		Map params = new HashMap();
-		params.put("SOAPMonitorPort", //$NON-NLS-1$
-					 "5001");   //$NON-NLS-1$
-		sd._params = params;
-		return sd;
-	}
-
-	public Status addServlet(
-		IProject webProject,
-		String   moduleName,
-		ServletDescriptor servletDescriptor) {
-
-		Object accessorKey = new Object();
-		WebArtifactEdit webEdit = null;		
-		try {
-			// 
-			WebApp webapp = null;
-      IVirtualComponent vc = ComponentCore.createComponent(webProject, moduleName);
-      webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
-			if (webEdit != null)
-			{
-				webapp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-
-			   boolean foundServlet = false;
-
-			   List theServlets = webapp.getServlets();
-			   for (int i = 0; i < theServlets.size(); i++) {
-				Servlet aServlet = (Servlet) theServlets.get(i);
-				if (aServlet.getServletName().equals(servletDescriptor._name)) {
-					foundServlet = true;
-				 }
-			   }
-
-			   if (foundServlet) {
-				  return new SimpleStatus( "" );
-			   }
-
-			   WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
-			   Servlet servlet = factory.createServlet();
-			   ServletType servletType = factory.createServletType();
-			   servlet.setWebType(servletType);
-			   servlet.setServletName(servletDescriptor._name);
-			   servletType.setClassName(servletDescriptor._className);
-			   if(servletDescriptor._displayName != null){
-			     servlet.setDisplayName(servletDescriptor._displayName);
-			   }
-			   if(servletDescriptor._loadOnStartup != null){
-				  servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
-			   }
-			   if(servletDescriptor._params != null){
-				  Properties properties = servlet.getParamsAsProperties();
-				  properties.putAll(servletDescriptor._params);
-			   }
-			   webapp.getServlets().add(servlet);
-			
-			   if(servletDescriptor._mappings != null){
-				  for(int i=0; i<servletDescriptor._mappings.length; i++){
-					ServletMapping servletMapping = factory.createServletMapping();
-					servletMapping.setServlet(servlet);
-					servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
-					webapp.getServletMappings().add(servletMapping);					
-				  }
-			   }
-			   
-			   webEdit.save(new NullProgressMonitor());
-			}
-
-			return new SimpleStatus( "" );
-		} catch (Exception e) {
-
-			return new SimpleStatus(
-					"UpdateWEBXMLCommand.addServlet", //$NON-NLS-1$
-					msgUtils_.getMessage("MSG_ERROR_UPDATE_WEB_XML"),
-					Status.ERROR, e);
-		}
-		finally{
-			if (webEdit != null)
-				webEdit.dispose();	
-		}
-	}
-  
-  public void setServerProject(IProject serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-	public class ServletDescriptor {
-		String _name;
-		String _className;
-		String _displayName;
-		Map _params;
-		String[] _mappings;
-		Integer _loadOnStartup;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index 360836749..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-	
-	// Copyright
-	public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.axis.creation.ui";	//$NON-NLS-1$
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceAxisCreationUIPlugin instance_;
-  private Log log_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  * The "plugin" element in plugin.xml should include the attribute
-  * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
-  * @param descriptor The descriptor of this plugin.
-  */
-  public WebServiceAxisCreationUIPlugin ( IPluginDescriptor descriptor )
-  {
-    super(descriptor);
-    if (instance_ == null)
-    {
-      instance_ = this;
-    }
-    log_ = new EclipseLog();
-
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
-  * @return The WebServiceConsumptionUIPlugin singleton.
-  */
-  static public WebServiceAxisCreationUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Called once by the platform when this plugin is first loaded.
-  * @throws CoreException If this plugin fails to start.
-  */
-  public void startup () throws CoreException
-  {
-  	log_.log(Log.INFO, 5068, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
-    super.startup();
-    setPreferences();
-  }
-
-  /**
-  * Called once by the platform when this plugin is unloaded.
-  * @throws CoreException If this plugin fails to shutdown.
-  */
-  public void shutdown () throws CoreException
-  {
-  	log_.log(Log.INFO, 5069, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
-    super.shutdown();
-  }
-
-
-  /**
-   * Sets the general preferences to the values in the preferences store.
-  **/
-  public void setPreferences()
-  {
-   // setDialogsPreferences();
-  }
-
- /**
-   * @see AbstractUIPlugin#initializeDefaultPreferences
-   */
-  protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
-	// Set the defaults Preference
-//	ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
-  }
- 
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @return The locale-specific message.
-  */
-  public static String getMessage ( String key )
-  {
-    return instance_.getDescriptor().getResourceString(key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See java.text.MessageFormat for
-  * further details on substitution.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @param args The substitution values for the message
-  * as required by the message in plugin.properties and
-  * by the rules of class java.text.MessageFormat.
-  * @return The locale-specific message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getDescriptor().getInstallURL();
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index 8676c3f4a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-  public BUCheckAxisDeploymentDescriptors(String moduleName) 
-  {
-	super(moduleName);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index c3ee802c9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends SimpleCommand {
-
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private MessageUtils conMsgUtils_;
-	
-	// rm private Model model_;
-	private JavaWSDLParameter javaWSDLParam_ = null;
-	private IProject serviceProject_;
-	private String javaBeanName_; // this needs to be set by the extension with initial selection
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	private WebServicesParser WSParser_;
-	// rm private WebServiceElement wse_; // temporary
-	private String moduleName_;
-	
-	private String LABEL = "TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS";
-	private String DESCRIPTION = "TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS";
-	private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-	public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
-	private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
-	public final byte MODE_BEAN = (byte) 0;
-	public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
-
-	public DefaultsForServerJavaWSDLCommand( String moduleName ) 
-	{
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    conMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-		moduleName_  = moduleName;
-
-		setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-	}
-	
-
-	public DefaultsForServerJavaWSDLCommand(
-		JavaWSDLParameter javaWSDLParam,
-		Model model) {
-
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-
-		setName (msgUtils_.getMessage(LABEL));
-		setDescription( msgUtils_.getMessage(DESCRIPTION));
-		//rm setModel(model);
-		setJavaWSDLParam(javaWSDLParam);
-	
-	}
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public Status execute( Environment env ) {
-
-		Status status;
-		if (javaWSDLParam_ == null) {
-			status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR );
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		if (javaBeanName_ == null) {  // either set by extension point or bean class page
-			javaBeanName_ = javaWSDLParam_.getBeanName();
-			if (javaBeanName_ == null) {
-				//rm javaBeanName_ = isdElement.getJavaBeanName();
-				javaWSDLParam_.setBeanName(javaBeanName_);
-			}
-		}
-		// rm WSParser_ =	(WebServicesParser) wse_.getWSParser();
-		
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-		javaWSDLParam_.setSkeletonDeploy(false);
-
-		javaWSDLParam_.setBeanName(javaBeanName_);
-		String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_, moduleName_);
-		javaWSDLParam_.setClasspath(classpath);
-
-		String simpleBeanName = javaBeanName_;
-		String beanPackageName = null;
-		if (javaBeanName_ != null) {
-			int index = javaBeanName_.lastIndexOf('.');
-			if (index != -1) {
-				simpleBeanName = javaBeanName_.substring(index + 1);
-				beanPackageName = javaBeanName_.substring(0, index);
-			}
-		}
-		String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
-		javaWSDLParam_.setNamespace(namespace);
-
-		javaWSDLParam_.setPortTypeName(simpleBeanName);
-		javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
-		IPath moduleServerRoot = null;
-
-		IPath modulePath = serviceProject_.getFullPath();
-		IPath webinfPath = serviceProject_.getFullPath();
-		try {
-			//if ( ResourceUtils.isWebProject(serviceProject_)) {
-      if (J2EEUtils.isWebComponent(serviceProject_, moduleName_)){
-				moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_, moduleName_);
-
-				// should use ModuleCore.getSourceContainers();
-//				IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-//				if (container!=null) {
-//					moduleServerRoot = container.getFullPath();
-//				}
-				
-				modulePath = J2EEUtils.getWebContentPath(serviceProject_, moduleName_);
-				webinfPath = J2EEUtils.getWebInfPath( serviceProject_, moduleName_ );
-				
-			}
-
-		} catch (Exception e) {
-			status =  new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_DEFAULT_BEAN"), Status.ERROR, e );
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		IPath wsdlPath =
-			modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
-		try{
-			IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
-			FileUtil.createFolder(folder, true, true);
-		
-		}
-		catch(CoreException e){
-			status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_WRITE_WSDL"), Status.ERROR, e );
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
-		javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
-		javaWSDLParam_.setInputWsdlLocation(wsdlLocation);
-		WSDLServicePathname_ = wsdlPath.toString();
-
-		if (wsdlPath != null) {
-			String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-			WSDLServiceURL_ = wsdlURL;
-			// set parser 
-			if (wsdlURL == null || wsdlURL.length() <= 0) {
-				IResource res =
-					ResourceUtils.findResource(WSDLServicePathname_);
-				if (res != null)
-					wsdlURL = (new Utils()).toFileSystemURI(res);
-			}
-			Definition definition = null;
-			if (wsdlURL != null && wsdlURL.length() > 0) {
-				if (WSParser_ == null) {
-					WSParser_ = new WebServicesParserExt();
-				}
-				definition = WSParser_.getWSDLDefinition(wsdlURL);
-			}
-		}
-
-		javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_RPC);
-		javaWSDLParam_.setUse(JavaWSDLParameter.USE_ENCODED);
-
-		String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, moduleName_);
-		if (projectURL == null) {
-			status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", msgUtils_.getMessage("MSG_ERROR_PROJECT_URL"), Status.ERROR);
-			env.getStatusHandler().reportError(status);
-			return status;
-		}
-//		else {
-//			javaWSDLParam_.setUrlLocation("http://localhost:8080/"+moduleName_);
-//		}
-		
-		String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
-		javaWSDLParam_.setUrlLocation(serviceURL);
-		
-		javaWSDLParam_.setMetaInfOnly(true);
-		//		String javaOutput = PlatformUtils.getPlatformURL(moduleServerRoot);
-		//		String output = PlatformUtils.getPlatformURL(modulePath);
-
-		String javaOutput =	ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-//		String javaOutput = ResourceUtils.getWorkspaceRoot().getFolder(moduleServerRoot).getLocation().toString();
-	
-		String serviceName = javaWSDLParam_.getServiceName();
-		IPath outputPath =	ResourceUtils.findResource(webinfPath).getLocation();
-		String output = serviceProject_.getFullPath().toString();
-		if (outputPath!=null)
-		 output = outputPath.append(serviceName).toString();
-
-		javaWSDLParam_.setJavaOutput(javaOutput);
-		javaWSDLParam_.setOutput(output);
-		
-		return new SimpleStatus( "" );
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	// rm
-	/*
-	public void setModel(Model model) {
-		this.model_ = model;
-	}
-	*/
-	
-	public void setServiceProject(IProject serviceProject) {
-		this.serviceProject_ = serviceProject;
-	}
-	
-	public void setJavaBeanName(String javaBeanName) {
-		this.javaBeanName_ = javaBeanName;
-	}
-	
-	public String getWSDLServiceURL() {
-		return WSDLServiceURL_;
-	}
-	
-	public String getWSDLServicePathname() {
-		return WSDLServicePathname_;
-	}
-	
-	public void setParser(WebServicesParser wsParser) {
-		this.WSParser_ = wsParser;
-	}
-	
-	public WebServicesParser getParser() {
-		return WSParser_;
-	}
-
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    if (objectSelection != null && !objectSelection.isEmpty())
-    {
-      Object object = objectSelection.getFirstElement();
-      if (object instanceof String)
-        setJavaBeanName((String)object);
-    }
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
deleted file mode 100644
index 6e44bb2eb..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-
-
-
-public class LiteralSupportMessageTask extends SimpleCommand {
-
-	private final String LABEL = "TASK_LABEL_LITERAL_SUPPORT_MESSAGE";
-	private final String DESCRIPTION =
-		"TASK_DESC_LITERAL_SUPPORT_MESSAGE";
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-
-	private JavaWSDLParameter javaWSDLParam_;
-
-	public LiteralSupportMessageTask() {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId+".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	
-	}
-	
-	public LiteralSupportMessageTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId+".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	
-		javaWSDLParam_ = javaWSDLParam;
-
-	}
-
-
-	/**
-	* Execute LiteralSupportMessageTask
-	*/
-	public Status execute(Environment env) {
-        Status status = new SimpleStatus("");
-		if (javaWSDLParam_ == null) {
-		    status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;
-		}
-
-		String use = javaWSDLParam_.getUse();
-		if(use != null && 
-			use.equals(JavaWSDLParameter.USE_LITERAL)){
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_LITERAL_SUPPORT_MESSAGE"), Status.WARNING);
-		    try
-			{
-		    	env.getStatusHandler().report(status);
-		    }
-		    catch(StatusException se)
-			{
-		    	status = new SimpleStatus("","User aborted",Status.ERROR);
-		    }
-		}
-		
-		return status;
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
deleted file mode 100644
index 2fe3eaaf0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class MoveDeploymentFilesTask extends SimpleCommand {
-
-	private final String LABEL = "TASK_LABEL_MOVE_DEPLOYMENT_FILES";
-	private final String DESCRIPTION = "TASK_DESC_MOVE_DEPLOYMENT_FILES";
-	private final String WEB_INF = "WEB-INF";	//$NON-NLS-1$
-	private final String META_INF = "META-INF";	//$NON-NLS-1$
-
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serverProject;
-	private String   moduleName_;
-	
-    private JavaWSDLParameter javaWSDLParam_;
-	
-	public MoveDeploymentFilesTask( String moduleName )
-    {
-      String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-      msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-      coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-      setDescription(msgUtils_.getMessage(DESCRIPTION));
-      setName(msgUtils_.getMessage(LABEL));
-	  
-	  moduleName_ = moduleName;
-    }
-
-  /**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public Status execute(Environment env) {
-		Status status = new SimpleStatus("");
-		if (javaWSDLParam_ == null) {
-		  status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		  env.getStatusHandler().reportError(status);
-		  return status;
-		}
-
-		IProject project = serverProject;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-		
-		if (projectURL == null) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-
-		try {
-//			if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-//				return status;
-//		} catch (Exception ex) {
-//		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-//		  env.getStatusHandler().reportError(status);
-//		  return status;		  
-//		}
-		String[] deployFiles = javaWSDLParam_.getDeploymentFiles();
-		String javaOutput = javaWSDLParam_.getJavaOutput();
-
-		if (deployFiles == null || javaOutput == null) {
-			return status;
-		}
-
-
-		IPath webinfPath = J2EEUtils.getWebInfPath(project, moduleName_ );
-
-			for (int i = 0; i < deployFiles.length; i++) {
-        File f = new File(deployFiles[i]);
-        String resourceToMove = f.getName();
-				String targetFileName = ResourceUtils.getWorkspaceRoot().getFile(webinfPath.addTrailingSeparator().append(resourceToMove)).getLocation().toString();
-				FileUtil.createTargetFile(deployFiles[i], targetFileName, true);
-				File deploymentFile = new File(deployFiles[i]);
-				deploymentFile.delete();
-				deployFiles[i] = targetFileName;
-			}
-
-		} catch (Exception e) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[] { e.getLocalizedMessage()}), Status.ERROR, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		
-		return status;
-	}
-
-	public JavaWSDLParameter getJavaWSDLParam()
-	{
-		return javaWSDLParam_;
-	}
-	
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServerProject(IProject serverProject)
-	{
-	  this.serverProject = serverProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
deleted file mode 100644
index d513f136f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class MoveJavaFilesTask extends SimpleCommand {
-
-	private final String LABEL = "TASK_LABEL_MOVE_JAVA_FILES";
-	private final String DESCRIPTION = "TASK_DESC_MOVE_JAVA_FILES";
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serviceProject_;
-	
-	private String moduleName_;
-	// rm private Model model_;
-
-	public MoveJavaFilesTask(String moduleName) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));
-		
-		this.moduleName_ = moduleName;
-	}
-	
-	public MoveJavaFilesTask() {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));
-	}	
-
-	public MoveJavaFilesTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	  
-		javaWSDLParam_ = javaWSDLParam;
-
-	}
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public Status execute(Environment env) {
-	  
-	  // rm 
-	  /*
-	  //Begin Setters
-	  WebServiceElement wse =
-			WebServiceElement.getWebServiceElement(model_);
-	  setServiceProject(wse.getServiceProject());
-	  //End Setters
-	  */
-	  Status status = new SimpleStatus("");
-	  
-		if (javaWSDLParam_ == null) {
-		  status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		  return status;		  
-		}
-		*/
-
-		IProject project = serviceProject_;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-		if (projectURL == null) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-
-		String[] javaFiles = javaWSDLParam_.getJavaFiles();
-		String javaoutput = javaWSDLParam_.getJavaOutput();  // <webproject>/JavaSource
-		String output = javaWSDLParam_.getOutput();  		 // <webproject>/WebContent/META_INF
-
-		if(javaFiles == null || javaoutput == null && output == null ){
-			return status;
-		}
-		try {
-			for (int i = 0; i < javaFiles.length; i++) {
-				String resourceToMove = javaFiles[i].substring(output.length());
-				String targetFileName = javaoutput + resourceToMove;
-				File resultFile = new File(targetFileName);
-				// copy java files that without overwtriting existing ones
-//				if (!resultFile.exists()) {
-//					FileUtil.createTargetFile(
-//						javaFiles[i],
-//						javaoutput + resourceToMove);
-//				}
-				// delete java files from the output directory
-				File source = new File(javaFiles[i]);
-				source.delete();
-			}
-		} catch (Exception e) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[]{e.getLocalizedMessage()}), Status.ERROR, e);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		
-		return status;
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	// rm
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index 83a4a3216..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class Skeleton2WSDLCommand extends SimpleCommand
-{
-  private static final String LABEL = "TASK_LABEL_SKELETON_WSDL";
-  private static final String DESCRIPTION = "TASK_DESC_SKELETON_WSDL";
-  private static final String IMPL = "Impl";	//$NON-NLS-1$
-  private static final String SERVICE_EXT = "/services/";	//$NON-NLS-1$
-  private static final String WSDL_EXT = "wsdl";	//$NON-NLS-1$
-  private static final String DOT = ".";	//$NON-NLS-1$
-  private static final String SLASH = "/";	//$NON-NLS-1$
-  private static final String PROTOCOL_SUFFIX = "://";	//$NON-NLS-1$
-  private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam;
-  private IProject serverProject;
-  private HashMap visitedLinks;
-  private MessageUtils msgUtils_;
-  private String       moduleName_;
-
-  public Skeleton2WSDLCommand( String moduleName ) {
-    super(WebServiceAxisCreationUIPlugin.getMessage(LABEL), WebServiceAxisCreationUIPlugin.getMessage(DESCRIPTION));
-	msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
-    setName( LABEL );
-    setDescription( DESCRIPTION );
-	
-	moduleName_ = moduleName;
-  }
-
-  /**
-  * Execute Skeleton2WSDLCommand
-  */
-  public Status execute(Environment env)
-  {
-    if (!(env instanceof EclipseEnvironment))
-    {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_NOT_IN_ECLIPSE_ENVIRONMENT", new String[] {"Skeleton2WSDLCommand"}), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    if (javaWSDLParam == null)
-    {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-  // Read WSDL
-  Definition definition = null;
-	String wsdlURL = javaWSDLParam.getInputWsdlLocation();
-	try
-	{
-		URL url = new URL(wsdlURL);
-		definition = webServicesParser.getWSDLDefinition(url.toString());
-	}
-	catch(MalformedURLException e)
-	{
-		wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
-		definition = webServicesParser.getWSDLDefinition(wsdlURL);
-	}
-
-    // Compute the qualified name of the Java bean skeleton
-    Service service = null;
-    Port port = null;
-    if (definition != null) {
-      StringBuffer beanName = new StringBuffer();
-      beanName.append(WSDLUtils.getPackageName(definition));
-      beanName.append(DOT);
-      try{
-      service = (Service) definition.getServices().values().iterator().next();
-      port = (Port) service.getPorts().values().iterator().next();
-      Binding binding = port.getBinding();
-      beanName.append(binding.getQName().getLocalPart());
-      beanName.append(IMPL);
-      javaWSDLParam.setBeanName(beanName.toString());
-
-      javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
-      javaWSDLParam.setServiceName(
-        WSDLUtils.getServiceElementName(definition));
-      javaWSDLParam.setBeanPackage(WSDLUtils.getPackageName(definition));
-      }
-      catch(Throwable e){
-      	e.printStackTrace();
-      }
-    } 
-    else {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION", new String[] {wsdlURL}), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    // Modify WSDL endpoint
-    if (port == null) {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_PORT", new String[] {wsdlURL}), Status.ERROR, null);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    Map services = definition.getServices();
-    for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
-    {
-      Service s = (Service)servicesIt.next();
-      Map ports = s.getPorts();
-      for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
-      {
-        Port p = (Port)portsIt.next();
-        modifyEndpoint(p);
-      }
-    }
-
-    visitedLinks = new HashMap();
-
-    // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
-    IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
-    String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
-    IPath wsdlPath = null;
-    IFile outputFile = null;
-    try {
-     if(wsdlLocation != null){
-		outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
-     }
-     else{
-//		wsdlPath = serverProject.getFullPath();
-//		
-//		if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-//			   J2EEWebNatureRuntime webProject =
-//				 (J2EEWebNatureRuntime) serverProject.getNature(
-//				   IWebNatureConstants.J2EE_NATURE_ID);
-//			   wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-//			   //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-//			 }
-//		else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-//		{
-//			EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-//			wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-//		}		
-// TODO:  handle EJB case
-		     wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-			 IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
-		     IFolder folder = ResourceUtils
-								.getWorkspaceRoot()
-								.getFolder(wsdlPath.append(WSDL_FOLDER));
-			 FileUtil.createFolder(folder, true, true);	
-		     outputFile = workspace.getFile(wsdlFilePath);
-			 wsdlLocation = outputFile.getLocation().toString();
-			 javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-			 
-     }
-
-     // copy WSDL
-     CopyWSDLCommand copyWSDLCommand = new CopyWSDLCommand();
-     copyWSDLCommand.setWebServicesParser(webServicesParser);
-     copyWSDLCommand.setWsdlURI(wsdlURL);
-     copyWSDLCommand.setDestinationURI(outputFile.getLocation().toFile().toURL().toString());
-     copyWSDLCommand.setDefinition(definition);
-     Status status = copyWSDLCommand.execute(env);
-     if(status!=null && status.getSeverity()==Status.ERROR) {
-       return status;
-     }
-    } 
-    catch (Exception e) {
-      Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL", new String[] { wsdlLocation }), Status.ERROR, e);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    return new SimpleStatus("");
-  }
-
-  private Status modifyEndpoint(Port port)
-  {
-    Iterator it = port.getExtensibilityElements().iterator();
-    SOAPAddress soapAddress = null;
-    while (it.hasNext())
-    {
-      Object obj = it.next();
-      if (obj instanceof SOAPAddress)
-      {
-        soapAddress = (SOAPAddress)obj;
-        break;
-      }
-    }
-    if (soapAddress != null)
-    {
-//      String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
-	  String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, moduleName_);
-      if (projectURL == null)
-        return new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}), Status.ERROR, null);
-      StringBuffer serviceURL = new StringBuffer(projectURL);
-      serviceURL.append(SERVICE_EXT).append(port.getName());
-      javaWSDLParam.setUrlLocation(serviceURL.toString());
-      soapAddress.setLocationURI(serviceURL.toString());
-    }
-    return new SimpleStatus("");
-  }
-  
-  /**
-  * Returns the javaWSDLParam.
-  * @return JavaWSDLParameter
-  */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    return javaWSDLParam;
-  }
-
-  /**
-  * Sets the javaWSDLParam.
-  * @param javaWSDLParam The javaWSDLParam to set
-  */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @param serverProject The serverProject to set.
-   */
-  public void setServerProject(IProject serverProject) {
-    this.serverProject = serverProject;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public String getWsdlURI()
-  {
-  	File file = new File(getJavaWSDLParam().getOutputWsdlLocation()); 
-    String url = "";
-	  try {
-    	url = file.toURL().toString();
-    }
-	  catch(MalformedURLException mue){}
-	return url;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index d83dc372f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-  public TDCheckAxisDeploymentDescriptors(String moduleName) 
-  {
-	super(moduleName);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index 9de2a11e1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class UpdateAxisWSDDFileTask extends SimpleCommand {
-	
-	
-	private final String LABEL = "TASK_LABEL_UPDATE_AXIS_WSDD";	
-	private final String DESCRIPTION = "TASK_DESC_UPDATE_AXIS_WSDD";
-	private final String DEPLOY_XSL = "deploy.xsl";	//$NON-NLS-1$
-	private final String DEPLOY_BAK = "deploy.wsdd.bak";		//$NON-NLS-1$
-	private final String CLASSNAME_PARAM = "newClassName";		//$NON-NLS-1$
-    private MessageUtils msgUtils_;
-    private MessageUtils coreMsgUtils_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	// rm private Model model_;
-	
-	private String moduleName_;
-
-	public UpdateAxisWSDDFileTask( String moduleName) 
-	{
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	 
-		
-		moduleName_ = moduleName;
-	}
-	
-	public UpdateAxisWSDDFileTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    setDescription(msgUtils_.getMessage(DESCRIPTION));
-	    setName(msgUtils_.getMessage(LABEL));	    
-		javaWSDLParam_ = javaWSDLParam;
-	}
-
-	/**
-	* Execute UpdateAxisWSDDFileTask
-	*/
-	public Status execute(Environment env) {
-	  
-	  // rm
-	  /*
-	  //Begin Setters
-	  WebServiceElement wse =
-		WebServiceElement.getWebServiceElement(model_);
-	  setServiceProject(wse.getServiceProject());
-	  //End Setters
-	  */
-	    Status status = new SimpleStatus("");		
-		if (javaWSDLParam_ == null) {
-		  status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
-		  env.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		  return status;		  
-		}
-		*/
-	
-		IProject project = serviceProject_;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-		if (projectURL == null) {
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-		String outputLocation = javaWSDLParam_.getJavaOutput();
-		if (outputLocation == null) {
-			return status;
-		}
-//		try {
-//			if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-//				return status;
-//		} catch (Exception ex) {
-//		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-//		    env.getStatusHandler().reportError(status);
-//		    return status;		  
-//		}
-		String[] javaFiles = javaWSDLParam_.getJavaFiles();
-		String javaoutput = javaWSDLParam_.getJavaOutput();
-		String output = javaWSDLParam_.getOutput();
-
-//		String webContentPath =	ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
-		String webContentPath =	J2EEUtils.getWebContentContainer( project, moduleName_ ).getLocation().toString();
-		try {
-
-			if (javaWSDLParam_.getDeploymentFiles() != null
-				&& javaWSDLParam_.getDeploymentFiles().length > 0) {
-
-				String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
-				Path deployPath = new Path(wsdd_deploy);
-				String deployBackup =
-					deployPath
-						.removeLastSegments(1)
-						.append(DEPLOY_BAK)
-						.toString();
-				FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
-				String deployXSL = getPluginFilePath(DEPLOY_XSL).toString();
-
-				TransformerFactory tFactory = TransformerFactory.newInstance();
-
-				// Use the TransformerFactory to instantiate a Transformer that will work with  
-				// the stylesheet you specify. This method call also processes the stylesheet
-				// into a compiled Templates object.
-				Transformer transformer =
-					tFactory.newTransformer(new StreamSource(deployXSL));
-				transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
-				// Use the Transformer to apply the associated Templates object to an XML document
-				// (foo.xml) and write the output to a file (foo.out).
-				transformer.transform(
-					new StreamSource(deployBackup),
-					new StreamResult(new FileOutputStream(wsdd_deploy)));
-
-			}
-
-		} catch (Exception e) {
-		    String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()}; 
-		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_UPDATE_AXIS_WSDD", errorMsgStrings), Status.ERROR, e);
-		    env.getStatusHandler().reportError(status);
-		    return status;		  		  
-		}
-		
-		return status;
-	}
-
-	private IPath getPluginFilePath(String pluginfileName)
-		throws CoreException {
-		try {
-			IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
-			IPluginDescriptor pluginDescriptor =
-				pluginRegistry.getPluginDescriptor(WebServiceAxisCreationUIPlugin.ID);
-
-			URL localURL =
-				Platform.asLocalURL(
-					new URL(pluginDescriptor.getInstallURL(), pluginfileName));
-			return new Path(localURL.getFile());
-		} catch (MalformedURLException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					msgUtils_.getMessage(
-						"MSG_PLUGIN_FILE_URL"),
-					e));
-		} catch (IOException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					msgUtils_.getMessage(
-						"MSG_PLUGIN_FILE_URL"),
-					e));
-		}
-	}
-
-
-	/**
-	* Sets the javaWSDLParam.
-	* @param javaWSDLParam The javaWSDLParam to set
-	*/
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public JavaWSDLParameter getJavaWSDLParam()
-	{
-		return javaWSDLParam_;
-	}	
-
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	// rm 
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
deleted file mode 100644
index 346a63be8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-  
-public class AxisBeanFragment extends SequenceFragment
-{
- 
-  public AxisBeanFragment()
-  {
-    add( new SimpleFragment( new ValidateObjectSelectionCommand(), ""));
-    add( new SimpleFragment( new BUAxisDefaultingCommand(), "" ) );
-    add( new BUAxisCommandsFragment1());
-    add( new BUAxisCommandsFragment2());
-    add( new SimpleFragment( "BeanConfig"    ) );
-    add( new MappingFragment() );
-    add( new BUAxisCommandsFragment3());
-  }
-  
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-    //ValidateObjectSelectionCommand
-    registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-    
-    //BUAxisDefaultingCommand
-    registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-    
-    //WSINonCompliantRuntimeCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-    
-    //BUAxisCommands2 - these run after BeanClassWidget
-    //DefaultsForServerJavaWSDLCommand
-    registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
-    registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-    
-    //JavaWSDLMethodCommand
-    registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
-    // BUAxisCommands3 - these run after BeanConfigWidget
-    //LiteralSupportMessageTask
-    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-    
-    //CheckAxisDeploymentDescriptorsTask
-    //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", new StringToIProjectTransformer());
-    
-    //CopyAxisJarCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-    
-    //AddJarsToProjectBuildPathTask
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-    
-    //Java2WSDLCommand
-    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-    
-    //RefreshProjectCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-    
-    //WSDL2JavaCommand
-    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-    
-
-    //MoveJavaFilesTask
-    registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-    
-    //UpdateAxisWSDDFileTask
-    registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-    
-    //UpdateWEBXMLCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-    
-    //BuildProjectCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
-    registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-    
-    //StartProjectCommand
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());    
-    registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-        
-    //AxisDeployCommand
-    registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisDeployCommand.class);
-    
-    //CopyAxisServerConfigTask
-    /*
-    registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", CopyAxisServerConfigTask.class);
-    registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisServerConfigTask.class, "ServiceProject", new StringToIProjectTransformer());
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", CopyAxisServerConfigTask.class);
-    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", CopyAxisServerConfigTask.class);
-    */
-    
-    // ServerExtensionOutputCommand
-    registry.addMapping(Java2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);    
-  }
-  
-  private class BUAxisCommandsFragment1 extends SequenceFragment
-  {    
-    public BUAxisCommandsFragment1()
-    {
-      add(new SimpleFragment(new WSINonCompliantRuntimeCommand(), ""));
-    }
-  }
-  
-  private class BUAxisCommandsFragment2 extends SequenceFragment
-  {
-    public BUAxisCommandsFragment2()
-    {
-      //add(new SimpleFragment(new DefaultsForServerJavaWSDLCommand(), ""));
-      add(new SimpleFragment(new JavaToWSDLMethodCommand(), ""));
-    }    
-  }
-  
-  private class BUAxisCommandsFragment3 extends SequenceFragment
-  {
-    public BUAxisCommandsFragment3()
-    {
-      add(new SimpleFragment(new LiteralSupportMessageTask(), ""));
-      //add(new SimpleFragment(new CheckAxisDeploymentDescriptorsTask(), ""));
-      //add(new SimpleFragment(new CopyAxisJarCommand(), ""));
-      add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
-      add(new SimpleFragment(new WaitForAutoBuildCommand(), "" ));
-      add(new SimpleFragment(new Java2WSDLCommand(), ""));
-      add(new SimpleFragment(new RefreshProjectCommand(), ""));
-      add(new SimpleFragment(new WSDL2JavaCommand(), ""));
-      add(new SimpleFragment(new MoveJavaFilesTask(), ""));
-      //add(new SimpleFragment(new UpdateAxisWSDDFileTask(), ""));
-      //add(new SimpleFragment(new UpdateWEBXMLCommand(), ""));
-      add(new SimpleFragment(new RefreshProjectCommand(), ""));
-      add(new SimpleFragment(new BuildProjectCommand(), ""));
-      //add(new SimpleFragment(new StartProjectCommand(), ""));
-      add(new SimpleFragment(new AxisDeployCommand(), ""));
-      //add(new SimpleFragment(new CopyAxisServerConfigTask(), ""));
-      add(new SimpleFragment(new RefreshProjectCommand(), ""));
-    }       
-  }
-  
-  public class MappingFragment extends BooleanFragment
-  {
-    private boolean showMappings_;
-    
-    public MappingFragment()
-    {
-      super();
-      
-      setTrueFragment( new SimpleFragment( "AxisServiceBeanMapping" ));
-      setCondition( new Condition()
-                    {
-                      public boolean evaluate()
-                      {
-                        return showMappings_;
-                      }
-                    } );
-    }
-    
-    public void setCustomizeServiceMappings( boolean showMappings )
-    {
-      showMappings_ = showMappings;
-    }      
-  }  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 417e21b01..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- */
-public class BUAxisDefaultingCommand extends SimpleCommand
-{
-  //Need
-  private IStructuredSelection initialSelection_;
-  private TypeRuntimeServer serviceIds_;
-  
-  //Provide
-  private IServer serviceExistingServer_;
-  private String serviceServerTypeID_;  // rsk revisit
-  private JavaWSDLParameter javaWSDLParam_;
-  private String javaBeanName_;
-  private WebServicesParser parser_;
-  private boolean forceBuild_ = true;
-  private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
-  private ValidationManager validationManager_;
-  private boolean customizeServiceMappings_ = false;
-  
-  //This is proxy and client related information
-  //which can be nulled for commands dealing
-  //with service creation.
-  //rsk revisit
-  private Boolean isProxyProject_ = Boolean.FALSE;
-  private String clientRuntimeID_ = null;
-  private IProject proxyProject_ = null;
-  private IProject sampleProject_ = null;
-  private String sampleServerTypeID_ = null;
-  private IServer sampleExistingServer_ = null;
-  
-  private MessageUtils msgUtils_;
-  
-  public Status execute(Environment env)
-  {
-    
-  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    
-//    if (serviceIds_.getServerInstanceId() != null) { // server exists
-//    	serviceExistingServer_ = ServerCore.findServer(serviceIds_.getServerInstanceId());
-//    }
-//    if (serviceExistingServer_ != null)
-//    {
-//      serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
-//    }
-//    else
-//    {
-//    	serviceServerTypeID_ = serviceIds_.getServerId();
-//      // server will be created in ServerDeployableConfigurationCommand
-//    }
-    
-    //javaWSDLParam
-    javaWSDLParam_ = new JavaWSDLParameter();
-     
-//    if (initialSelection_ == null) {
-//    	Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-//				msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION"), Status.ERROR);
-//		env.getStatusHandler().reportError(status);
-//		return status;
-//    }
-    
-	if (javaBeanName_ == null) {
-		Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-				msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"), //$NON-NLS-1$
-				Status.ERROR);
-		env.getStatusHandler().reportError(status);
-		return status;
-	}
-//    try {
-//		
-//		javaBeanName_ = getJavaBeanFromInitialSelection(env);
-//		
-//	} catch (CoreException e) {
-//		Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-//				msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION") + " " //$NON-NLS-1$
-//				+e.getCause().toString(), Status.ERROR);
-//		env.getStatusHandler().reportError(status);
-//		return status;
-//	}
-    
-    //parser
-    parser_ = new WebServicesParserExt();
-    
-    
-    
-    //validationManager
-    validationManager_ = new ValidationManager();
-    
-    return new SimpleStatus("");
-  }
-  
-  private String getJavaBeanFromInitialSelection(Environment env) throws CoreException
-  {
-    String beanClass = "";
-    JavaResourceFilter filter = new JavaResourceFilter(); 
-    IStructuredSelection selection = initialSelection_;
-    //
-    if (selection != null)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null)
-      {
-        // get the IResource represented by the selection
-        IResource res = null;
-        
-        res = ResourceUtils.getResourceFromSelection(obj);
-        
-        if (filter.accepts(res))
-        {
-          // get the package-qualified class name without file extensions
-          String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
-          if (beanPackage==null)
-            beanPackage = "";
-          else
-            beanPackage = beanPackage + ".";
-
-          beanClass = beanPackage + res.getName();
-
-          if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
-            beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
-          }
-        }
-      }
-    }
-    
-    //
-    return beanClass;
-  }
-  /**
-   * @return Returns the clientRuntimeID_.
-   */
-  public String getClientRuntimeID()
-  {
-    return clientRuntimeID_;
-  }
-  /**
-   * @return Returns the forceBuild_.
-   */
-  public boolean getForceBuild()
-  {
-    return forceBuild_;
-  }
-  /**
-   * @return Returns the isProxyProject_.
-   */
-  public Boolean getIsProxyProject()
-  {
-    return isProxyProject_;
-  }
-  /**
-   * @return Returns the javaBeanName_.
-   */
-  public String getJavaBeanName()
-  {
-    return javaBeanName_;
-  }
-  /**
-   * @return Returns the javaWSDLParam_.
-   */
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam_;
-  }
-  /**
-   * @return Returns the parser_.
-   */
-  public WebServicesParser getParser()
-  {
-    return parser_;
-  }
-  /**
-   * @return Returns the proxyProject_.
-   */
-  public IProject getProxyProject()
-  {
-    return proxyProject_;
-  }
-  /**
-   * @return Returns the sampleExistingServer_.
-   */
-  public IServer getSampleExistingServer()
-  {
-    return sampleExistingServer_;
-  }
-  /**
-   * @return Returns the sampleProject_.
-   */
-  public IProject getSampleProject()
-  {
-    return sampleProject_;
-  }
-  /**
-   * @return Returns the sampleServerTypeID_.
-   */
-  public String getSampleServerTypeID()
-  {
-    return sampleServerTypeID_;
-  }
-  /**
-   * @return Returns the validationManager_.
-   */
-  public ValidationManager getValidationManager()
-  {
-    return validationManager_;
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    initialSelection_ = initialSelection;
-  }
-  /**
-   * @return Returns the serviceExistingServer_.
-   */
-  public IServer getServiceExistingServer()
-  {
-    return serviceExistingServer_;
-  }
-  
-//  public String getServiceServerTypeID()
-//  {
-//    return serviceServerTypeID_;
-//  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return customizeServiceMappings_;
-  }
-  /**
-   * @return Returns the isWebProjectStartupRequested.
-   */
-  public Boolean getIsWebProjectStartupRequested()
-  {
-    return IsWebProjectStartupRequested;
-  }
-
-public void setJavaBeanName(String javaBeanName) {
-	this.javaBeanName_ = javaBeanName;
-}
-  
-//  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-//  {
-//    serviceIds_ = ids;
-//  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
deleted file mode 100644
index 2345bc160..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
-  private String             pluginId_  = "org.eclipse.jst.ws.consumption.ui";
-  private String             thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
-  private IProject           serverProject_ = null;
-  private Composite          parent_ = null;
-  private IWizardContainer   context_ = null;
-  private JavaResourceFilter filter_ = new JavaResourceFilter();
-  private IResource          initialResource_ = null;
-  
-  /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
-  private String INFOPOP_PBCL_PAGE = "PBCL0001";
-  
-  private Text beanClassText_;
-  /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
-  private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
-  private Button beanResourceBrowseButton_;
-  /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-   
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, thisPlugin ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
-                                         "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
-                                         INFOPOP_PBCL_TEXT_BEAN_CLASS,
-                                         SWT.SINGLE | SWT.BORDER);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                 {
-                                                   public void widgetSelected( SelectionEvent evt )
-                                                   {
-                                                     handleBrowseClasses();  
-                                                   }
-                                                 } );
-    
-    beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
-                                                          "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
-                                                          INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
-    beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleBrowseFiles();  
-                                                      }
-                                                    } );
-    
-    return this;
-  }
-  
-  private void handleBrowseClasses()
-  {
-    String className = DialogUtils.browseClasses( parent_.getShell(), 
-                                                  serverProject_, context_ );
-
-    if (className!=null) beanClassText_.setText(className);
-    
-  }
-  
-  private void handleBrowseFiles()
-  {
-    IResource topResource = serverProject_;
-    
-    if (topResource == null)
-    {
-      topResource = ResourceUtils.getWorkspaceRoot();
-    }
-    
-    IResource resource 
-      = DialogUtils.browseResources( parent_.getShell(),
-                                     topResource,
-				                     initialResource_,
-				                     filter_ );
-    
-    if( resource != null )
-    {
-      IPath  path     = resource.getFullPath();
-      String basename = path.lastSegment();
-      
-      if( basename != null && basename.length() > 0 )
-      {
-        String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-        String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-        
-        if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
-        {
-          beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
-        }
-        
-        beanClassText_.setText(beanClass);
-      }
-    }   
-  }
-  
-  public void setCurrentPage( IWizardPage page )
-  {
-    context_ = page.getWizard().getContainer();
-  }
-
-  public void setBeanClassName(String beanClassName)
-  {
-    beanClassText_.setText(beanClassName);
-  }
-  
-  public String getBeanClassName()
-  {
-    return beanClassText_.getText().trim();  
-  }
-  
-  public void setServerProjectName( String name )
-  {
-    serverProject_ = (IProject)ResourceUtils.findResource( new Path( name ).makeAbsolute() );  
-  }
-    
-  public void setInitialResource( IResource resource )
-  {
-    initialResource_ = resource;  
-  }  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index 053d10065..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor 
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-  
-  private Button   rpcEncodedButton_;
-  private Button   rpcLiteralButton_;
-  private Button   docLiteralButton_;
-  
-  private Listener statusListener_;
-  
-  private JavaWSDLParameter javaParameter_;
-  
-  /* CONTEXT_ID PBCF0001 for the Bean Config Page */
-  private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_PAGE = "TOOLTIP_PBCF_PAGE";
-	
-  private Text uriText_;
-  /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-	
-  private Text wsdlFolderText_;
-  /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-	
-  private Text wsdlFileText_;
-  /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-	
-  private Tree methodsTree_;
-  /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
-  private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_TREE_METHODS = "TOOLTIP_PBME_TREE_METHODS";
-	
-  private Button selectAllMethodsButton_;
-  /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
-  private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_BUTTON_SELECT_ALL = "TOOLTIP_PBME_BUTTON_SELECT_ALL";
-	
-  private Button deselectAllMethodsButton_;
-  /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
-  private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_BUTTON_DESELECT_ALL = "TOOLTIP_PBME_BUTTON_DESELECT_ALL";
-	
-  private Button showMappingsCheckbox_;
-  /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */   
-  private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    String       baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils     = new MessageUtils( pluginId_ + ".plugin", this );
-    MessageUtils baseConUtils = new MessageUtils( baseConPluginId + ".plugin", this );
-    UIUtils      uiUtils        = new UIUtils(msgUtils, pluginId_ );
-    UIUtils      baseConUiUtils = new UIUtils( baseConUtils, pluginId_ );
-    
-    statusListener_ = statusListener;    
-	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBCF_PAGE ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-    
-    Composite configGroup = uiUtils.createComposite( parent, 2 );
-    
-    uriText_ = uiUtils.createText( configGroup, "LABEL_URI",
-                                   TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFolderText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FOLDER_NAME",
-                                          TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFileText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FILE_NAME",
-                                        TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER  );
-    wsdlFileText_.addListener( SWT.Modify, statusListener );
-    
-    Label separator = uiUtils.createHorizontalSeparator( parent, 6 );
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group    methodsGroup = baseConUiUtils.createGroup( parent, "LABEL_METHODS", null, null );
-	methodsGroup.setLayoutData( uiUtils.createFillAll() );
-	
-	GridLayout layout = new GridLayout();
-	layout.marginHeight = 0;
-	layout.marginWidth = 0;
-	methodsGroup.setLayout( layout );
-	
-	methodsTree_ = uiUtils.createTree( methodsGroup, TOOLTIP_PBME_TREE_METHODS, 
-	                                   INFOPOP_PBME_TREE_METHODS,
-	                   				   SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL	| SWT.CHECK );
-	methodsTree_.addListener( SWT.Selection, statusListener );
-
-    Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-    
-    selectAllMethodsButton_ 
-      = baseConUiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL", 
-                                  TOOLTIP_PBME_BUTTON_SELECT_ALL,
-                                  INFOPOP_PBME_BUTTON_SELECT_ALL );
-    selectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                  {
-                                                    public void widgetSelected( SelectionEvent evt )
-                                                    {
-                                                      handleSelectAll( true );
-                                                    }
-                                                  });
-    
-    deselectAllMethodsButton_ 
-      = baseConUiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL", 
-                                  TOOLTIP_PBME_BUTTON_DESELECT_ALL,
-                                  INFOPOP_PBME_BUTTON_DESELECT_ALL );
-    deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSelectAll( false );
-                                                      }
-                                                    });
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group styleGroup = uiUtils.createGroup( parent, "LABEL_STYLE_USE", null, null );
-    
-    // TODO radio buttons have no TOOLTIP or INFOPOP.
-    docLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_DOC_LITERAL", null, null );
-    rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_LITERAL", null, null );
-    rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_ENCODED", null, null );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_BEAN2XML",
-                                                    "TOOLTIP_P2N_SHOW_MAPPINGS",
-                                                    INFOPOP_P2N_SHOW_MAPPINGS );
-                                            
-    return this;
-  }
-  
-  public void handleSelectAll( boolean value )
-  {
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  items[i].setChecked(value);
-	}
-	
-	statusListener_.handleEvent( null );
-  }
-  
-  public void setCustomizeServiceMappings( boolean value )
-  {
-    showMappingsCheckbox_.setSelection( value );
-  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
-  }
-  
-  public void setJavaParameter( JavaWSDLParameter javaParameter )
-  {
-    javaParameter_ = javaParameter;
-    
-	String wsdlLocation = javaParameter.getOutputWsdlLocation();
-
-	// TODO Verify that we need to find the WSDL in the eclipse file system.
-	//IFile file 
-	//  = ResourceUtils.getWorkspaceRoot().getFileForLocation(new Path(wsdlLocation));
-	//IPath wsdlPath = file.getFullPath();
-	IPath wsdlPath = new Path( wsdlLocation );
-	
-	wsdlFolderText_.setText(wsdlPath.removeLastSegments(1).toString());
-	wsdlFileText_.setText(wsdlPath.lastSegment());
-	
-	String location = javaParameter.getUrlLocation();
-	uriText_.setText(location == null ? "" : location);  
-	
-	methodsTree_.removeAll();
-	Hashtable methods = javaParameter.getMethods();
-	Enumeration e = methods.keys();
-	
-	while( e.hasMoreElements() )
-	{
-	  String   name = (String) e.nextElement();
-      TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-      
-   	  item.setData(name);
-      item.setText(name);
-      item.setChecked((((Boolean) methods.get(name)).booleanValue()));
-	}
-	
-	TreeItem[] items = methodsTree_.getItems();
-	
-	if( items.length > 0 ) 
-	{
-	  methodsTree_.setSelection( new TreeItem[]{ items[0] } );
-	}
-	
-	String style = javaParameter.getStyle();
-	
-	if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
-	{
-	  rpcEncodedButton_.setSelection(true);
-	}
-	else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
-	{
-	  rpcLiteralButton_.setSelection(true);	  
-	}
-	else
-	{
-	  docLiteralButton_.setSelection(true);  
-	}
-  }
-  
-  public JavaWSDLParameter getJavaParameter()
-  {
-    IPath wsdlPath 
-      = new Path( wsdlFolderText_.getText().trim() ).append( wsdlFileText_.getText().trim() );
-	IWorkspaceRoot workspace = ResourceUtils.getWorkspaceRoot();
-    
-	// TODO Do we need to go to the eclipse file system??
-	//String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
-	String wsdlLocation = wsdlPath.toString();
-	
-	javaParameter_.setOutputWsdlLocation(wsdlLocation);
-	javaParameter_.setInputWsdlLocation(wsdlLocation);
-	
-	String fileURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-
-	Hashtable methods = new Hashtable();
-
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  TreeItem item = items[i];
-	  methods.put((String)item.getData(), new Boolean(item.getChecked()));
-	}
-	
-	javaParameter_.setMethods(methods);
-	
-	if( rpcEncodedButton_.getSelection()) 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
-	} 
-	else if( rpcLiteralButton_.getSelection()) 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
-	} 
-	else 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
-	}
-    
-	return javaParameter_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public Status getStatus() 
-  {
-    Status       result   = null;
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    if( wsdlFileText_.getText().equals( "" ) )
-    {
-      result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_FILE_SPECIFIED" ), Status.ERROR ); 
-    }
-    else
-    {
-      TreeItem[] items        = methodsTree_.getItems();
-      boolean    itemSelected = false;
-      
-      for( int index = 0; index < items.length; index++ )
-      {
-        if( items[index].getChecked() )
-        {
-          itemSelected = true;
-          break;
-        }
-      }
-      
-      if( !itemSelected )
-      {
-        result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_METHOD_SELECTED" ), Status.ERROR ); 
-      }
-    }
-    
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
deleted file mode 100644
index e96b20ea4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Hashtable;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-
-public class DefaultsForConfig extends SimpleCommand
-{
-  public JavaWSDLParameter getJavaParameter()
-  {
-    JavaWSDLParameter parameter = new JavaWSDLParameter();
-    Hashtable         methods   = new Hashtable();
-    
-    methods.put( "method1", new Boolean( true ) );
-    methods.put( "method2", new Boolean( false ) );
-    methods.put( "method3", new Boolean( true ) );
-    
-    parameter.setMethods( methods );
-    parameter.setOutputWsdlLocation( "/SomeProj/SomeFolder/SomeFile" );
-    parameter.setUrlLocation( "SomeURLLocation" );
-    parameter.setStyle( JavaWSDLParameter.STYLE_DOCUMENT );
-      
-    return parameter;
-  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return true;
-  }      
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index 6ce5371e2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class ValidateObjectSelectionCommand extends SimpleCommand
-{
-  private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-  private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-  private MessageUtils msgUtils_;
-  private IStructuredSelection objectSelection;
-  private String serviceProjectName;
-
-  
-  /**
-   * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
-   */
-  public ValidateObjectSelectionCommand()
-  {
-    super();
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-  public Status execute(Environment env)
-  {
-    //Make sure a bean is selected
-    String javaBeanName = null;
-    if (objectSelection != null && !objectSelection.isEmpty())
-    {
-      Object object = objectSelection.getFirstElement();
-      if (object instanceof String)
-      {
-        javaBeanName = ((String)object);
-      }
-      else
-      {
-      	//The ObjectSelectionWidget never appeared and so the IStucturedSelection from 
-      	//ObjectSelectionWidgetOutputCommand is the initial selection. 
-      	//Get the Java bean name from the selection.
-      	try
-		{
-      	  System.out.println(object.getClass().toString());
-      	  javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
-		} catch (CoreException ce)
-		{
-		  Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
-		  env.getStatusHandler().reportError(errorStatus);
-		  return errorStatus;			
-		}
-      }
-    }    
-    
-    if (javaBeanName==null || javaBeanName.length()==0)
-    {
-      Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-    //Make sure a project is selected
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
-    if (serviceProject==null)
-    {
-      Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_NO_PROJECT"),Status.ERROR);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    //Make sure the selected bean can be loaded from the selected project
-	if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
-		|| javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
-		javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
-	}
-	
-    try
-    {
-	  JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(serviceProject);
-	  JavaClass javaClass =(JavaClass) JavaClassImpl.reflect(javaBeanName, jMOF.getResourceSet());
-	  if (!javaClass.isExistingType()) 
-	  {		
-		Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
-		env.getStatusHandler().reportError(errorStatus);
-		return errorStatus;
-	  }
-    } catch (CoreException ce)
-    {
-	  Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
-	  env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    return new SimpleStatus("");
-  }
-  
-  /**
-   * @param serviceProjectName The serviceProjectName to set.
-   */
-  public void setServiceProjectName(String serviceProjectName)
-  {
-    this.serviceProjectName = serviceProjectName;
-  }
-  
-  /**
-   * @param objectSelection The objectSelection to set.
-   */
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    this.objectSelection = objectSelection;
-  }
-
-  private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
-  {
-    String beanClass = "";
-    JavaResourceFilter filter = new JavaResourceFilter(); 
-    //IStructuredSelection selection = initialSelection_;
-    //
-    if (objectSelection != null)
-    {
-      Object obj = objectSelection.getFirstElement();
-      if (obj != null)
-      {
-        // get the IResource represented by the selection
-        IResource res = null;
-        
-        res = ResourceUtils.getResourceFromSelection(obj);
-        
-        if (filter.accepts(res))
-        {
-          // get the package-qualified class name without file extensions
-          String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
-          if (beanPackage==null)
-            beanPackage = "";
-          else
-            beanPackage = beanPackage + ".";
-
-          beanClass = beanPackage + res.getName();
-
-          if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
-            beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
-          }
-        }
-      }
-    }
-    
-    //
-    return beanClass;
-  }    
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index 0b6a14d97..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends SimpleCommand
-{
-  private IStructuredSelection initialSelection;
-  private IStructuredSelection objectSelection;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI_;
-  private JavaWSDLParameter javaWSDLParam;
-  
-  public Status execute(Environment env){
-    
-    javaWSDLParam = new JavaWSDLParameter();
-    javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-    javaWSDLParam.setSkeletonDeploy(true);
-    javaWSDLParam.setMetaInfOnly(false);
-    return new SimpleStatus("");
-    
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-  }
-
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    this.objectSelection = objectSelection;
-  }
-  
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser == null)
-		webServicesParser = WSDLParserFactory.getWSDLParser();
-    return webServicesParser;
-  }
-
-  public String getWebServiceURI()
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object firstElement = initialSelection.getFirstElement();
-      if (firstElement instanceof IFile)
-      {
-        IFile ifile = (IFile)firstElement;
-        String fileExtension = ifile.getFileExtension();
-        if (fileExtension.equals("wsdl") ||
-            fileExtension.equals("wsil") ||
-            fileExtension.equals("html"))
-        {
-          return ifile.getFullPath().toString();  
-        }
-      }
-    }
-    return "";
-  }
-  
-  public String getWsdlURI()
-  {
-//    if (objectSelection != null && !objectSelection.isEmpty())
-//    {
-//      Object object = objectSelection.getFirstElement();
-//      if (object instanceof IResource)
-//        return ((IResource)object).getLocation().toString();
-//      else
-//        return object.toString();
-//    }
-//    return "";
-	  return wsdlURI_;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-	  wsdlURI_ = wsdlURI;
-	  
-  }
-  
-  public boolean getGenWSIL()
-  {
-    return false;
-  }
-  
-  public String getWsilURI()
-  {
-    String wsURI = getWsdlURI();
-    int index = wsURI.lastIndexOf('.');
-    if (index != -1)
-    {
-      StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
-      sb.append(".wsil");
-      return sb.toString();
-    }
-    return "";
-  }
-  
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam;
-  }
-
-  public String getHttpBasicAuthPassword()
-  {
-    return getWebServicesParser().getHTTPBasicAuthPassword();
-  }
-
-  public String getHttpBasicAuthUsername()
-  {
-    return getWebServicesParser().getHTTPBasicAuthUsername();
-  }
-  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
deleted file mode 100644
index 7e86a18a0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerName2IServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-public class AxisSkeletonFragment extends SequenceFragment
-{
-  public AxisSkeletonFragment()
-  {
-    add( new SimpleFragment( new AxisSkeletonDefaultingCommand(), "" ) );
-    add( new SimpleFragment( new ValidateWSDLCommand(), ""));
-    //add( new SimpleFragment( new SkeletonConfigWidgetDefaultingCommand(), ""));
-    add( new SimpleFragment( "SkeletonConfig") );
-    add( new AxisMappingsFragment() );
-    //add( new SimpleFragment( new CheckAxisDeploymentDescriptorsTask(), ""));
-    add( new SimpleFragment( new AddJarsToProjectBuildPathTask(), ""));
-    //add( new SimpleFragment( new CopyAxisJarCommand(), ""));
-    add( new SimpleFragment( new WSDL2JavaCommand(), ""));
-    //add( new SimpleFragment( new MoveDeploymentFilesTask(), ""));
-    //add( new SimpleFragment( new Skeleton2WSDLCommand(), ""));
-    //add( new SimpleFragment( new UpdateWEBXMLCommand(), ""));
-    add( new SimpleFragment( new RefreshProjectCommand(), ""));
-    add( new SimpleFragment( new BuildProjectCommand(), ""));
-    //add( new SimpleFragment( new StartProjectCommand(), ""));
-    // the second build project command is needed to synchronize with workspace auto build
-    add( new SimpleFragment( new BuildProjectCommand(), ""));
-    add( new SimpleFragment( new AxisDeployCommand(), ""));
-    add( new SimpleFragment( new RefreshProjectCommand(), ""));
-    add (new SimpleFragment( new ComputeAxisSkeletonBeanCommand(), ""));
-    add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    // Transformers
-    ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-    
-    // ValidateWSDLCommand
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-    
-    // SkeletonConfigWidgetDefaultingCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-    
-    // CheckAxisDeploymentDescriptorsTask
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", projectTransformer);
-
-    // AddJarsToProjectBuildPathTask
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-    
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
-    //dataRegistry.addMapping(WSDLSelectionTreeWidget.class, "WsdlURI", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-    // MoveDeploymentFilesTask
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
-    // CopyAxisJarCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
-    // Skeleton2WSDLCommand
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
-    // UpdateWEBXMLCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
-    // RefreshProjectCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-    
-    // BuildProjectCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
-    // StartProjectCommand
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
-    dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
-    // AxisDeployCommand
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-    
-    // ServerExtensionOutputCommand
-    dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ServerExtensionOutputCommand.class);
-    
-    // ComputeAxisSkeletonBeanCommand
-    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
-    //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
-    //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-    
-    // OpenJavaEditorCommand
-    dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 5f2115a93..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
-  private JavaWSDLParameter javaWSDLParam;
-
-  /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
-  private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
-  private static final String TOOLTIP_PBSC_PAGE = "TOOLTIP_PBSC_PAGE";
-  
-  // private Text uriText_;
-  /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-  
-  private Text wsdlFolderText_;
-  /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-  
-  private Text wsdlFileText_;
-  /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-  
-  private Combo skeletonFolderText_;
-  /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
-  private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
-  private static final String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER = "TOOLTIP_PBSC_TEXT_SKELETON_FOLDER";
-  //
-
-  /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
-  // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
-  // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-  
-  private Button showMappingsCheckbox_;
-  /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page  */
-  private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-	
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId        = "org.eclipse.jst.ws.axis.creation.ui";
-    String       conPluginId     = "org.eclipse.jst.ws.axis.consumption.ui";
-    String       baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-    
-    MessageUtils msgUtils        = new MessageUtils( pluginId + ".plugin", this );
-    MessageUtils conMsgUtils     = new MessageUtils( conPluginId + ".plugin", this );
-    MessageUtils baseConMsgUtils = new MessageUtils( baseConPluginId + ".plugin", this );
-    UIUtils      uiUtils         = new UIUtils( msgUtils, pluginId );
-    UIUtils      conUiUtils      = new UIUtils( conMsgUtils, pluginId );
-    UIUtils      baseConUiUtils  = new UIUtils( baseConMsgUtils, pluginId );
-
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PBSC_PAGE );
-  	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBSC_PAGE ) );
-    
-    Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
-    /*
-    uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
-                                   TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    */
-
-    wsdlFolderText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FOLDER_NAME",
-                                          TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    wsdlFileText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FILE_NAME",
-                                        TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, "LABEL_SKELETON_ROOT_NAME",
-        TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
-        INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
-        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    Label separator = uiUtils.createHorizontalSeparator( parent, 5 );
-
-    showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
-                                                       "TOOLTIP_N2P_SHOW_MAPPINGS",
-                                                       INFOPOP_N2P_SHOW_MAPPINGS );
-        
-    return this;
-  }
-  
-  public void setEndpointURI(String endpointURI)
-  {
-  	/*
-    if (endpointURI != null)
-      uriText_.setText(endpointURI);
-    */
-  }
-  
-  public void setOutputWSDLFolder(String outputWSDLFolder)
-  {
-    if (outputWSDLFolder != null)
-      wsdlFolderText_.setText(outputWSDLFolder);
-  }
-  
-  public void setOutputWSDLFile(String outputWSDLFile)