1 files changed, 0 insertions, 38 deletions
diff --git a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample761.wsdl b/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample761.wsdl
deleted file mode 100644
index 0a093ac83..000000000
--- a/tests/org.eclipse.wst.wsdl.tests.performance/data/1000WSDLsXSDDepends/sample761.wsdl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="sample" targetNamespace="http://www.example.org/sample761" xmlns:tns="http://www.example.org/sample761" 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/sample761">
-<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/sample761"><xsd:import namespace="http://www.sample.org/86" schemaLocation="sample86.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 ce77f467c..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,328 +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.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-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.common.StringToIProjectTransformer;
-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((IProject)(new StringToIProjectTransformer().transform(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 a1b2e2a00..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,134 +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.Platform;
-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);
-	}
-
-	public String getPluginStateLocation() {
-		return Platform
-			.getPluginStateLocation(this)
-			.addTrailingSeparator()
-			.toOSString();
-	}
-
-	public String getPluginInstallLocation() {
-		try {
-			return Platform.resolve(getDescriptor().getInstallURL()).getFile();
-		} catch (Exception e) {
-			return null;
-		}
-	}
-}
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 72b5ca4d0..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.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);