1 files changed, 0 insertions, 0 deletions
diff --git a/examples/org.eclipse.emf.parsley.examples.mail.accountsview/icons/account.gif b/examples/org.eclipse.emf.parsley.examples.mail.accountsview/icons/account.gif
new file mode 100644
index 000000000..63c8abfbe
--- /dev/null
+++ b/examples/org.eclipse.emf.parsley.examples.mail.accountsview/icons/account.gif
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 cb0105380..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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<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 e93bbd83e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
-@dot
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 57f3505fa..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +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-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
-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.axis,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
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 5da312238..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               readme.html,\
-               META-INF/,\
-               about.html
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 b2a6704f6..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,165 +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.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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends AbstractDataModelOperation
-{
-  protected 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()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    if (javaWSDLParam == null)
-    {     
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"));
-    }
-
-    ProgressUtils.report(monitor, getMessage("MSG_AXIS_DEPLOY"));
-
-    IStatus status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-    	environment.getStatusHandler().reportError(status);
-    }
-    
-    return status;
-  }
-
-  protected IStatus executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-		super.setProject(new Project());
-		super.getProject().init();
-		super.setTaskType("axis"); //$NON-NLS-1$
-		super.setTaskName("axis-admin"); //$NON-NLS-1$
-		super.setOwningTarget(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();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    return Status.OK_STATUS; 
-  }
-
-  /**
-   * 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/GeronimoAxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
deleted file mode 100644
index 8f083be17..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/GeronimoAxisDeployCommand.java
+++ /dev/null
@@ -1,300 +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.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.ResourceBundle;
-
-import org.apache.axis.AxisEngine;
-import org.apache.axis.server.AxisServer;
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class GeronimoAxisDeployCommand extends AbstractDataModelOperation
-{
-
-  private JavaWSDLParameter javaWSDLParam;
-  private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-  private String projectName_;
-  private String componentName_;
-  
-  private static final String AXIS_SERVER_CONFIG_FILE = "axis.ServerConfigFile";
-  
-  IFolder outputRoot;
-  
-  /**
-   * Constructor for GeronimoAxisDeployCommand.
-   * @param String projectName
-   * @param String componentName
-   * 
-   */
-  public GeronimoAxisDeployCommand(String projectName, String componentName)
-  {
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	Environment environment = getEnvironment();
-    if (javaWSDLParam == null)
-    {
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
-    { //$NON-NLS-1$
-      return StatusUtils.errorStatus(getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"));
-    }
-
-    if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
-    {
-      return StatusUtils.errorStatus(
-      getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"));
-    }
-
-    ProgressUtils.report(monitor, getMessage("MSG_AXIS_DEPLOY"));
-
-    IStatus status = executeAdminTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-        environment.getStatusHandler().reportError(status);
-    }    
-    
-    status = executeAntTask();
-    if (status.getSeverity() == Status.ERROR)
-    {
-        environment.getStatusHandler().reportError(status);
-    }    
-    return status;
-  }
-  
-  protected IStatus executeAntTask()
-  {
-    final class DeployTask extends AdminClientTask
-    {
-      public DeployTask()
-      {
-        super.setProject(new Project());
-		super.getProject().init();
-		super.setTaskType("axis"); //$NON-NLS-1$
-		super.setTaskName("axis-admin"); //$NON-NLS-1$
-		super.setOwningTarget(new Target());
-      }
-    }
-
-    DeployTask adminClient = new DeployTask();
-    String url = javaWSDLParam.getProjectURL() + AxisDeployCommand.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);
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    return Status.OK_STATUS; 
-
-  }
-  
-  protected IStatus executeAdminTask(){
-    
-    IStatus status = Status.OK_STATUS;
-    // check if server-config.wsdd exists
-    IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_, componentName_ );
-    outputRoot = J2EEUtils.getOutputContainerRoot( component );
-    IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
-    IFile descriptorFile = outputRoot.getFile( path );
-    
-    if (!descriptorFile.exists()){
-      status = createServerConfigFile();
-      if (status.getSeverity()==Status.ERROR)
-        return status;
-    }
-    
-    // check if deploy.wsdd exists
-    String deployWSDD = javaWSDLParam.getDeploymentFiles()[0];
-    File deployFile = new File(deployWSDD);
-    if (deployFile==null || !deployFile.exists()){
-      return status;
-    }
-    
-    try {
-      // get Classpath
-      String jarsCP = new String();
-      // classes dir
-      IPath classesPath = new Path("WEB-INF").append("classes");
-      IFile classesDir = outputRoot.getFile(classesPath);
-      jarsCP = "\""+classesDir.getRawLocation().toOSString()+"\"";
-      
-      // lib JARs
-      IPath libPath = new Path("WEB-INF").append("lib");
-      IFile libEntry = outputRoot.getFile(libPath);
-      IFolder libFolder = (IFolder)ResourceUtils.findResource(libEntry.getFullPath());
-      IResource[] JARfiles = libFolder.members();
-      for (int i=0;i<JARfiles.length;i++){
-        IResource res = JARfiles[i];
-        if (res.getFileExtension().equals("jar")){
-          jarsCP = jarsCP + ";\""+ res.getRawLocation().toOSString()+"\"";
-        }
-      }
-
-      // form and run utils.Admin command
-      String adminCommand = new String("java -Daxis.ServerConfigFile="+ descriptorFile.getRawLocation().toOSString() 
-          +" -cp "+jarsCP+" org.apache.axis.utils.Admin server "+deployFile.getCanonicalPath());
-      Runtime.getRuntime().exec(adminCommand);
-
-    }
-    catch(Exception e){
-      System.setProperty(AXIS_SERVER_CONFIG_FILE,"server-conifg.wsdd");      
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-      
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-    }
-    
-    return status;
-  }
-  
-  /**t
-   * Creates the initial server-config.wsdd file from a template in Axis
-   * @return
-   */
-  private IStatus createServerConfigFile(){
-    try{
-
-      // server-config.wsdd file
-      IPath             path           = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
-      IFile             descriptorFile = outputRoot.getFile( path );      
-
-      // create the initial server-config.wsdd file
-      AxisEngine preEngine = new AxisServer();
-      InputStream is = ClassUtils.getResourceAsStream(preEngine.getClass(), "server-config.wsdd");
-      FileOutputStream fos = new FileOutputStream(descriptorFile.getRawLocation().toOSString());
-      ResourceUtils.copyStream(is, fos);
-      fos.close();
-      
-      return Status.OK_STATUS;
-    }
-    catch(Exception e){
-      e.printStackTrace();
-      String message = e.getMessage();
-      if (e.getCause() != null)
-      {
-        message = e.getCause().toString();
-      }
-
-      IStatus[] childStatus = new Status[1];
-      childStatus[0] = StatusUtils.errorStatus( message);
-      return StatusUtils.multiStatus(getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
-
-    }
-  }
-
-  /**
-   * 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 d5c77f58c..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,195 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends AbstractDataModelOperation
-{
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
-	public Java2WSDLCommand() {
-	}	
-	/**
-	 * Constructor for Java2WSDLCommand.
-	 */
-	public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
-		super();
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		if (javaWSDLParam_.getBeanName() == null) {
-			status = StatusUtils.errorStatus(getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		ProgressUtils.report(monitor, getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ));
-
-		return executeAntTask(environment);
-	}
-
-	protected IStatus executeAntTask(Environment environment) {
-
-		final class Emitter extends Java2WsdlAntTask {
-			public Emitter() {
-				super.setProject(new Project());
-				super.getProject().init();
-				super.setTaskType("axis"); //$NON-NLS-1$
-				super.setTaskName("axis-java2wsdl"); //$NON-NLS-1$
-				super.setOwningTarget(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);
-			IStatus status = StatusUtils.errorStatus(
-			getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
-			+e.getCause().toString());
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return Status.OK_STATUS;
-
-	}
-	
-	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 2906565d3..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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-
-
-public class WSDL2JavaCommand extends AbstractDataModelOperation {
-
-	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$
-	
-
-	public WSDL2JavaCommand() {
-	}
-
-	  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	  {
-	    Environment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam == null) {
-			status = StatusUtils.errorStatus(
-					getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			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());
-		ProgressUtils.report(monitor, 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 = StatusUtils.errorStatus(
-					getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
-							+ e.toString());
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		return Status.OK_STATUS;
-	}
-
-	/*
-	 * 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.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
deleted file mode 100644
index cb0105380..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.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<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 bb8eaa839..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
-@dot
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 ffaa1376e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +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.1
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
-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.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.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.axis,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-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/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
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 c772b640e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
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 3abf85f7c..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
-DESC_RUNTIME_AXIS_11=Apache Axis
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 197c57ee1..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   <!-- 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/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 6bc3b6d67..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,266 +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.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.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.AbstractDataModelOperation;
-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 AbstractDataModelOperation 
-{
-    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 boolean clientIsExistingServer_;
-	private String proxyProjectFolder_;
-	private WebServicesParser webServicesParser_;
-	private String            moduleName_;
-	
-	public AxisClientDefaultingCommand( String moduleName ) 
-	{
-	  moduleName_ = moduleName;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		IStatus status = Status.OK_STATUS;
-		
-		clientExistingServer_ = getServerFromServerLabel();
-//		if (clientExistingServer_ != null) {
-//			//TODO The following line should no longer be necessary.
-//			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
-			{
-				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/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 0c463111e..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,75 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-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 AbstractDataModelOperation {
-	
-	private IWebServiceClient wsc_;
-
-		private String clientProject_ = null;
-		private String clientModule_ = null;
-		private String wsdlURL_;
-		private String clientServer_;
-		private WebServicesParser webServicesParser_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientInputCommand() {
-		}
-		
-		public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project, String module) {
-			wsc_ = wsc;
-			clientProject_ = project; 
-			clientModule_ = module;
-		}
-		
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{	    
-		wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
-		clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-		
-		return Status.OK_STATUS;
-	  }
-
-	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 063b72d53..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,49 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends AbstractDataModelOperation {
-	
-	private IWebServiceClient wsc_;
-	private String proxyBean_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public AxisClientOutputCommand() {
-		}
-		
-		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context, String module) {
-			wsc_ = wsc;
-		}
-		
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{	
-		wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
-		return Status.OK_STATUS;
-	  }
-
-	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 a14ce15d7..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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends AbstractDataModelOperation
-{
-  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);    
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
-    if(def==null)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION",new String[]{wsdlURL_}));
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    IPath clientWSDLPath = new Path(clientWSDLPathName_);
-    IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
-    status = resolveWSDL(workspaceRoot, def, clientWSDLPath, env, monitor);
-    return status;
-  }
-
-	private IStatus resolveWSDL(
-		IWorkspaceRoot workspace,
-		Definition wsdlDef,
-		IPath wsdlPath,
-		Environment env, 
-		IProgressMonitor monitor) {
-		try {
-			writeWSDLFile(workspace, wsdlDef, wsdlPath, env, monitor);
-			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 StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_IMPORT_WSDL",new String[]{importDef.getLocationURI()}));
-					}
-					IPath newPath =
-						new Path(newPathString + importDef.getLocationURI());
-					IStatus status = resolveWSDL(workspace, def, newPath, env, monitor);
-					if (status != null
-						&& status.getSeverity() == Status.ERROR) {
-						return status;
-					}
-				}
-			}
-		} catch (Exception e) {
-		    return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL",new String[] { wsdlPath.toString() }), e);
-		}
-		return Status.OK_STATUS;
-	}
-
-	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, 
-		IProgressMonitor monitor)
-		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,
-			monitor,
-			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 f7c45aa6c..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,179 +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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-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.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject proxyProject_;
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private String moduleName_;
-	
-	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 );
-		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 );
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus(
-					coreMsgUtils_.getMessage(
-				"MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		javaWSDLParam_.setMetaInfOnly(false);
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
-		
-	    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
-	    if (mn!=null)
-	    {
-			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);
-			}	
-	    }
-	    else
-	    {
-	    	//Check if it's a plain old Java project
-	    	IJavaProject javaProject = null;
-	  
-	 		 javaProject = JavaCore.create(proxyProject_);    
-	 		 if (javaProject != null)
-	 		 {
-	 			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_);
-				String output =	ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-				javaWSDLParam_.setJavaOutput(output);
-				javaWSDLParam_.setOutput(output);
-	 		 }
-	 		 else
-	 		 {
-	 			 //Not familiar with this kind of project
-	 	 		 status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"));	
-	 	 		 environment.getStatusHandler().reportError(status);
-	 	 		 return status;
-	 			 
-	 		 }
-	    }
-
-
-
-		if (WSDLServicePathname_ == null) {
-			
-			if (WSDLServiceURL_ == null) {
-				status = StatusUtils.errorStatus(
-						msgUtils_.getMessage(
-					"MSG_ERROR_WSDL_LOCATION_NOT_SET"));
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		} else {
-			WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
-		}
-
-		javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
-
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * 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/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 5c86ff7c9..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,105 +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 org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.osgi.framework.BundleContext;
-
-
-/**
-* 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() {
-		super();
-		if (instance_ == null) {
-			instance_ = this;
-		}
-		log_ = EnvironmentService.getEclipseLog();
-
-	}
-
-  // This method is needed to keep the logging from blowing up.
-  public String toString()
-  {
-    return ID;  
-  }
-  
-	/**
-	* 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 start( BundleContext bundle ) throws CoreException {
-		log_.log(Log.INFO, 5066, this, "start", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
-    
-    try
-    {
-		  super.start( bundle );
-    }
-    catch( Exception exc )
-    {
-      log_.log( Log.ERROR, 5066, this, "start", exc );
-    }
-	}
-
-	/**
-	* Called once by the platform when this plugin is unloaded.
-	* @throws CoreException If this plugin fails to shutdown.
-	*/
-	public void stop( BundleContext context ) throws CoreException {
-		log_.log(Log.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
-    
-    try
-    {
-		  super.stop( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( Log.ERROR, 5066, this, "stop", exc );      
-    }
-	}
-}
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 c8fad2d23..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,87 +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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.common.EnvironmentUtils;
-
-public class CheckAxisDeploymentDescriptorsTask extends AbstractDataModelOperation {
-	
-	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 );
-	moduleName_ = moduleName;
-  }
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment env = getEnvironment();
-		IStatus status = Status.OK_STATUS;
-		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 = StatusUtils.errorStatus( coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			env.getStatusHandler().reportError(status);
-			return status;			
-		}
-
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-		if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled())   {
-			status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_ERROR_XML_FILE_OVERWRITE_DISABLED"));
-			try
-			{
-				env.getStatusHandler().report(status);
-			}
-			catch(StatusException se)
-			{
-				status = StatusUtils.errorStatus( "User aborted");
-			}
-			
-			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 e81a0b317..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,310 +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 org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-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.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-
-public class CopyAxisJarCommand extends AbstractDataModelOperation {
-
-  public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis"; //$NON-NLS-1$
-  public static String[] JARLIST = new String[] {
-	  "axis.jar",
-	  "commons-discovery-0.2.jar",
-	  "commons-logging-1.0.4.jar",
-	  "jaxrpc.jar",
-	  "saaj.jar",
-	  "wsdl4j-1.5.1.jar"
-  };
-  public static String PATH_TO_JARS_IN_PLUGIN = "lib/";
-
-  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 );
-	moduleName_ = moduleName;
-  }
-
-  /**
-   * Execute the command
-   */
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    ProgressUtils.report(monitor, msgUtils_.getMessage("PROGRESS_INFO_COPY_AXIS_CFG"));
-    
-    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(project);
-    if (mn!=null)
-    {
-    	copyAxisJarsToProject(project, status, env, monitor);	
-    }
-    else
-    {
-    	//Check if it's a plain old Java project
-    	IJavaProject javaProject = null;
-  
- 		 javaProject = JavaCore.create(project);    
- 		 if (javaProject != null)
- 		 {
- 			status = addAxisJarsToBuildPath(project, env, monitor);
- 			if (status.getSeverity()==Status.ERROR)
- 			{
- 				env.getStatusHandler().reportError(status);
- 				return status;
- 			}
- 		 }
- 		 else
- 		 {
- 		   status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"));	
- 		   env.getStatusHandler().reportError(status);
- 		   return status;
- 		 }
-
-    }
-    
-    return status;
-
-  }
-
-  private void copyAxisJarsToProject(IProject project, IStatus status, Environment env, IProgressMonitor monitor) {
-//    IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
-	IPath webModulePath = J2EEUtils.getWebContentPath( project, moduleName_ );
-    if (webModulePath == null) {
-      status = StatusUtils.errorStatus( baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"));
-      env.getStatusHandler().reportError(status);
-      return;
-    }
-	
-	for (int i=0; i<JARLIST.length; ) {
-		copyIFile("lib/"+JARLIST[i], webModulePath, "WEB-INF/lib/"+JARLIST[i++], status, env, monitor); 
-	    if (status.getSeverity() == Status.ERROR)
-	      return;
-	}
-    return;
-  }
-
-  /**
-   *  
-   */
-  private void copyIFile(String source, IPath targetPath, String targetFile, IStatus status, Environment env, IProgressMonitor monitor) {
-    IPath target = targetPath.append(new Path(targetFile));
-    ProgressUtils.report(monitor, baseConMsgUtils_.getMessage("PROGRESS_INFO_COPYING_FILE"));
-
-    try {
-      ResourceContext context = new TransientResourceContext();
-      context.setOverwriteFilesEnabled(true);
-      context.setCreateFoldersEnabled(true);
-      context.setCheckoutFilesEnabled(true);
-      URL sourceURL = BundleUtils.getURLFromBundle( AXIS_RUNTIME_PLUGIN_ID, source );
-      IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
-      if (!resource.exists()) {
-        IFile file = FileResourceUtils.createFile(context, target, sourceURL.openStream(), monitor, 
-            env.getStatusHandler());
-        if (projectRestartRequired_.booleanValue() == false && file.exists()) {
-          projectRestartRequired_ = Boolean.TRUE;
-        }
-
-      }
-    }
-    catch (Exception e) {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_FILECOPY"), e);
-      env.getStatusHandler().reportError(status);
-
-    }
-  }
-
-  public IStatus addAxisJarsToBuildPath(IProject p, Environment env, IProgressMonitor monitor)
-  {
-	  String[] jarNames = new String[JARLIST.length];
-	  for (int i=0; i<JARLIST.length; i++)
-	  {
-		  StringBuffer sb = new StringBuffer();
-		  sb.append(PATH_TO_JARS_IN_PLUGIN);
-		  sb.append(JARLIST[i]);
-		  String jarName = sb.toString();
-		  jarNames[i] = jarName;
-	  }
-	  
-	  IStatus status = addJar(p, AXIS_RUNTIME_PLUGIN_ID, jarNames, env, monitor);
-	  if (status.getSeverity()==Status.ERROR)
-	  {			  
-		  return status;
-	  }
-	  return Status.OK_STATUS;
-  }
-
-  
-  private IStatus addJar(IProject webProject, String pluginId, String[] jarNames, Environment env, IProgressMonitor monitor)
-  {
-
-    IStatus status = Status.OK_STATUS;
-    //
-    // Get the current classpath.
-    //
-    IJavaProject javaProject_ = null;
-    IClasspathEntry[] oldClasspath = null;
-    javaProject_ = JavaCore.create(webProject);
-    try
-    {
-      oldClasspath = javaProject_.getRawClasspath();
-    } catch (JavaModelException jme)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), jme);
-      // env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    ArrayList newJarNamesList = new ArrayList();
-
-    for (int k = 0; k < jarNames.length; k++)
-    {
-      boolean found = false;
-      for (int i = 0; i < oldClasspath.length; i++)
-      {
-        found = oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarNames[k].toLowerCase());
-        if (found)
-        {
-          break;
-        }
-      }
-
-      if (!found)
-      {
-        newJarNamesList.add(jarNames[k]);
-      }
-    }
-
-    if (newJarNamesList.size() > 0)
-    {
-      String[] newJarNames = (String[]) newJarNamesList.toArray(new String[] {});
-
-      IClasspathEntry[] newClasspath = new IClasspathEntry[oldClasspath.length + newJarNames.length];
-      int i = 0;
-      while (i < oldClasspath.length)
-      {
-        newClasspath[i] = oldClasspath[i];
-        i++;
-      }
-
-      try
-      {
-        int m = 0;
-        while (i < newClasspath.length)
-        {
-          newClasspath[i] = JavaCore.newLibraryEntry(getTheJarPath(pluginId, newJarNames[m]), null, null);
-          m++;
-          i++;
-        }
-      } catch (CoreException e)
-      {
-        status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), e);
-        return status;
-      }
-
-      //
-      // Then update the project classpath.
-      //
-      try
-      {
-        javaProject_.setRawClasspath(newClasspath, monitor);
-      } catch (JavaModelException e)
-      {
-        status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), e);
-        return status;
-      }
-    }
-
-    return status;
-
-  }
-
-		//
-		// Returns the local native pathname of the jar.
-		//
-		private IPath getTheJarPath(String pluginId, String theJar)
-			throws CoreException {
-			try {
-				if (pluginId != null) {
-					URL localURL =
-						Platform.asLocalURL(
-              BundleUtils.getURLFromBundle( pluginId, 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;
-  }
-
-  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 005b00f13..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,130 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.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.AbstractDataModelOperation;
-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 AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlServiceURL;
-  private JavaWSDLParameter javaWSDLParam;
-
-  public DefaultsForHTTPBasicAuthCommand()
-  {
-    super();
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{   
-    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 Status.OK_STATUS;
-  }
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @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 a2e3b91e5..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,65 +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.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-
-
-public class RefreshProjectCommand extends AbstractDataModelOperation
-{
-	private IProject project;
-	private MessageUtils msgUtils_;
-
-	public RefreshProjectCommand()
-	{
-		msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-	}
-
-	/**
-	* Execute RefreshProjectTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment env = getEnvironment();
-		try
-		{
-			if (project!=null)
-			project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
-		}
-		catch (CoreException e)
-		{
-		  IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_REFRESH_PROJECT"), e);
-		  env.getStatusHandler().reportError(status);
-		  return status;
-		}
-		return Status.OK_STATUS;
-	}
-
-	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 979c12091..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,291 +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.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-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.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam_;
-  private String discoveredWsdlPortElementName;
-  private Vector portTypes_;
-  private String proxyBean_;
-  
-  private String module_ = "";
-  
-  private IProject clientProject_;
-  
-  private MessageUtils msgUtils_;
-
-  public Stub2BeanCommand()
-  {
-    super();
-    portTypes_ = new Vector();
-    String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);    
-    //setRunInWorkspaceModifyOperation(false);
-  }
-  
-  public Stub2BeanCommand(String moduleName){
-	  super();
-	  portTypes_ = new Vector();	  
-	  module_ = moduleName;
-	  String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
-	  msgUtils_ = new MessageUtils(pluginId + ".plugin", this);	  
-  }
-
-  /**
-  * Execute
-  */
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();       
-    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)
-        {
-        }
-      }
-    }
-    
-    //Ensure the client project is either a flexible project or a Java project
-    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
-    if (mn==null)
-    {
-        // Check if it's a plain old Java project
-    	IJavaProject javaProject = null;    	  
-		javaProject = JavaCore.create(clientProject_);    
-		if (javaProject == null)
-		{
-	 		   IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"));	
-	 		   environment.getStatusHandler().reportError(status);
-	 		   return status;
-		}    	
-    }
-    
-    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 + "_PortType";
-            stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, port.getName());
-            try
-            {              
-              stub2BeanInfo.write( monitor, environment.getStatusHandler() );
-              if (discoveredWsdlPortElementName != null)
-              {
-                // The discovered port was processed. Ignore all other ports and services.
-                return Status.OK_STATUS;
-              }
-            }
-            catch (CoreException ce)
-            {
-            }
-            catch (IOException ioe)
-            {
-            }
-          }
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-  
-  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 467892f9c..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,661 +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.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-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.JavaRefFactory;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-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.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.environment.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 getFullyQualifiedName(JavaHelpers javaHelpers)
-  {
-    if (javaHelpers.isPrimitive())
-      return javaHelpers.getJavaName();
-    else
-      return javaHelpers.getQualifiedName();
-  }
-
-  public void write(IProgressMonitor 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.createRuntime(clientProject_);
-    ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
-    IPath sourceFolderPath = null;
-    IPath filePath = null;
-    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
-    if (mn!=null)
-    {
-    	sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_, moduleName_);
-        IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
-        filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();    	
-    }
-    else
-    {
-        // It's a plain old Java project
-    	JavaCore.create(clientProject_);
-
-		sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
-		IResource sourceFolderResource = ResourceUtils.findResource(sourceFolderPath);
-		if (sourceFolderResource instanceof IFolder) 
-		{
-				IFolder sourceFolder = (IFolder) sourceFolderResource;
-				filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
-		} else 
-		{
-			// The source must be going directly in the project
-			filePath = clientProject_.getFile(new Path(sb.toString())).getFullPath();
-		}
-		
-    }
-
-    FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, bais, progressMonitor, statusMonitor);
-  }
-
-  private void writePackage(Writer w) throws IOException
-  {
-    if (package_ != null && package_.length() > 0)
-    {
-      w.write("package ");
-      w.write(package_);
-      w.write(";");
-      newLine(w);
-    }
-  }
-
-  private void writeImports(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(imports_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write("import ");
-      w.write(st.nextToken());
-      w.write(";");
-      newLine(w);
-    }
-  }
-
-  private void writeClass(Writer w) throws IOException, CoreException
-  {
-    newLine(w);
-    w.write("public class ");
-    w.write(class_);
-    w.write(" ");
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    if (st.hasMoreTokens())
-      w.write("implements ");
-    while (st.hasMoreTokens())
-    {
-      w.write(st.nextToken());
-      if (st.hasMoreTokens())
-        w.write(", ");
-    }
-    w.write(" {");
-    incrementIndent();
-    newLine(w);
-    writeFieldsDeclarations(w);
-    writeConstructor(w);
-    writeInit(w);
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    writeUseJNDI(w);
-    */
-    writeGetSetEndpoint(w);
-    writeSEIGetters(w);
-    writeSEIMethods(w);
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-  }
-
-  private void writeFieldsDeclarations(Writer w) throws IOException
-  {
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    w.write("private boolean _useJNDI = true;");
-    newLine(w);
-    */
-    w.write("private String _endpoint = null;");
-    usedNames.add("_endpoint");
-    newLine(w);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      w.write("private ");
-      String sei = st.nextToken();
-      w.write(sei);
-      w.write(" ");
-      String stubName = firstCharToLowerCase(getClassName(sei));
-      w.write(stubName);
-      usedNames.add(stubName);
-      w.write(" = null;");
-      newLine(w);
-    }
-  }
-
-  private void writeConstructor(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public ");
-    w.write(class_);
-    w.write("() {");
-    incrementIndent();
-    newLine(w);
-    w.write("_init");
-    w.write(class_);
-    w.write("();");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeInit(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("private void _init");
-    w.write(class_);
-    w.write("() {");
-    incrementIndent();
-    newLine(w);
-    w.write("try {");
-    incrementIndent();
-    newLine(w);
-    /*
-    * Cannot use JNDI lookup for AXIS
-    *
-    w.write("if (_useJNDI) {");
-    incrementIndent();
-    newLine(w);
-    */
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    StringTokenizer serviceTokens = new StringTokenizer(services_.toString(), ";");
-    //StringTokenizer jndiNameTokens = new StringTokenizer(jndiNames_.toString(), ";");
-    StringTokenizer portTokens = new StringTokenizer(ports_.toString(), ";");
-    /*
-    if (st.hasMoreTokens())
-    {
-      w.write("javax.naming.InitialContext ctx = new javax.naming.InitialContext();");
-      newLine(w);
-    }
-    while (st.hasMoreTokens())
-    {
-      w.write(firstCharToLowerCase(getClassName(st.nextToken())));
-      w.write(" = ((");
-      w.write(serviceTokens.nextToken());
-      w.write(")ctx.lookup(\"java:comp/env/service/");
-      w.write(jndiNameTokens.nextToken());
-      w.write("\")).get");
-      w.write(mangleClassName(portTokens.nextToken()));
-      w.write("();");
-      newLine(w);
-    }
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    w.write("else {");
-    incrementIndent();
-    newLine(w);
-    st = new StringTokenizer(seis_.toString(), ";");
-    serviceTokens = new StringTokenizer(services_.toString(), ";");
-    portTokens = new StringTokenizer(ports_.toString(), ";");
-    */
-    while (st.hasMoreTokens())
-    {
-      String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
-      w.write(seiName);
-      w.write(" = (new ");
-      w.write(serviceTokens.nextToken());
-      w.write("Locator()).get");
-      w.write(replaceInvalidJavaChars(WSDLUtils.resolveDotInPortName(portTokens.nextToken())));
-      w.write("();");
-      newLine(w);
-      w.write("if (");
-      w.write(seiName);
-      w.write(" != null) {");
-      incrementIndent();
-      newLine(w);
-      w.write("if (_endpoint != null)");
-      incrementIndent();
-      newLine(w);
-      w.write("((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
-      decrementIndent();
-      newLine(w);
-      w.write("else");
-      incrementIndent();
-      newLine(w);
-      w.write("_endpoint = (String)((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._getProperty(\"javax.xml.rpc.service.endpoint.address\");");
-      decrementIndent();
-      decrementIndent();
-      newLine(w);
-      w.write("}");
-      newLine(w);
-    }
-    /*
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    */
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    /*
-    w.write("catch (javax.naming.NamingException namingException) {}");
-    newLine(w);
-    */
-    w.write("catch (javax.xml.rpc.ServiceException serviceException) {}");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void writeSetPropertyEndpoint(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
-      w.write("if (");
-      w.write(seiName);
-      w.write(" != null)");
-      incrementIndent();
-      newLine(w);
-      w.write("((javax.xml.rpc.Stub)");
-      w.write(seiName);
-      w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
-      decrementIndent();
-      newLine(w);
-    }
-  }
-
- 
-  private void writeSEIGetters(Writer w) throws IOException
-  {
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      String seiClassName = getClassName(sei);
-      String seiFieldName = firstCharToLowerCase(seiClassName);
-      newLine(w);
-      w.write("public ");
-      w.write(sei);
-      w.write(" get");
-      w.write(seiClassName);
-      w.write("() {");
-      incrementIndent();
-      newLine(w);
-      w.write("if (");
-      w.write(seiFieldName);
-      w.write(" == null)");
-      incrementIndent();
-      newLine(w);
-      w.write("_init");
-      w.write(class_);
-      w.write("();");
-      decrementIndent();
-      newLine(w);
-      w.write("return ");
-      w.write(seiFieldName);
-      w.write(";");
-      decrementIndent();
-      newLine(w);
-      w.write("}");
-      newLine(w);
-    }
-  }
-
-  private void writeSEIMethods(Writer w) throws IOException, CoreException
-  {
-    newLine(w);
-    //WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
-    if (clientProject_ == null) return;//wse.getProxyProject();
-    JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
-    StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
-    while (st.hasMoreTokens())
-    {
-      String sei = st.nextToken();
-      JavaClass javaClass = (JavaClass)JavaRefFactory.eINSTANCE.reflectType(getPackageName(sei), getClassName(sei), javaMOF.getResourceSet());
-      if (javaClass != null)
-      {
-        List methods = javaClass.getMethods();
-        for (Iterator it = methods.iterator(); it.hasNext();)
-        {
-          Method method = (Method)it.next();
-          if (!method.isConstructor() && !method.isNative() && method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
-            writeSEIMethods(w, javaClass, method);
-        }
-      }
-    }
-  }
-
-  private void writeSEIMethods(Writer w, JavaClass javaClass, Method method) throws IOException
-  {
-    w.write("public ");
-    // isVoid
-    if (method.isVoid())
-      w.write("void ");
-    else
-    {
-      w.write(getFullyQualifiedName(method.getReturnType()));
-      w.write(" ");
-    }
-    // method name
-    w.write(method.getName());
-    w.write("(");
-    // input parameters
-    JavaParameter[] inputParams = method.listParametersWithoutReturn();
-    for (int i = 0; i < inputParams.length; i++)
-    {
-      if (i > 0)
-        w.write(", ");
-      JavaHelpers javaHelpers = inputParams[i].getJavaType();
-      w.write(getFullyQualifiedName(javaHelpers));
-      w.write(" ");
-      String paramName = getClassName(inputParams[i].getQualifiedName());
-      w.write(getUnusedName(paramName));
-    }
-    w.write(")");
-    // exceptions
-    List exceptions = method.getJavaExceptions();
-    if (!exceptions.isEmpty())
-      w.write(" throws ");
-    for (Iterator it = exceptions.iterator(); it.hasNext();)
-    {
-      JavaClass exception = (JavaClass)it.next();
-      w.write(exception.getQualifiedNameForReflection());
-      if (it.hasNext())
-        w.write(", ");
-    }
-    // method body
-    w.write("{");
-    incrementIndent();
-    newLine(w);
-    String stubName = firstCharToLowerCase(javaClass.getName());
-    w.write("if (");
-    w.write(stubName);
-    w.write(" == null)");
-    incrementIndent();
-    newLine(w);
-    w.write("_init");
-    w.write(class_);
-    w.write("();");
-    decrementIndent();
-    newLine(w);
-    if (!method.isVoid())
-      w.write("return ");
-    w.write(stubName);
-    w.write(".");
-    w.write(method.getName());
-    w.write("(");
-    for (int i = 0; i < inputParams.length; i++)
-    {
-      if (i > 0)
-        w.write(", ");
-      String paramName = getClassName(inputParams[i].getQualifiedName());
-      w.write(getUnusedName(paramName));
-    }
-    w.write(");");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    newLine(w);
-  }
-
-  private void writeGetSetEndpoint(Writer w) throws IOException
-  {
-    newLine(w);
-    w.write("public String getEndpoint() {");
-    incrementIndent();
-    newLine(w);
-    w.write("return _endpoint;");
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-    newLine(w);
-    w.write("public void setEndpoint(String endpoint) {");
-    incrementIndent();
-    newLine(w);
-    w.write("_endpoint = endpoint;");
-    newLine(w);
-    writeSetPropertyEndpoint(w);
-    decrementIndent();
-    newLine(w);
-    w.write("}");
-    newLine(w);
-  }
-
-  private void incrementIndent()
-  {
-    indentCount++;
-  }
-
-  private void decrementIndent()
-  {
-    indentCount--;
-  }
-
-  private void indent(Writer w) throws IOException
-  {
-    for (int i = 0; i < indentCount; i++)
-      w.write("  ");
-  }
-
-  private void newLine(Writer w) throws IOException
-  {
-    w.write(NEW_LINE);
-    indent(w);
-  }
-  
-  private String getUnusedName(String name)
-  {
-    if (usedNames.contains(name))
-    {
-      for (int i = 0; i < 100; i++)
-      {
-        String newName = (new StringBuffer(name)).append(String.valueOf(i)).toString();
-        if (!usedNames.contains(newName))
-          return newName;
-      }
-    }
-    return name;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
deleted file mode 100644
index 8fd2c30e7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-
-  public ValidateWSDLCommand()
-  {
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-	MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-	
-    if (wsdlURI != null && wsdlURI.length() > 0)
-    {
-      Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (definition != null)
-      {
-        int numServices = definition.getServices().size();
-        if (numServices < 1)
-        {
-          IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT", new Object[] {wsdlURI}), null);
-          environment.getStatusHandler().reportError(status);
-          return status;
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
deleted file mode 100644
index 6106d374a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathUtils {
-
-	//	Copyright
-	public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
-	private static ClasspathUtils instance_; //$NON-NLS-1$
-	private static String DOT_JAR = ".jar"; //$NON-NLS-1$
-	private static String JAR = "jar"; //$NON-NLS-1$
-	private static String WEBINF_LIB = "/WEB-INF/lib"; //$NON-NLS-1$
-	
-	// workaround for Axis-2146 - lower case list of JARs that may include javax.activation.DataHandler
-	private static String[] JARLIST = new String[] {
-		  "activation.jar",
-		  "geronimo-spec-activation-1.0.2-rc3.jar",
-		  "geronimo-spec-j2ee-1.4-rc3.jar",
-		  "geronimo-spec-activation-1.0.2-rc4.jar",
-		  "geronimo-spec-j2ee-1.4-rc4.jar"
-	  };
-
-	private ClasspathUtils() {
-	}
-
-	public static ClasspathUtils getInstance() {
-		if (instance_ == null)
-			instance_ = new ClasspathUtils();
-		return instance_;
-	}
-	
-	public String getClasspathString(IProject project, String module) {
-		StringBuffer classpath = new StringBuffer();
-		String[] classpathEntries = getClasspath(project, false, module);
-
-		Vector classpathVector = new Vector();
-		for (int i = 0; i < classpathEntries.length; i++) {
-			if (!classpathVector.contains(classpathEntries[i])) {
-				classpathVector.add(classpathEntries[i]);
-				classpath.append(classpathEntries[i]);
-				classpath.append(";"); //$NON-NLS-1$
-			}
-		}
-		return classpath.toString();
-	}
-
-		
-	private String[] getClasspath(IProject project, boolean isDependent, String inputModule) {
-//		inputModule is valid only if it's not a dependent project
-		String[] moduleClasspath = new String[0];
-		ArrayList projectClasspath = new ArrayList();
-		boolean needJavaClasspath = false;
-		IFolder webModuleServerRoot = null;
-		
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		if (comp != null) {
-			// get the module's classpath
-			
-			if (J2EEUtils.isEARComponent(comp)) {
-				moduleClasspath = getClasspathForEARProject(project, comp.getName());
-			} else if (J2EEUtils.isWebComponent(comp) || J2EEUtils.isJavaComponent(comp)) {
-				needJavaClasspath = true;
-				webModuleServerRoot = J2EEUtils.getOutputContainerRoot(comp);
-				if (webModuleServerRoot != null) { 
-					moduleClasspath = new String[] { webModuleServerRoot.getLocation().toOSString() };
-				}
-			}
-			
-			// add module classpath to project classpath
-			for (int j = 0; j < moduleClasspath.length; j++) {
-				projectClasspath.add(moduleClasspath[j]);
-			}
-			
-			if (!isDependent) {
-				if (J2EEUtils.isWebComponent(comp)) {
-					needJavaClasspath = true;
-					moduleClasspath = getWEBINFLib(project, inputModule);
-					for (int j = 0; j < moduleClasspath.length; j++) {
-						projectClasspath.add(moduleClasspath[j]);
-					}
-				}
-			}
-			
-		} else {
-			needJavaClasspath = true;
-		}
-		
-		// If there are Web or Java module in the project, get the project's Java classpath
-		if (needJavaClasspath) {
-			String[] javaClasspath;
-			try {
-				IJavaProject javaProj = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
-				if (javaProj != null) {
-					javaClasspath = getClasspathForJavaProject(javaProj);
-					for (int j = 0; j < javaClasspath.length; j++) {
-						projectClasspath.add(javaClasspath[j]);
-					}
-				}
-			} catch (CoreException e) {
-				// not able to get Java classpath, just ignore
-			}	
-		}
-		
-		return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
-	}
-
-	// Need to get all modules in the project. If there's a EAR module, get the utility JARs 
-	private String[] getUtilityJarClasspath(IProject project) {
-		String[] moduleClasspath = new String[0];
-		ArrayList utilityJarsClasspath = new ArrayList();
-		
-		String module;
-		IVirtualComponent comp = ComponentCore.createComponent(project);
-		module = comp.getName();
-		if (J2EEUtils.isEARComponent(comp)) {
-			moduleClasspath = getClasspathForEARProject(project, module);
-			for (int j = 0; j < moduleClasspath.length; j++) {
-				utilityJarsClasspath.add(moduleClasspath[j]);
-			}
-		}
-
-		return (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
-	}
-	
-	private String[] getClasspathForEARProject(IProject project, String module) {
-		IPath projectPath =
-			project.getProject().getLocation().addTrailingSeparator().append(module).addTrailingSeparator();
-		return getDirectoryJarFiles(projectPath);
-	}
-
-	private String[] getDirectoryJarFiles(IPath iPath) {
-		File dir = iPath.toFile();
-		Vector jarsVector = new Vector();
-		if (dir.exists() && dir.isDirectory()) {
-			String[] filenames = dir.list();
-			for (int i = 0; i < filenames.length; i++) {
-				if (filenames[i].endsWith(DOT_JAR))
-					jarsVector.add(path2String(iPath) + filenames[i]);
-			}
-		}
-		String[] jars = new String[jarsVector.size()];
-		jarsVector.copyInto(jars);
-		return jars;
-	}
-
-	private String[] getWEBINFLib(IProject project, String module) {
-		String[] webinfLibJars = new String[0];
-		ArrayList anArrayList = new ArrayList();
-		try {			
-					IVirtualComponent component = ComponentCore.createComponent(project, module);
-					if (component != null) {
-						
-						IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
-								WEBINF_LIB));
-						if (webInfLib != null) {
-							IVirtualResource[] resources = webInfLib.members();
-							IResource aResource = null;
-							for (int i = 0; i < resources.length; i++) {
-								aResource = resources[i].getUnderlyingResource();
-								if (JAR.equalsIgnoreCase(aResource.getFileExtension()))
-									anArrayList.add( aResource.getLocation().toOSString());
-							}
-							if (anArrayList.size() != 0)
-								webinfLibJars = (String[]) anArrayList.toArray(new String[anArrayList.size()]);
-							}
-					}
-				} catch (CoreException e) {
-				}
-		return webinfLibJars;
-	}
-
-	private String[] getClasspathForJavaProject(IJavaProject javaProject) {
-		ArrayList projectClasspath = new ArrayList();
-		try {
-			IClasspathEntry[] buildPath =
-				javaProject.getResolvedClasspath(true);
-			for (int i = 0; i < buildPath.length; i++) {
-				String[] buildPathString =
-					classpathEntry2String(
-						buildPath[i],
-						javaProject.getProject());
-				for (int j = 0; j < buildPathString.length; j++) {
-					if (!excludeJar(buildPathString[j]))
-						projectClasspath.add(buildPathString[j]);
-				}
-			}
-		} catch (JavaModelException jme) {
-		}
-
-		String[] utilityJarsClasspath;
-		IProject project = javaProject.getProject();
-		IProject[] referencingProjects = project.getReferencingProjects();
-		for (int i = 0; i < referencingProjects.length; i++) {
-			utilityJarsClasspath = getUtilityJarClasspath(referencingProjects[i]);
-			for (int j = 0; j < utilityJarsClasspath.length; j++) {
-				projectClasspath.add(utilityJarsClasspath[j]);
-			}
-		}
-
-		return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
-	}
-
-	// workaround for Axis-2146 - exclude JARs which may include javax.activation.DataHandler 
-	// from the classpath passed to Axis emitter
-	
-	private boolean excludeJar(String buildPathString) {
-		
-		for (int i=0; i<JARLIST.length; i++) {
-			if (buildPathString.toLowerCase().endsWith(JARLIST[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private String[] classpathEntry2String(
-		IClasspathEntry entry,
-		IProject project) 
-	{
-		switch (entry.getEntryKind()) {
-			case IClasspathEntry.CPE_LIBRARY :
-			{
-				return new String[] { path2String(entry.getPath())};	
-			}
-			case IClasspathEntry.CPE_PROJECT :
-			{			
-				return getClasspath(
-					ResourcesPlugin.getWorkspace().getRoot().getProject(
-						entry.getPath().lastSegment()), true, "");
-			}
-			case IClasspathEntry.CPE_SOURCE :
-				{
-					IPath path = entry.getPath();
-					if (path.segment(0).equals(project.getName()))
-						path = path.removeFirstSegments(1);
-					return new String[] {
-						path2String(
-							project
-								.getLocation()
-								.addTrailingSeparator()
-								.append(
-								path))};
-				}
-			case IClasspathEntry.CPE_VARIABLE :
-			{
-				return classpathEntry2String(
-					JavaCore.getResolvedClasspathEntry(entry),
-					project);
-			}
-			default :
-			{
-				return new String[] { path2String(entry.getPath())};
-			}
-		}
-	}
-
-	private String path2String(IPath path) {
-		return path.toOSString();
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
deleted file mode 100644
index 604d27a79..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class FileUtil
-{
-  public FileUtil()
-  {
-    super();
-  }
-
-  public static void copyFile(String src, String dest)
-  {
-    InputStream is = null;
-    FileOutputStream fos = null;
-    
-    try
-    {
-      is = new FileInputStream(src);
-      fos = new FileOutputStream(dest);
-      int c = 0;
-      byte[] array = new byte[1024];
-      while ((c = is.read(array)) >= 0)
-      {
-        fos.write(array, 0, c);
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally
-    {
-      try
-      {
-        fos.close();
-        is.close();
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  public static File createFileAndParentDirectories(String fileName) throws Exception
-  {
-    File file = new File(fileName);
-    File parent = file.getParentFile();
-    if (!parent.exists())
-    {
-      parent.mkdirs();
-    }
-    file.createNewFile();
-    return file;
-  }
-
-  public static void deleteDirectories(File dir) throws Exception
-  {
-    File[] children = dir.listFiles();
-    for (int i = 0; i < children.length; i++)
-    {
-      if (children[i].list() != null && children[i].list().length > 0)
-      {
-        deleteDirectories(children[i]);
-      }
-      else
-      {
-        children[i].delete();
-      }
-    }
-    dir.delete();
-  }
-
-  /**
-   * Creates a folder and all parent folders if not existing Project must exist
-   */
-  public static void createFolder(IFolder folder, boolean force, boolean local) throws CoreException
-  {
-    if (!folder.exists())
-    {
-      IContainer parent = folder.getParent();
-      if (parent instanceof IFolder)
-      {
-        createFolder((IFolder)parent, force, local);
-      }
-      folder.create(force, local, new NullProgressMonitor());
-    }
-  }
-
-  public static void createTargetFile(String sourceFileName, String targetFileName) throws Exception
-  {
-    createTargetFile(sourceFileName, targetFileName, false);
-  }
-
-  public static void createTargetFile(String sourceFileName, String targetFileName, boolean overwrite) throws Exception
-  {
-    File idealResultFile = new File(targetFileName);
-    if (overwrite || !idealResultFile.exists())
-    {
-      FileUtil.createFileAndParentDirectories(targetFileName);
-      FileUtil.copyFile(sourceFileName, targetFileName);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
deleted file mode 100644
index cb652a18a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-public class PlatformUtils {
-
-	public static final String PLATFORM_ROOT = "platform:/resource";
-	public static final String WIN_FILE_PROTOCOL = "file:/";
-	public static final String LNX_FILE_PROTOCOL = "file://";
-	public static final String PLATFORM = "platform";
-	public static final String RESOURCE = "/resource";
-
-	private PlatformUtils() {
-	}
-
-	/**
-	* Returns the string representation of platform URL given an IPath
-	* @param IPath path
-	* @return String platformURL
-	*/
-	public static String getPlatformURL(IPath path) {
-		String platformURL;
-		platformURL = URI.createPlatformResourceURI(path.toString()).toString();
-		// old method: file system representation
-		// 	platformURL = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation().toString();
-		return platformURL;
-	}
-
-	/**
-	* Returns the URL representation of the Platform URL given an IPath
-	* The PlatformResourceManager underdstands this format and therefore
-	* this is suited for command URL's
-	* @param IPath path
-	* @return URL Platform URL
-	*/
-	public static URL getCommandPlatformURL(IPath path) {
-		URL url = null;
-		try {
-			url = new URL(PLATFORM, null, RESOURCE + path.toString());
-		} catch (MalformedURLException e) {
-			return url;
-		}
-		return url;
-	}
-
-	/**
-	* Returns the string representation of path given platform URL string
-	* @param String platform URL string
-	* @return String path string
-	*/
-	public static String getPathFromPlatform(String platformStr) {
-		String pathStr = platformStr;
-
-		String rootLocation;
-		rootLocation = PLATFORM_ROOT;
-		// old method: file system representation
-		//	rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-		if (platformStr.startsWith(rootLocation))
-			pathStr = platformStr.substring(rootLocation.length());
-		return pathStr;
-	}
-
-	/**
-	* Returns the string representation of platform URL given the path string
-	* @param String path string
-	* @return String platform URL string
-	*/
-	public static String getPlatformFromPath(String pathStr) {
-		String platformStr = pathStr;
-
-		String rootLocation;
-		rootLocation = PLATFORM_ROOT;
-		// old method: file system representation
-		//	rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-		platformStr = rootLocation + pathStr;
-		return platformStr;
-	}
-
-	/**
-	* Returns the string representation of the local file system file given platform URL string
-	* @param String platform URL string
-	* @return String file string
-	*/
-	public static String getFileFromPlatform(String platformStr) {
-		String fileStr = platformStr;
-		String pathStr = getPathFromPlatform(platformStr);
-
-		fileStr =
-			ResourcesPlugin
-				.getWorkspace()
-				.getRoot()
-				.getFile(new Path(pathStr))
-				.getLocation()
-				.toString();
-
-		// old method: file system representation
-		//	Do nothing
-
-		return fileStr;
-	}
-
-	/**
-	* Returns the file protocol representation of the local file system file given platform URL string
-	* @param String platform URL string
-	* @return String the file protocol uri
-	*/
-	public static String getFileURLFromPlatform(String platformStr) {
-		String fileStr = platformStr;
-		String pathStr = getPathFromPlatform(platformStr);
-		try {
-			fileStr =
-				ResourcesPlugin
-					.getWorkspace()
-					.getRoot()
-					.getFile(new Path(pathStr))
-					.getLocation()
-					.toFile()
-					.toURL()
-					.toString();
-		} catch (MalformedURLException murle) {
-			fileStr = getFileURLFromPath(new Path(pathStr));
-		}
-		return fileStr;
-	}
-
-	/**
-	* Returns the file protocol representation of a local file
-	* @param IPath the Path object representing the file
-	* @return String the file protocol uri
-	*/
-	public static String getFileURLFromPath(IPath path) {
-
-		String file = null;
-		if (path != null) {
-			if (!path.isAbsolute()) {
-				file =
-					ResourcesPlugin
-						.getWorkspace()
-						.getRoot()
-						.getFile(path)
-						.getLocation()
-						.toString();
-				if (file.charAt(0) == IPath.SEPARATOR) {
-					file = LNX_FILE_PROTOCOL + file;
-				} else {
-					file = WIN_FILE_PROTOCOL + file;
-				}
-			} else {
-				file = path.toString();
-			}
-			if (file != null && file.charAt(0) == IPath.SEPARATOR) {
-				file = LNX_FILE_PROTOCOL + file;
-			} else {
-				file = WIN_FILE_PROTOCOL + file;
-			}
-		}
-		return file == null ? null : file;
-
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
deleted file mode 100644
index f2acb5c46..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import org.apache.axis.wsdl.toJava.Utils;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public class WSDLUtils {
-
-  private static final String DOT = ".";
-
-  /**
-  * These are java keywords as specified at the following URL (sorted alphabetically).
-  * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
-  * Note that false, true, and null are not strictly keywords; they are literal values,
-  * but for the purposes of this array, they can be treated as literals.
-  */
-  static final String keywords[] =
-  {
-      "abstract",  "boolean",      "break",      "byte",      "case",
-      "catch",     "char",         "class",      "const",     "continue",
-      "default",   "do",           "double",     "else",      "extends",
-      "false",     "final",        "finally",    "float",     "for",
-      "goto",      "if",           "implements", "import",    "instanceof",
-      "int",       "interface",    "long",       "native",    "new",
-      "null",      "package",      "private",    "protected", "public",
-      "return",    "short",        "static",     "strictfp",  "super",
-      "switch",    "synchronized", "this",       "throw",     "throws",
-      "transient", "true",         "try",        "void",      "volatile",
-      "while"
-  };
-
-  /** Collator for comparing the strings */
-  static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
-
-  /** Use this character as suffix */
-  static final char keywordPrefix = '_';
-
-  private WSDLUtils() {
-  }
-
-  /**
-  * Returns the name of the first service element in the WSDL definition.
-  * @return String service element name
-  */
-  public static String getServiceElementName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-  	return service.getQName().getLocalPart();
-  }
-
-  /**
-  * Returns the name of the port type element points to by the first service and port element in the WSDL definition.
-  * @return String port type element name
-  */
-  public static String getPortTypeName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-    while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) {
-           Binding binding = port.getBinding();
-           return binding.getPortType().getQName().getLocalPart();
-        }
-      }
-    }
-    return "";
-  
-  }
-
-  /**
-  * Returns the name of the port element in the WSDL definition.
-  * @return String port name
-  */
-  public static String getPortName(Definition definition) {
-  	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-    while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) 
-          return port.getName();
-      }  
-    }
-     return "";
-  }
-
-
-
-  public static String makeNamespace (String clsName) {
-	  return makeNamespace(clsName, "http");
-  }
-
-  /**
-   * Make namespace from a fully qualified class name
-   * and the given protocol
-   *
-   * @param clsName fully qualified class name
-   * @param protocol protocol String
-   * @return namespace namespace String
-   */
-  public static String makeNamespace (String clsName, String protocol) {
-	  if (clsName.lastIndexOf('.') == -1)
-		  return protocol + "://" + "DefaultNamespace";
-	  String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
-	  return makeNamespaceFromPackageName(packageName, protocol);       
-  }
-
-    
-  private static String makeNamespaceFromPackageName(String packageName, String protocol) {
-	  if (packageName == null || packageName.equals(""))
-		  return protocol + "://" + "DefaultNamespace";
-	  StringTokenizer st = new StringTokenizer( packageName, "." );
-	  String[] words = new String[ st.countTokens() ];
-	  for(int i = 0; i < words.length; ++i)
-		  words[i] = st.nextToken();
-
-	  StringBuffer sb = new StringBuffer(80);
-	  for(int i = words.length-1; i >= 0; --i) {
-		  String word = words[i];
-		  // seperate with dot
-		  if( i != words.length-1 )
-			  sb.append('.');
-		  sb.append( word );
-	  }
-	  return protocol + "://" + sb.toString();
-  }
-
-  /**
-  * Return a Definition for the wsdl url given 
-  *
-  */
-  public static Definition getWSDLDefinition(String wsdlURL)
-  {
-    if(wsdlURL == null) return null;
-
-    WSDLFactory wsdlFactory;
-    Definition definition = null;
-    try {
-      wsdlFactory = new WSDLFactoryImpl();
-      WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
-      definition = wsdlReader.readWSDL(wsdlURL);
-    } 
-    catch (Exception e) { // can be WSDLException or IOException
-      return null;
-    }
-    return definition;
-  }
-
-  public static String getPackageName(Definition definition)
-  {
-     if (definition != null)
-     {
-        String namespace = definition.getTargetNamespace();
-        return namespaceURI2PackageName(namespace);
-     }
-     return "";
-  }
-
-  public static String getPackageNameForBindingImpl(Port port, Map ns2pkgMap)
-  {
-    if (port != null && ns2pkgMap != null)
-    {
-      Binding binding = port.getBinding();
-      QName bndQName = binding.getQName();
-      String namespace = bndQName.getNamespaceURI();
-      Object pkg = ns2pkgMap.get(namespace);
-      if (pkg != null)
-        return (String)pkg;
-    }
-    return getPackageNameForBindingImpl(port);
-  }
-
-  public static String getPackageNameForBindingImpl(Definition definition, Map ns2pkgMap)
-  {
-    if (definition != null && ns2pkgMap != null)
-    {
-      Service service = (Service) definition.getServices().values().iterator().next();
-      Port port = (Port) service.getPorts().values().iterator().next();
-      return getPackageNameForBindingImpl(port, ns2pkgMap);
-    }
-    return getPackageNameForBindingImpl(definition);
-  }
-
-  public static String getPackageNameForBindingImpl(Definition definition)
-  {
-    Port port = null;
-    if (definition != null)
-    {
-      Service service = (Service)definition.getServices().values().iterator().next();
-      port = (Port)service.getPorts().values().iterator().next();
-    }
-    return getPackageNameForBindingImpl(port);
-  }
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the binding namespace as the package name
-// of the BindingImpl class.
-public static String getPackageNameForBindingImpl(Port port)
-{
-   if (port != null)
-   {
-	  Binding binding = port.getBinding();
-//	  PortType portType = binding.getPortType();
-	  QName bndQName = binding.getQName();
-	  String namespace = bndQName.getNamespaceURI();
-	  return namespaceURI2PackageName(namespace);
-   }
-   return "";
-}
-
-/**
-* Get the namespace for the Port Type
-* 
-*/
-public static String getPortTypeNamespace(Definition definition)
-{
-  String namespace = "";
-  if (definition != null)
-  {
-	Service service = (Service) definition.getServices().values().iterator().next();
-    Iterator iterator = service.getPorts().values().iterator(); 
-	while(iterator.hasNext()){
-      Port port = (Port) iterator.next();
-      for (int i=0; i<port.getExtensibilityElements().size();i++) {
-        if (port.getExtensibilityElements().get(i) instanceof SOAPAddress){ 
-	      PortType portType = port.getBinding().getPortType();
-	      QName bndQName = portType.getQName();
-	      namespace = bndQName.getNamespaceURI();
-      	}  
-	  }
-  	}
-  }  
-  return namespace;
-}
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the porttype namespace as the package name
-// of the Java class (in ejb).
-public static String getPackageNameForPortType(Definition definition)
-{
-   if (definition != null)
-   {
-	  String namespace = getPortTypeNamespace(definition);
-	  return namespaceURI2PackageName(namespace);
-    }
-    return "";
-}
-
-  /**
-  * checks if the input string is a valid java keyword.
-  * @return boolean true/false
-  */
-  public static boolean isJavaKeyword(String keyword) {
-    return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
-  }
-
-  /**
-  * Turn a java keyword string into a non-Java keyword string.  (Right now
-  * this simply means appending an underscore.)
-  */
-  public static String makeNonJavaKeyword(String keyword){
-    return  keywordPrefix + keyword;
-  }
-
-  public static String getFullyQualifiedPortTypeName(Definition definition)
-  {
-    StringBuffer beanName = new StringBuffer();
-    beanName.append(getPackageNameForPortType(definition)); 
-    beanName.append(DOT);
-    beanName.append(getPortTypeName(definition));
-    return beanName.toString();
-
-  }
-
-  /**
-   * getName
-   * @param uri String
-   * @return get the file name after the last \ and /
-   */
-  public static String getName(String uri) {
-
-	// Get everything after last slash or backslash
-	int bslash = uri.lastIndexOf("\\");
-	int slash = uri.lastIndexOf("/");
-	int i =  bslash > slash ? bslash : slash;
-	String fileName = uri.substring(i+1).replace('?', '.');
-
-	return fileName;
-  }
-
-
-/**
- * getWSDLName
- * @param uri String
- * @return get the file name after the last \ and /, trimmed, defaulted to
- *         "default.wsdl" if there is no name, and ending with ".wsdl".
- */
- public static String getWSDLName(String uri) {
-
-	// Get everything after last slash or backslash from input URI
-	// with no whitespace.
-	String WSDLName = getName(uri).trim();
-
-	// if empty, return the default "default.wsdl"
-	if ( WSDLName.equals( "" ) ) {
-		WSDLName = "default.wsdl";
-	}
-
-	// make sure name ends with ".wsdl", lower case.
-	else {
-		if ( ! WSDLName.endsWith( ".wsdl" ) ) {
-			if ( WSDLName.toLowerCase().endsWith( ".wsdl" ) ) {
-				int lastDot = WSDLName.lastIndexOf(".");
-				WSDLName = WSDLName.substring( 0, lastDot ) + ".wsdl";
-			}
-			else {
-				WSDLName = WSDLName + ".wsdl";
-			}
-		}
-	}
-
-	return WSDLName;
- }
-
- /**
-  * getPortTypeNameFromBeanName
-  * @param beanname String
-  * @return get the port type name based on the bean name
-  */
-  public static String getPortTypeNameFromBeanName(String beanName) {
-    return beanName.substring(beanName.lastIndexOf('.') + 1);	
-  }
-
-  public static String getPackageName(Service service, Map ns2pkgMap)
-  {
-    if (service != null)
-    {
-      String namespace = service.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-  public static String getPackageName(Port port, Map ns2pkgMap)
-  {
-    if (port != null)
-      return getPackageName(port.getBinding(), ns2pkgMap);
-    else
-      return "";
-  }
-
-  public static String getPackageName(Binding binding, Map ns2pkgMap)
-  {
-    if (binding != null)
-    {
-      String namespace = binding.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-  public static String getPackageName(PortType portType, Map ns2pkgMap)
-  {
-    if (portType != null)
-    {
-      String namespace = portType.getQName().getNamespaceURI();
-      if (ns2pkgMap != null)
-      {
-        Object pkg = ns2pkgMap.get(namespace);
-        if (pkg != null)
-          return (String)pkg;
-      }
-      return namespaceURI2PackageName(namespace);
-    }
-    else
-      return "";
-  }
-
-
-  /**
-   * namespaceURI2PackageName
-   * @param namespaceURI
-   * @return package name based on namespace
-   */
-  public static String namespaceURI2PackageName(String namespaceURI)
-  {
-  	/**
-  	 * TODO:  The makePackageName method from 
-  	 * org.apache.axis.wsdl.toJava.Utils in axis-1_1 is called to map namespace to package name.  
-  	 * This will be replaced with an extension point to plug in runtime emitter specific namespace to 
-  	 * package mapping algorithm 
-  	 */
-  	return Utils.makePackageName(namespaceURI);
-  	
-//    StringBuffer sb = new StringBuffer(80);
-//    if (namespaceURI != null && namespaceURI.length() > 0)
-//    {
-//      String hostname = null;
-//      try
-//      {
-//        hostname = new URL(namespaceURI).getHost();
-//      }
-//      catch (MalformedURLException e)
-//      {
-//        int index = namespaceURI.indexOf(":");
-//        if (index > -1)
-//        {
-//          hostname = namespaceURI.substring(index+1);
-//          index = hostname.indexOf("/");
-//          if (index > -1)
-//            hostname = hostname.substring(0, index);
-//        }
-//        else
-//          hostname = namespaceURI;
-//      }
-//      
-//	  // if we didn't file a hostname, bail
-//	  if (hostname == null) {
-//		  return null;
-//	  }
-//
-//      //convert illegal java identifier
-//      hostname = hostname.replace('-', '_');
-//      // tokenize the hostname and reverse it
-//      StringTokenizer st = new StringTokenizer(hostname, ".");
-//      String[] words = new String[st.countTokens()];
-//      for (int i = 0; i < words.length; ++i)
-//        words[i] = st.nextToken();
-//      for(int i = words.length-1; i >= 0; --i)
-//      {
-//        String word = words[i];
-//        if (isJavaKeyword(word))
-//          word = makeNonJavaKeyword(word);
-//        // seperate with dot
-//        if (i != words.length-1)
-//          sb.append('.');
-//        // convert digits to underscores
-//        if (Character.isDigit(word.charAt(0)))
-//          sb.append('_');
-//          sb.append(word);
-//      }
-//    }
-//    return normalizePackageName(sb.toString(), DOT.charAt(0));
-  }
-
-  
-  public static String resolveDotInPortName(String name) {
-	if(name.indexOf(".")<0)
-	{
-		return name;
-	}
-    StringBuffer sb = new StringBuffer();
-    boolean afterDot = false;
-    for(int i=0; i<name.length(); i++)
-    {
-    	if(name.charAt(i)=='.')
-    	{
-    		afterDot = true;
-    	}
-    	else if(afterDot)
-    	{
-    		sb.append(name.substring(i,i+1).toUpperCase());
-    		afterDot=false;
-    	}
-    	else
-    	{
-    		sb.append(name.charAt(i));
-    	}
-    }
-    return sb.toString();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
deleted file mode 100644
index 267156313..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class AxisMappingsFragment extends BooleanFragment
-{
-  private boolean showMappings_;
-
-  public AxisMappingsFragment()
-  {
-    super();
-    setTrueFragment( new SimpleFragment( "AxisMappingsWidget" ));
-    setCondition( new Condition()
-                  {
-                    public boolean evaluate()
-                    {
-                      return showMappings_;
-                    }
-                  } );
-  }
-  
-  public void setShowMapping( boolean showMappings )
-  {
-    showMappings_ = showMappings;
-  }      
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
deleted file mode 100644
index b82a52dc8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class AxisMappingsWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  private TableViewerWidget mappings_;
-
-  private byte mode_;
-  private JavaWSDLParameter javaParameter_;
-
-  public static final byte MODE_BEAN2XML = (byte)0;
-  public static final byte MODE_XML2BEAN = (byte)1;
-  public static final byte MODE_XML2PROXY = (byte)2;
-  public static final byte MODE_XML2EJB = (byte)3;
-  public static final byte MODE_EJB2XML = (byte)4;
-  
-  private final String DEFAULT_PACKAGE = "default.javapackage";
-  private final String DEFAULT_NAMESPACE = "http://default.namespace";
-  
-  /*CONTEXT_ID PWJM0001 for the WSDL to Java Mappings Page*/
-  private String INFOPOP_PWJM_PAGE = "PWJM0001"; //$NON-NLS-1$
-  
-  public AxisMappingsWidget( byte mode )
-  {
-    mode_ = mode;
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-        
-    // TODO The TOOLTIP_PWJM_PAGE key doesn't seem to exist anywhere???
-	//parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWJM_PAGE" ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJM_PAGE );
-    
-    Text mappingLabel = new Text( parent, SWT.READ_ONLY | SWT.WRAP );
-    mappingLabel.setText( msgUtils.getMessage( "LABEL_MAPPING_PAIRS" ) );
-    mappingLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-                                               
-    List initValues = new ArrayList();
-    
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML) 
-    {
-		String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE"),
-		                     msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE" )};
-		mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_PACKAGE, DEFAULT_NAMESPACE}, TableViewerWidget.MAP_ONE_TO_ONE); //$NON-NLS-1$
-    }
-	else 
-	{
-      	String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE"),
-		                     msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE")};
-		mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_NAMESPACE, DEFAULT_PACKAGE }, TableViewerWidget.MAP_MANY_TO_ONE); //$NON-NLS-1$
-	}
-    
-	mappings_.addControls( parent, statusListener );
-   
-    return this;
-  }
-  
-  public IStatus getStatus()
-  {
-    return mappings_.getStatus();  
-  }
-  
-  public void setJavaParameter( JavaWSDLParameter parameter )
-  {
-    javaParameter_ = parameter;
-  }
-  
-  public JavaWSDLParameter getJavaParameter()
-  {
-    if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML || mode_ == MODE_XML2BEAN || mode_ == MODE_XML2PROXY)
-    {
-      //Set the mappings on javaParameter
-      TableItem[] pairs = mappings_.getItems();
-  	  HashMap map = new HashMap();
-  	  for (int i=0; i<pairs.length; i++)
-  	  {
-  		map.put(pairs[i].getText(0),pairs[i].getText(1));
-  	  }
-  	  javaParameter_.setMappings(map);
-  	  
-  	  //Set the namespace on the javaParameter
-  	  String beanName = javaParameter_.getBeanName();
-	  if(beanName != null && !beanName.equals(""))
-	  {
-		String packageName = beanName.substring(0, beanName.lastIndexOf('.'));
-		if(map.containsKey(packageName))
-		{
-		  String tns = (String)map.get(packageName);
-		  javaParameter_.setNamespace(tns);
-		}		
-	  }
-
-    }
-    return javaParameter_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
deleted file mode 100644
index ffe4c672b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class AxisProxyWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-  
-  /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
-  private final String INFOPOP_PWJB_PAGE = "PWJB0001";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_PAGE = "TOOLTIP_PWJB_PAGE";
-		
-  private Text folderText_;
-  /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
-  private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_TEXT_FOLDER = "TOOLTIP_PWJB_TEXT_FOLDER";
-
-  private Button genProxyCheckbox_;
-  /*CONTEXT_ID PWJB0009 Indicates whether to generate a proxy or not. */
-  private final String INFOPOP_PWJB_CHECKBOX_GENPROXY = "PWJB0009";	//$NON-NLS-1$
-  private final String TOOLTIP_PWJB_CHECKBOX_GENPROXY = "TOOLTIP_PWJB_CHECKBOX_GENPROXY";
-		
-  private Button showMappingsCheckbox_;
-  /*CONTEXT_ID PWJB0016 for the Show Mappings checkbox of the Bean Methods Page*/
-  private String INFOPOP_N2P_SHOW_MAPPINGS = "PWJB0016"; //$NON-NLS-1$
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ );
-    
-	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PWJB_PAGE ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." +  INFOPOP_PWJB_PAGE);
-    
-    genProxyCheckbox_ = uiUtils.createCheckbox( parent, "CHECKBOX_GENPROXY",
-                                                TOOLTIP_PWJB_CHECKBOX_GENPROXY,
-                                                INFOPOP_PWJB_CHECKBOX_GENPROXY );
-    genProxyCheckbox_.addListener( SWT.Selection, statusListener );
-    
-    genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
-                                            {
-                                              public void widgetSelected( SelectionEvent evt )
-                                              {
-                                                handleGenProxy();  
-                                              }
-                                            });
-    
-    Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-    
-    folderText_ = uiUtils.createText( textGroup, "LABEL_FOLDER_NAME",
-                                      TOOLTIP_PWJB_TEXT_FOLDER,
-                                      INFOPOP_PWJB_TEXT_FOLDER,
-                                      SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    folderText_.addListener( SWT.Modify, statusListener );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
-                                                    "TOOLTIP_N2P_SHOW_MAPPINGS",
-                                                    INFOPOP_N2P_SHOW_MAPPINGS );
-    // Since this widget affects whether the next page is shown or not we
-    // need to add the statusListener.
-    showMappingsCheckbox_.addListener( SWT.Selection, statusListener );
-    
-    return this;
-  }
-  
-  private void handleGenProxy()
-  {
-    boolean enabled = genProxyCheckbox_.getSelection();
-    
-    folderText_.setEnabled( enabled );
-    showMappingsCheckbox_.setEnabled( enabled );
-  }
-  
-  public void setProxyFolder( String proxyFolder )
-  {
-    folderText_.setText( proxyFolder );  
-  }
-  
-  public String getProxyFolder()
-  {
-     return folderText_.getText();  
-  }
-  
-  public void setGenerateProxy( Boolean genProxy )
-  {
-    genProxyCheckbox_.setSelection( genProxy.booleanValue() );
-  }    
-  
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( genProxyCheckbox_.getSelection() );
-  }   
-  
-  public void setCustomizeClientMappings( boolean showMappings )
-  {
-    showMappingsCheckbox_.setSelection( showMappings );
-  }            
-  
-  public boolean getCustomizeClientMappings()
-  {
-    return showMappingsCheckbox_.getSelection() && genProxyCheckbox_.getSelection();
-  }   
-  
-  public void setIsClientScenario( boolean isClientScenario )
-  {
-    genProxyCheckbox_.setEnabled( !isClientScenario ); 
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
deleted file mode 100644
index e3e7a03a6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,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
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-  * Developers who are adding web service clients into the wizard should create
-  * a class that implements this interface.  
-**/
-public class WebServiceClientAxisType implements CommandWidgetBinding 
-{
-
-	
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-  	// AxisClientDefaultingCommand  	
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "CustomizeClientMappings", AxisProxyWidget.class );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);    
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);    
-    dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-    
-    // AxisProxyWidget
-    dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
-    
-    //AxisMappingsWidget
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForClientJavaWSDLCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ValidateWSDLCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null); //OK
-	dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Stub2BeanCommand.class, "JavaWSDLParam", null); //OK
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    String       pluginId_     = "org.eclipse.jst.ws.consumption.ui";
-    String       axisPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    MessageUtils axisMsgUtils = new MessageUtils( axisPluginId_ + ".plugin", this );
-    
-    widgetRegistry.add( "AxisClientStart", 
-        axisMsgUtils.getMessage("PAGE_TITLE_WS_AXIS_PROXY"),
-        axisMsgUtils.getMessage("PAGE_DESC_WS_AXIS_PROXY"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisProxyWidget();
-          }
-        } );
-    
-    widgetRegistry.add( "AxisClientBeanMapping", 
-        axisMsgUtils.getMessage("PAGE_TITLE_WS_XML2PROXY"),
-        msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-          {
-            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
-          }
-        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               //dead code - doesn't matter what gets returned here.
-               return new SimpleFragment();
-             }
-           };
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index dbb43b648..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             proxyConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private AxisProxyWidget                     proxyWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisClientConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WebServiceClientAxisType() );
-	  
-	  proxyConfigWidget_ = adapter_.getWidget( "AxisClientStart" );
-	  proxyWidget_       = (AxisProxyWidget)proxyConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisClientBeanMapping" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return proxyConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == proxyConfigWidget_ && proxyWidget_.getCustomizeClientMappings() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index c6283ef88..000000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientInputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientOutputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{		
-
-	public AxisWebServiceClient(WebServiceClientInfo info)
-	{
-		super(info);
-		// TODO Auto-generated constructor stub
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-    EclipseEnvironment environment = (EclipseEnvironment)env;
-		registerDataMappings( environment.getCommandManager().getMappingRegistry());
-		
-		Vector commands = new Vector();
-		commands.add(new AxisClientInputCommand(this, ctx, project, module));
-		commands.add(new AxisClientDefaultingCommand(module));
-//		commands.add(new SimpleFragment("AxisClientStart"));
-//		commands.add(new SimpleFragment("AxisClientBeanMapping"));
-		commands.add(new DefaultsForHTTPBasicAuthCommand());
-		commands.add(new CopyAxisJarCommand(module));
-		commands.add(new DefaultsForClientJavaWSDLCommand(module));
-		commands.add(new ValidateWSDLCommand());
-		commands.add(new WSDL2JavaCommand());
-		commands.add(new RefreshProjectCommand());
-		commands.add(new Stub2BeanCommand(module));
-		commands.add(new AxisClientOutputCommand(this,ctx,module));
-		commands.add(new BuildProjectCommand());
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-		
-	public void registerDataMappings(DataMappingRegistry registry) 
-	{
-		// AxisClientDefaultingCommand
-		registry.addMapping(AxisClientInputCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
-				new StringToIProjectTransformer());
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-//				null);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-//				"ClientProjectEAR", new StringToIProjectTransformer());
-		registry.addMapping(AxisClientInputCommand.class, "WsdlURL", AxisClientDefaultingCommand.class); // URI
-																																	// to
-		// URL
-		// transformer
-		// req'd??
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-//				"TestProxySelected", null);
-		registry.addMapping(AxisClientInputCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-//		registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
-		registry.addMapping(AxisClientInputCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
-		// DefaultsForHTTPBasicAuthCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK    
-		
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
-
-		// DefaultsForClientJavaWSDLCommand() // javaParam_, model_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
-				null);
-		//		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
-		// DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
-		// //
-		// URL to URL??
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
-		// to
-		// URL??
-		// ValidateWSDLCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-		// WSDL2JavaCommand() // javaParam_
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
-																													// to
-																													// URI??
-		// RefreshProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
-		// Stub2BeanCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
-		// BuildProjectCommand()
-		registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-		registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-		
-		registry.addMapping(Stub2BeanCommand.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-//		registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index eeab59f90..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 0a3d1e91a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.axis.creation.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-		<project>org.eclipse.jst.ws.axis.consumption.core</project>
-		<project>org.eclipse.jst.ws.axis.consumption.ui</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.creation.ui</project>
-		<project>org.eclipse.jst.ws.discovery.core</project>
-		<project>org.eclipse.jst.ws.ui</project>
-		<project>org.eclipse.wst.wsdl</project>
-		<project>org.eclipse.wst.ws.parser</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ee814f368..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,46 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.creation.ui,
- org.eclipse.jst.ws.internal.axis.creation.ui.command,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin,
- org.eclipse.jst.ws.internal.axis.creation.ui.task,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.jem.workbench,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jem.util,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html b/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index 391fee07f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               deploy.xsl,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164ac..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0"
-    xmlns:xalan="http://xml.apache.org/xslt"
-    xmlns:ns1="http://xml.apache.org/axis/wsdd/"
-    xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-    <xsl:output method="xml" encoding="UTF-8"/>
-  
-   <xsl:param name="newClassName" select="ss"/>
-   
-    <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
-    <xsl:copy>
-       <xsl:attribute name="name">className</xsl:attribute>
-       	 <xsl:attribute name="value"> 	
-  			<xsl:value-of select="$newClassName"/>  	 	
-       	 </xsl:attribute>
-       	<xsl:apply-templates/>
-       	</xsl:copy>
-    </xsl:template>
-    
-    <xsl:template match="@*|node()">
-    	<xsl:copy>
-    		<xsl:apply-templates select="@*|node()"/>
-    	</xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index 9d1342e00..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse.org
-
-LABEL_RUNTIME_AXIS_11=Apache Axis
-DESC_RUNTIME_AXIS_11=Apache Axis
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index 6f820104d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-   
-   <!-- Server Defaulters -->
-   
-   <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
-      <serverDefaulter
-         class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
-      </serverDefaulter>
-   </extension>
-   
-   <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
-  	<webServiceRuntime
-    id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
-    label="%LABEL_RUNTIME_AXIS_11"
-    serviceTypes="org.eclipse.jst.ws.serviceType.java"
-    clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
-    servletLevels="23 24"
-    j2eeLevels="13 14"
-    servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50 org.eclipse.jst.server.tomcat.55 org.eclipse.jst.server.geronimo.10"
-    class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
-  	</webServiceRuntime>
-	</extension> 
-
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisBeanConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors"
-             class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisBeanConfigWidgetFactory"/>
-    </extension> 
-    
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="AxisSkeletonConfig"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors"
-             class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
-    </extension> 
-
-</plugin>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
deleted file mode 100644
index 667e1516c..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
+++ /dev/null
@@ -1,163 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_INTERAL=IWAB0512E Internal error
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_READ_WSDL=IWAB0516E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_PORT=IWAB0518E WSDL file at {0} has no port element
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-MSG_ERROR_LITERAL_SUPPORT_MESSAGE=IWAB0536E Axis 1.1 support for Document/Literal and Document/Literal (Wrapped) is minimal, thus the generated code may contain errors. RPC/Encoded is the recommended style and encoding selection.
-MSG_ERROR_INITIAL_SELECTION=IWAB0018E Error getting initial selection.
-
-
-#
-#JavaToWSDLMethodCommand
-#
-TASK_LABEL_JAVA_TO_WSDL=Create deployment descriptor document model from Java bean.
-TASK_DESC_JAVA_TO_WSDL=Creating deployment descriptor document model from Java bean.
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#DefaultsForServerJavaWSDLTask
-#
-TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS=DefaultsForJavaWSDLServer
-TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for server side.
-
-#
-#UpdateWEBXMLCommand
-#
-TASK_LABEL_UPDATE_WEB_XML=UpdateWEBXMLCommand
-TASK_DESC_UPDATE_WEB_XML=Update project's web.xml file with Axis servlets
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#DefaultsForWSDL2SkeletonTask
-#
-
-#
-#MoveDeploymentFilesTask
-#
-TASK_LABEL_MOVE_DEPLOYMENT_FILES=MoveDeploymentFilesTask
-TASK_DESC_MOVE_DEPLOYMENT_FILES=Move deploy.wsdd and undeploy.wsdd from Java Source to Web Content/WEB-INF
-
-#
-#MoveJavaFilesTask
-#
-TASK_LABEL_MOVE_JAVA_FILES=MoveJavaFilesTask
-TASK_DESC_MOVE_JAVA_FILES=Move server side java files
-
-#
-#Skeleton2WSDLTask
-#
-TASK_LABEL_SKELETON_WSDL=DefaultsForSkeleton2WSDLTask
-TASK_DESC_SKELETON_WSDL=Creates WSDL for a Java bean skeleton.
-
-#
-#UpdateAxisWSDDFileTask
-#
-TASK_LABEL_UPDATE_AXIS_WSDD=UpdateAxisWSDDFileTask
-TASK_DESC_UPDATE_AXIS_WSDD=Update Axis deploy.wsdd with actual service implementation class name
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigFragment
-#
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL Folder:
-LABEL_OUTPUT_FILE_NAME=WSDL File:
-
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-WS_DESC_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-
-#
-#WebServiceAxisBeanClassFragment
-#
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigFragment
-#
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and Use
-STYLE_RPC_LITERAL=Document/ Literal
-STYLE_DOC_LITERAL=Document/ Literal (Wrapped)
-STYLE_RPC_ENCODED=RPC/ Encoded
-
-#
-#WSDLConsumptionTaskFactory
-#
-
-#
-#CopyAxisServerConfigTask
-#
-
-TASK_LABEL_COPY_SERVER_CONFIG_FILES=Copy server-config.wsdd from the server location to the Web Project
-TASK_DESC_COPY_SERVER_CONFIG_FILES=Coping server-config.wsdd from the server location to the Web Project
-
-#
-#BUAxisInputCommand and BUAxisOutputCommand
-#
-
-TASK_LABEL_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_DESC_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_LABEL_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-TASK_DESC_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index ec448cf9d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-public class AxisOutputCommand extends AbstractDataModelOperation {
-
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-
-	private String            wsdlURI_;
-	  	  
-		/**
-		* Default CTOR
-		*/
-		public AxisOutputCommand() {
-		}
-		
-		public AxisOutputCommand(AxisWebService ws) {
-			ws_ = ws;
-		}
-		
-		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-		{
-		  	IStatus status = Status.OK_STATUS;  	
-		  	ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
-			AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
-			axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
-			ws_.setAxisWebServiceInfo(axisWSInfo);		    
-		  	
-		  	return status;      	
-		  }
-
-		  /**
-		   * @param wsdlURI
-		   *            The wsdlURI to set.
-		   */
-		  public void setWsdlURI(String wsdlURI)
-		  {
-		    wsdlURI_ = wsdlURI;
-		  }
-
-		public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
-			this.javaWSDLParam_ = javaWSDLParam_;
-		}
-		  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index f1e7c1b98..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-public class AxisRunInputCommand extends AbstractDataModelOperation{
-	
-	private AxisWebService ws_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private String serverProject_; 
-	
-	public AxisRunInputCommand() {
-	}
-	
-	public AxisRunInputCommand(AxisWebService ws, String project, String module) {
-		ws_ = ws;
-		serverProject_ = project; 
-	}
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-	 	javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-		
-		return Status.OK_STATUS;
-	  }
-	
-	 /**
-	   * @return Returns the serverProject.
-	   */
-	  public String getServerProject()
-	  {
-		  return serverProject_;
-	  }
-	  
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b78..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
-   */
-  public ServerInfo recommendDefaultServer(IProject project)
-  {    
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index 35e43fd1a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends AbstractDataModelOperation {
-	
-	private IWebService ws_;
-	private String serverProject_; 
-	private String serverModule_;
-	private String javaBeanName_;
-
-	  private String serviceServerTypeID_;
-	  
-		/**
-		* Default CTOR
-		*/
-		public BUAxisInputCommand() {
-		}
-		
-		public BUAxisInputCommand(IWebService ws, String project, String module) {
-			ws_ = ws;
-			serverProject_ = project; 
-			serverModule_ = module;	}
-		
-		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-		{
-	       
-		String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
-		String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
-		javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-		
-		IServer serviceExistingServer=null;
-		
-		if (serverInstanceId != null) { // server exists
-	    	serviceExistingServer = ServerCore.findServer(serverInstanceId);
-			if (serviceExistingServer != null)
-		    {
-		      serviceServerTypeID_ = serviceExistingServer.getServerType().getId();
-		    }
-	    }
-	    else
-	    {
-	    	serviceServerTypeID_ = serverFactoryId;
-	    }
-		
-		return Status.OK_STATUS;
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServiceServerTypeID()
-		  {
-		    return serviceServerTypeID_;
-		  }
-
-		public String getServerModule() {
-			return serverModule_;
-		}
-
-		public String getJavaBeanName() {
-			return javaBeanName_;
-		}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
deleted file mode 100644
index d8073abf7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends AbstractDataModelOperation
-{
-  private List classNames;
-  //private String wsdlURI;
-  //private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParameter;
-
-  public ComputeAxisSkeletonBeanCommand()
-  {
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-    classNames = new Vector();
-    if (javaWSDLParameter != null)
-    {
-      String beanName = javaWSDLParameter.getBeanName();
-      if (beanName != null)
-        classNames.add(beanName);
-    }
-    return Status.OK_STATUS;
-  }
-
-  public List getClassNames()
-  {
-    return classNames;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    //this.webServicesParser = webServicesParser;
-  }
-
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    //this.wsdlURI = wsdlURI;
-  }
-  
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParameter)
-  {
-    this.javaWSDLParameter = javaWSDLParameter;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
deleted file mode 100644
index 4e898aa44..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-
-/**
- * 
- * This command copies the server-config.wsdd file to it's proper location in the module.
- * 
- */
-
-public class CopyDeploymentFileCommand extends AbstractDataModelOperation
-{
-  private String projectName_;
-  private String componentName_;
-  
-  /**
-   * Constructor for CopyDeploymentFileCommand.
-   * @param String description
-   * @param String name
-   * 
-   */
-  public CopyDeploymentFileCommand( String projectName, String componentName )
-  { 
-    projectName_   = projectName;
-    componentName_ = componentName;
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-    IStatus            status         = Status.OK_STATUS;
-    
-    try
-    {
-      IVirtualComponent component      = J2EEUtils.getVirtualComponent( projectName_, componentName_ );
-      IFolder           root           = J2EEUtils.getOutputContainerRoot( component );
-      IPath             path           = new Path( "WEB-INF" ).append( "server-config.wsdd" );
-      IFile             descriptorFile = root.getFile( path );
-      IVirtualFile      newLocation    = component.getRootFolder().getFile( path );
-      IPath             targetPath     = newLocation.getWorkspaceRelativePath();
-      IFile             targetFile     = (IFile)ResourceUtils.findResource( targetPath );
-        
-      descriptorFile.refreshLocal( 0, null );
-      
-      if( targetFile != null && targetFile.exists() )
-      {
-        // The target file already exists so we will just overwrite its contents.
-    	targetFile.setContents( descriptorFile.getContents(), true, false, null );
-      }
-      else
-      {
-    	// The target file doesn't exist so we will copy it.
-        descriptorFile.copy( targetPath, true, null );
-      }
-    }
-    catch( Throwable exc )
-    {
-    }
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index 4cf192e1f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-
-
-public class JavaToWSDLMethodCommand extends AbstractDataModelOperation {
-
-	private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-	private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
-	private Hashtable fMethodNames;
-	private String fClassName;
-	private String fbeanBaseName;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	private MessageUtils msgUtils_;
-
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand() {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	}
-	/**
-	* Default CTOR
-	*/
-	public JavaToWSDLMethodCommand(
-		JavaWSDLParameter javaParameter,
-		IProject serviceProject) {
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-		javaWSDLParam_ = javaParameter;
-		serviceProject_ = serviceProject;
-
-	}
-
-	/**
-	* JavaToToWSDLMethod execute
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-
-		fbeanBaseName = javaWSDLParam_.getBeanName();
-		environment.getLog().log(Log.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
-		IStatus status;
-		try {
-			//Get the qualified bean name; my.package.MyClass
-			fMethodNames = new Hashtable();
-			Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
-			String qName = fbeanBaseName;
-
-			if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
-				|| qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
-				qName = qName.substring(0, qName.lastIndexOf('.'));
-			}
-
-			JavaEMFNature jMOF =
-				(JavaEMFNature) JavaEMFNature.createRuntime(
-					serviceProject_);
-			JavaClass javaClass =
-				(JavaClass)JavaRefFactory.eINSTANCE.reflectType(qName, jMOF.getResourceSet());
-			
-			if (!javaClass.isExistingType()) {
-				environment.getLog().log(Log.ERROR, 5022, this, "execute", msgUtils_.getMessage(
-						"MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
-						new String[] { qName }));
-				
-				status = StatusUtils.errorStatus(
-						msgUtils_.getMessage(
-					"MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
-					new String[] { qName }));
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-
-			// Get the qualified name
-			fClassName = javaClass.getQualifiedName();
-			String beanName;
-			if (fClassName.lastIndexOf('.') != -1) {
-				beanName =
-					fClassName.substring(
-						fClassName.lastIndexOf('.') + 1,
-						fClassName.length());
-			} else
-				beanName = fClassName;
-
-			// Walk the java class and get the method names
-			gatherMethods(javaClass, beanName, oldMethodsNames);
-			/*
-			Iterator m = javaClass.getPublicMethodsExtended().iterator();
-			while (m.hasNext()) {
-				Method method = (Method) m.next();  
-				if ( ! method.isConstructor()){ 
-				if (!beanName.equals(method.getName())
-					&& !(isDuplicateMethodName(method
-						.getMethodElementSignature()))
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("javax.ejb.EJBObject"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("javax.ejb.EJBObject[]"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("java.lang.Object"))	//$NON-NLS-1$
-					&& !(method
-						.getContainingJavaClass()
-						.getJavaName()
-						.equalsIgnoreCase("java.lang.Object[]"))) {	//$NON-NLS-1$
-					// add the method name to our list of method names
-					String methodName =method.getMethodElementSignature();
-		          Boolean isSelected = new Boolean(true);
-        		  if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
-          			isSelected = (Boolean)oldMethodsNames.get(methodName);
-		          fMethodNames.put(methodName, isSelected);
-				} 
-				}
-			}
-			*/
-			javaWSDLParam_.setMethods(fMethodNames);
-			
-			return Status.OK_STATUS;
-
-		} catch (Exception e) {
-			environment.getLog().log(Log.ERROR, 5023, this, "execute", msgUtils_.getMessage("MSG_ERROR_READ_BEAN"));
-		
-			status = StatusUtils.errorStatus(
-					msgUtils_.getMessage(
-				"MSG_ERROR_JAVA_TO_METHOD"),
-				 e);
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-	}
-
-  private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
-  {
-    String javaName = javaClass.getJavaName();
-    if (!javaClass.isInterface()
-        && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
-        && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
-        && !javaName.equalsIgnoreCase("java.lang.Object[]")
-        && !javaName.equalsIgnoreCase("java.lang.Object"))
-    {
-      List publicMethods = javaClass.getPublicMethods();
-      for (Iterator it = publicMethods.iterator(); it.hasNext();)
-      {
-        Method method = (Method)it.next();
-        if (!method.isConstructor()
-            && !beanName.equals(method.getName())
-            && !(isDuplicateMethodName(method.getMethodElementSignature())))
-        {
-          // add the method name to our list of method names
-          String methodName = method.getMethodElementSignature();
-          Boolean isSelected = new Boolean(true);
-          if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
-            isSelected = (Boolean)oldMethodsNames.get(methodName);
-          fMethodNames.put(methodName, isSelected);
-        }
-      }
-      gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
-    }
-  }
-	  
-	//Returns true if the provided method name already exists in the 
-	//fMethodNames vector. This method is used to detect overloaded 
-	//methods in Beans and EJBs, which are currently unsupported.
-	private boolean isDuplicateMethodName(String methodName) {
-		return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
-	}
-	
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index 77fdf9409..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends AbstractDataModelOperation {
-	
-	private IWebService ws_;
-	private String serverProject_; 
-	private String serverModule_;
-
-	  private String serverServer_;
-	  private String wsdlURI_;
-	  	  
-		/**
-		* Default CTOR
-		*/
-		public TDAxisInputCommand() {
-		}
-		
-		public TDAxisInputCommand(IWebService ws, String project, String module) {
-			ws_ = ws;
-			serverProject_ = project;
-			serverModule_ = module;
-		}
-		
-		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-		{	    
-		serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();	
-		wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-		
-		return Status.OK_STATUS;
-	  }
-	  
-		/**
-		   * @return Returns the serverProject.
-		   */
-		  public String getServerProject()
-		  {
-			  return serverProject_;
-		  }
-
-		  public String getServerServer()
-		  {
-		    return serverServer_;
-		  }
-
-		public String getWsdlURI() {
-			return wsdlURI_;
-		}
-
-		public String getServerModule() {
-			return serverModule_;
-		}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index ead96381b..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-
-public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
-
-	private MessageUtils msgUtils_;
-	private IProject serverProject;
-	private String   moduleName_;
-
-  public UpdateWEBXMLCommand( String moduleName )
-  {
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	moduleName_ = moduleName;
-  }
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-		if (serverProject != null) {
-			IStatus status = null;
-			status = addServlet(serverProject, moduleName_, getAxisServletDescriptor());
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-			addServlet(serverProject, moduleName_, getAdmintServletDescriptor());
-			if (status.getSeverity() == Status.ERROR) {
-				environment.getStatusHandler().reportError(status);
-				return status;
-			}
-		}
-		return Status.OK_STATUS;
-	}
-
-	private ServletDescriptor getAxisServletDescriptor() {
-
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "AxisServlet"; //$NON-NLS-1$
-		sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
-										"*.jws", //$NON-NLS-1$
-										"/services/*" }; //$NON-NLS-1$
-		return sd;
-	}
-
-	private ServletDescriptor getAdmintServletDescriptor() {
-		ServletDescriptor sd = new ServletDescriptor();
-		sd._name = "AdminServlet"; //$NON-NLS-1$
-		sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
-		sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
-		sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
-		sd._loadOnStartup = new Integer(100);
-		return sd;
-	}
-
-	public IStatus addServlet(
-		IProject webProject,
-		String   moduleName,
-		ServletDescriptor servletDescriptor) {
-
-		WebArtifactEdit webEdit = null;		
-		try {
-			// 
-			WebApp webapp = null;
-      IVirtualComponent vc = ComponentCore.createComponent(webProject, moduleName);
-      webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
-			if (webEdit != null)
-			{
-				webapp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-
-			   boolean foundServlet = false;
-
-			   List theServlets = webapp.getServlets();
-			   for (int i = 0; i < theServlets.size(); i++) {
-				Servlet aServlet = (Servlet) theServlets.get(i);
-				if (aServlet.getServletName().equals(servletDescriptor._name)) {
-					foundServlet = true;
-				 }
-			   }
-
-			   if (foundServlet) {
-				  return Status.OK_STATUS;
-			   }
-
-			   WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
-			   Servlet servlet = factory.createServlet();
-			   ServletType servletType = factory.createServletType();
-			   servlet.setWebType(servletType);
-			   servlet.setServletName(servletDescriptor._name);
-			   servletType.setClassName(servletDescriptor._className);
-			   if(servletDescriptor._displayName != null){
-			     servlet.setDisplayName(servletDescriptor._displayName);
-			   }
-			   if(servletDescriptor._loadOnStartup != null){
-				  servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
-			   }
-			   if(servletDescriptor._params != null){
-				  Properties properties = servlet.getParamsAsProperties();
-				  properties.putAll(servletDescriptor._params);
-			   }
-			   webapp.getServlets().add(servlet);
-			
-			   if(servletDescriptor._mappings != null){
-				  for(int i=0; i<servletDescriptor._mappings.length; i++){
-					ServletMapping servletMapping = factory.createServletMapping();
-					servletMapping.setServlet(servlet);
-					servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
-					webapp.getServletMappings().add(servletMapping);					
-				  }
-			   }
-			   
-			   webEdit.save(new NullProgressMonitor());
-			}
-
-			return Status.OK_STATUS;
-		} catch (Exception e) {
-
-			return StatusUtils.errorStatus(
-					msgUtils_.getMessage("MSG_ERROR_UPDATE_WEB_XML"),
-					e);
-		}
-		finally{
-			if (webEdit != null)
-				webEdit.dispose();	
-		}
-	}
-  
-  public void setServerProject(IProject serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-	public class ServletDescriptor {
-		String _name;
-		String _className;
-		String _displayName;
-		Map _params;
-		String[] _mappings;
-		Integer _loadOnStartup;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index 88016ab5d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.osgi.framework.BundleContext;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-	
-	// Copyright
-	public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.axis.creation.ui";	//$NON-NLS-1$
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceAxisCreationUIPlugin instance_;
-  private Log log_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  * The "plugin" element in plugin.xml should include the attribute
-  * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
-  * @param descriptor The descriptor of this plugin.
-  */
-  public WebServiceAxisCreationUIPlugin()
-  {
-    super();
-    if (instance_ == null)
-    {
-      instance_ = this;
-    }
-    log_ = EnvironmentService.getEclipseLog();
-
-  }
-
-  // This method is needed to keep the logging from blowing up.
-  public String toString()
-  {
-    return ID;  
-  }
-  
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
-  * @return The WebServiceConsumptionUIPlugin singleton.
-  */
-  static public WebServiceAxisCreationUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Called once by the platform when this plugin is first loaded.
-  * @throws CoreException If this plugin fails to start.
-  */
-  public void start( BundleContext context ) throws CoreException
-  {
-  	log_.log(Log.INFO, 5068, this, "start", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
-    
-    try
-    {
-      super.start( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( Log.ERROR, 5068, this, "start", exc );  
-    }
-    
-    setPreferences();
-  }
-
-  /**
-  * Called once by the platform when this plugin is unloaded.
-  * @throws CoreException If this plugin fails to shutdown.
-  */
-  public void stop( BundleContext context ) throws CoreException
-  {
-  	log_.log(Log.INFO, 5069, this, "stop", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
-    
-    try
-    {
-      super.stop( context );
-    }
-    catch( Exception exc )
-    {
-      log_.log( Log.ERROR, 5068, this, "start", exc );        
-    }
-  }
-
-
-  /**
-   * Sets the general preferences to the values in the preferences store.
-  **/
-  public void setPreferences()
-  {
-   // setDialogsPreferences();
-  }
-
- /**
-   * @see AbstractUIPlugin#initializeDefaultPreferences
-   */
-  protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
-	// Set the defaults Preference
-//	ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
-  }
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index 8676c3f4a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-  public BUCheckAxisDeploymentDescriptors(String moduleName) 
-  {
-	super(moduleName);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index 274c3b5e8..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,283 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import 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.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation {
-
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private MessageUtils conMsgUtils_;
-	
-	// rm private Model model_;
-	private JavaWSDLParameter javaWSDLParam_ = null;
-	private IProject serviceProject_;
-	private String javaBeanName_; // this needs to be set by the extension with initial selection
-	private String WSDLServiceURL_;
-	private String WSDLServicePathname_;
-	private WebServicesParser WSParser_;
-	// rm private WebServiceElement wse_; // temporary
-	private String moduleName_;
-	
-	private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-	public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
-	private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
-	public final byte MODE_BEAN = (byte) 0;
-	public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
-
-	public DefaultsForServerJavaWSDLCommand( String moduleName ) 
-	{
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	    conMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-		moduleName_  = moduleName;
-	}
-	
-
-	public DefaultsForServerJavaWSDLCommand(
-		JavaWSDLParameter javaWSDLParam,
-		Model model) {
-
-		String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-
-		setJavaWSDLParam(javaWSDLParam);
-	
-	}
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-
-		IStatus status;
-		if (javaWSDLParam_ == null) {
-			status = StatusUtils.errorStatus( coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		if (javaBeanName_ == null) {  // either set by extension point or bean class page
-			javaBeanName_ = javaWSDLParam_.getBeanName();
-			if (javaBeanName_ == null) {
-				//rm javaBeanName_ = isdElement.getJavaBeanName();
-				javaWSDLParam_.setBeanName(javaBeanName_);
-			}
-		}
-		// rm WSParser_ =	(WebServicesParser) wse_.getWSParser();
-		
-		javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-		javaWSDLParam_.setSkeletonDeploy(false);
-
-		javaWSDLParam_.setBeanName(javaBeanName_);
-		String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_, moduleName_);
-		javaWSDLParam_.setClasspath(classpath);
-
-		String simpleBeanName = javaBeanName_;
-		if (javaBeanName_ != null) {
-			int index = javaBeanName_.lastIndexOf('.');
-			if (index != -1) {
-				simpleBeanName = javaBeanName_.substring(index + 1);
-			}
-		}
-		String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
-		javaWSDLParam_.setNamespace(namespace);
-
-		javaWSDLParam_.setPortTypeName(simpleBeanName);
-		javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
-		IPath moduleServerRoot = null;
-
-		IPath modulePath = serviceProject_.getFullPath();
-		IPath webinfPath = serviceProject_.getFullPath();
-		try {
-			//if ( ResourceUtils.isWebProject(serviceProject_)) {
-      if (J2EEUtils.isWebComponent(serviceProject_, moduleName_)){
-				moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_, moduleName_);
-
-				// should use ModuleCore.getSourceContainers();
-//				IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-//				if (container!=null) {
-//					moduleServerRoot = container.getFullPath();
-//				}
-				
-				modulePath = J2EEUtils.getWebContentPath(serviceProject_, moduleName_);
-				webinfPath = J2EEUtils.getWebInfPath( serviceProject_, moduleName_ );
-				
-			}
-
-		} catch (Exception e) {
-			status =  StatusUtils.errorStatus( conMsgUtils_.getMessage("MSG_ERROR_DEFAULT_BEAN"), e );
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-
-		IPath wsdlPath =
-			modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
-		try{
-			IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
-			FileUtil.createFolder(folder, true, true);
-		
-		}
-		catch(CoreException e){
-			status = StatusUtils.errorStatus( conMsgUtils_.getMessage("MSG_ERROR_WRITE_WSDL"), e );
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-		
-		String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
-		javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
-		javaWSDLParam_.setInputWsdlLocation(wsdlLocation);
-		WSDLServicePathname_ = wsdlPath.toString();
-
-		if (wsdlPath != null) {
-			String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-			WSDLServiceURL_ = wsdlURL;
-			// set parser 
-			if (wsdlURL == null || wsdlURL.length() <= 0) {
-				IResource res =
-					ResourceUtils.findResource(WSDLServicePathname_);
-				if (res != null)
-					wsdlURL = (new Utils()).toFileSystemURI(res);
-			}
-			if (wsdlURL != null && wsdlURL.length() > 0) {
-				if (WSParser_ == null) {
-					WSParser_ = new WebServicesParserExt();
-				}
-			}
-		}
-
-		javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
-		javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
-
-		String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, moduleName_);
-		if (projectURL == null) {
-			status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_URL"));
-			environment.getStatusHandler().reportError(status);
-			return status;
-		}
-//		else {
-//			javaWSDLParam_.setUrlLocation("http://localhost:8080/"+moduleName_);
-//		}
-		
-		String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
-		javaWSDLParam_.setUrlLocation(serviceURL);
-		
-		javaWSDLParam_.setMetaInfOnly(true);
-		//		String javaOutput = PlatformUtils.getPlatformURL(moduleServerRoot);
-		//		String output = PlatformUtils.getPlatformURL(modulePath);
-
-		String javaOutput =	ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-//		String javaOutput = ResourceUtils.getWorkspaceRoot().getFolder(moduleServerRoot).getLocation().toString();
-	
-		String serviceName = javaWSDLParam_.getServiceName();
-		IPath outputPath =	ResourceUtils.findResource(webinfPath).getLocation();
-		String output = serviceProject_.getFullPath().toString();
-		if (outputPath!=null)
-		 output = outputPath.append(serviceName).toString();
-
-		javaWSDLParam_.setJavaOutput(javaOutput);
-		javaWSDLParam_.setOutput(output);
-		
-		return Status.OK_STATUS;
-	}
-
-	/**
-	 * Returns the javaWSDLParam.
-	 * @return JavaWSDLParameter
-	 */
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-
-	/**
-	 * Sets the javaWSDLParam.
-	 * @param javaWSDLParam The javaWSDLParam to set
-	 */
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		this.javaWSDLParam_ = javaWSDLParam;
-	}
-
-	// rm
-	/*
-	public void setModel(Model model) {
-		this.model_ = model;
-	}
-	*/
-	
-	public void setServiceProject(IProject serviceProject) {
-		this.serviceProject_ = serviceProject;
-	}
-	
-	public void setJavaBeanName(String javaBeanName) {
-		this.javaBeanName_ = javaBeanName;
-	}
-	
-	public String getWSDLServiceURL() {
-		return WSDLServiceURL_;
-	}
-	
-	public String getWSDLServicePathname() {
-		return WSDLServicePathname_;
-	}
-	
-	public void setParser(WebServicesParser wsParser) {
-		this.WSParser_ = wsParser;
-	}
-	
-	public WebServicesParser getParser() {
-		return WSParser_;
-	}
-
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    if (objectSelection != null && !objectSelection.isEmpty())
-    {
-      Object object = objectSelection.getFirstElement();
-      if (object instanceof String)
-        setJavaBeanName((String)object);
-    }
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
deleted file mode 100644
index cef8d704a..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-public class MoveDeploymentFilesTask extends AbstractDataModelOperation {
-
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serverProject;
-	private String   moduleName_;
-	
-    private JavaWSDLParameter javaWSDLParam_;
-	
-	public MoveDeploymentFilesTask( String moduleName )
-    {
-      String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-      msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-      coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	  moduleName_ = moduleName;
-    }
-
-  /**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-		IStatus status = Status.OK_STATUS;
-		if (javaWSDLParam_ == null) {
-		  status = StatusUtils.errorStatus(coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-		  environment.getStatusHandler().reportError(status);
-		  return status;
-		}
-
-		IProject project = serverProject;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-		
-		if (projectURL == null) {
-		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}));
-		    environment.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-
-		try {
-		String[] deployFiles = javaWSDLParam_.getDeploymentFiles();
-		String javaOutput = javaWSDLParam_.getJavaOutput();
-
-		if (deployFiles == null || javaOutput == null) {
-			return status;
-		}
-
-
-		IPath webinfPath = J2EEUtils.getWebInfPath(project, moduleName_ );
-
-			for (int i = 0; i < deployFiles.length; i++) {
-        File f = new File(deployFiles[i]);
-        String resourceToMove = f.getName();
-				String targetFileName = ResourceUtils.getWorkspaceRoot().getFile(webinfPath.addTrailingSeparator().append(resourceToMove)).getLocation().toString();
-				FileUtil.createTargetFile(deployFiles[i], targetFileName, true);
-				File deploymentFile = new File(deployFiles[i]);
-				deploymentFile.delete();
-				deployFiles[i] = targetFileName;
-			}
-
-		} catch (Exception e) {
-		  status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[] { e.getLocalizedMessage()}), e);
-		  environment.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		
-		return status;
-	}
-
-	public JavaWSDLParameter getJavaWSDLParam()
-	{
-		return javaWSDLParam_;
-	}
-	
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public void setServerProject(IProject serverProject)
-	{
-	  this.serverProject = serverProject;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
deleted file mode 100644
index 6cfa929de..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-
-public class MoveJavaFilesTask extends AbstractDataModelOperation {
-
-	private JavaWSDLParameter javaWSDLParam_;
-	private MessageUtils msgUtils_;
-	private MessageUtils coreMsgUtils_;
-	private IProject serviceProject_;
-	
-	private String moduleName_;
-	// rm private Model model_;
-
-	public MoveJavaFilesTask(String moduleName) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-		this.moduleName_ = moduleName;
-	}
-	
-	public MoveJavaFilesTask() {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-	}	
-
-	public MoveJavaFilesTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-		javaWSDLParam_ = javaWSDLParam;
-
-	}
-
-	/**
-	* Execute DefaultsForJavaToWSDLTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-	  IStatus status = Status.OK_STATUS;
-	  
-		if (javaWSDLParam_ == null) {
-		  status = StatusUtils.errorStatus(coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-		  environment.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		  return status;		  
-		}
-		*/
-
-		IProject project = serviceProject_;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-		if (projectURL == null) {
-		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}));
-		    environment.getStatusHandler().reportError(status);
-		    return status;		  
-
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-
-		String[] javaFiles = javaWSDLParam_.getJavaFiles();
-		String javaoutput = javaWSDLParam_.getJavaOutput();  // <webproject>/JavaSource
-		String output = javaWSDLParam_.getOutput();  		 // <webproject>/WebContent/META_INF
-
-		if(javaFiles == null || javaoutput == null && output == null ){
-			return status;
-		}
-		try {
-			for (int i = 0; i < javaFiles.length; i++) {
-//				String resourceToMove = javaFiles[i].substring(output.length());
-//				String targetFileName = javaoutput + resourceToMove;
-//				File resultFile = new File(targetFileName);
-				// copy java files that without overwtriting existing ones
-//				if (!resultFile.exists()) {
-//					FileUtil.createTargetFile(
-//						javaFiles[i],
-//						javaoutput + resourceToMove);
-//				}
-				// delete java files from the output directory
-				File source = new File(javaFiles[i]);
-				source.delete();
-			}
-		} catch (Exception e) {
-		  status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[]{e.getLocalizedMessage()}), e);
-		  environment.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-		
-		return status;
-	}
-
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-	{
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public JavaWSDLParameter getJavaWSDLParam() {
-		return javaWSDLParam_;
-	}
-	
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	// rm
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index 8f1a64282..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class Skeleton2WSDLCommand extends AbstractDataModelOperation
-{
-  private static final String IMPL = "Impl";	//$NON-NLS-1$
-  private static final String SERVICE_EXT = "/services/";	//$NON-NLS-1$
-  private static final String WSDL_EXT = "wsdl";	//$NON-NLS-1$
-  private static final String DOT = ".";	//$NON-NLS-1$
-  private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
-  private WebServicesParser webServicesParser;
-  private JavaWSDLParameter javaWSDLParam;
-  private IProject serverProject;
-  private MessageUtils msgUtils_;
-  private String       moduleName_;
-
-  public Skeleton2WSDLCommand( String moduleName ) {
-	msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
-	moduleName_ = moduleName;
-  }
-
-  /**
-  * Execute Skeleton2WSDLCommand
-  */
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-    if (!(environment instanceof EclipseEnvironment))
-    {
-      IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_NOT_IN_ECLIPSE_ENVIRONMENT", new String[] {"Skeleton2WSDLCommand"}));
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    if (javaWSDLParam == null)
-    {
-      IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-
-  // Read WSDL
-  Definition definition = null;
-	String wsdlURL = javaWSDLParam.getInputWsdlLocation();
-	try
-	{
-		URL url = new URL(wsdlURL);
-		definition = webServicesParser.getWSDLDefinition(url.toString());
-	}
-	catch(MalformedURLException e)
-	{
-		wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
-		definition = webServicesParser.getWSDLDefinition(wsdlURL);
-	}
-
-    // Compute the qualified name of the Java bean skeleton
-    Service service = null;
-    Port port = null;
-    if (definition != null) {
-      StringBuffer beanName = new StringBuffer();
-      beanName.append(WSDLUtils.getPackageName(definition));
-      beanName.append(DOT);
-      try{
-      service = (Service) definition.getServices().values().iterator().next();
-      port = (Port) service.getPorts().values().iterator().next();
-      Binding binding = port.getBinding();
-      beanName.append(binding.getQName().getLocalPart());
-      beanName.append(IMPL);
-      javaWSDLParam.setBeanName(beanName.toString());
-
-      javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
-      javaWSDLParam.setServiceName(
-        WSDLUtils.getServiceElementName(definition));
-      javaWSDLParam.setBeanPackage(WSDLUtils.getPackageName(definition));
-      }
-      catch(Throwable e){
-      	e.printStackTrace();
-      }
-    } 
-    else {
-      IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION", new String[] {wsdlURL}));
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    // Modify WSDL endpoint
-    if (port == null) {
-      IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WSDL_NO_PORT", new String[] {wsdlURL}));
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    Map services = definition.getServices();
-    for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
-    {
-      Service s = (Service)servicesIt.next();
-      Map ports = s.getPorts();
-      for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
-      {
-        Port p = (Port)portsIt.next();
-        modifyEndpoint(p);
-      }
-    }
-
-    // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
-    IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
-    String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
-    IPath wsdlPath = null;
-    IFile outputFile = null;
-    try {
-     if(wsdlLocation != null){
-		outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
-     }
-     else{
-//		wsdlPath = serverProject.getFullPath();
-//		
-//		if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-//			   J2EEWebNatureRuntime webProject =
-//				 (J2EEWebNatureRuntime) serverProject.getNature(
-//				   IWebNatureConstants.J2EE_NATURE_ID);
-//			   wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-//			   //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-//			 }
-//		else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-//		{
-//			EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-//			wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-//		}		
-// TODO:  handle EJB case
-		     wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-			 IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
-		     IFolder folder = ResourceUtils
-								.getWorkspaceRoot()
-								.getFolder(wsdlPath.append(WSDL_FOLDER));
-			 FileUtil.createFolder(folder, true, true);	
-		     outputFile = workspace.getFile(wsdlFilePath);
-			 wsdlLocation = outputFile.getLocation().toString();
-			 javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-			 
-     }
-
-     // copy WSDL
-     CopyWSDLCommand copyWSDLCommand = new CopyWSDLCommand();
-     copyWSDLCommand.setWebServicesParser(webServicesParser);
-     copyWSDLCommand.setWsdlURI(wsdlURL);
-     copyWSDLCommand.setDestinationURI(outputFile.getLocation().toFile().toURL().toString());
-     copyWSDLCommand.setDefinition(definition);
-     copyWSDLCommand.setEnvironment(environment);
-     IStatus status = copyWSDLCommand.execute(null, null);
-     if(status!=null && status.getSeverity()==Status.ERROR) {
-       return status;
-     }
-    } 
-    catch (Exception e) {
-      IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL", new String[] { wsdlLocation }), e);
-      environment.getStatusHandler().reportError(status);
-      return status;
-    }
-    return Status.OK_STATUS;
-  }
-
-  private IStatus modifyEndpoint(Port port)
-  {
-    Iterator it = port.getExtensibilityElements().iterator();
-    SOAPAddress soapAddress = null;
-    while (it.hasNext())
-    {
-      Object obj = it.next();
-      if (obj instanceof SOAPAddress)
-      {
-        soapAddress = (SOAPAddress)obj;
-        break;
-      }
-    }
-    if (soapAddress != null)
-    {
-//      String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
-	  String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, moduleName_);
-      if (projectURL == null)
-        return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}));
-      StringBuffer serviceURL = new StringBuffer(projectURL);
-      serviceURL.append(SERVICE_EXT).append(port.getName());
-      javaWSDLParam.setUrlLocation(serviceURL.toString());
-      soapAddress.setLocationURI(serviceURL.toString());
-    }
-    return Status.OK_STATUS;
-  }
-  
-  /**
-  * Returns the javaWSDLParam.
-  * @return JavaWSDLParameter
-  */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    return javaWSDLParam;
-  }
-
-  /**
-  * Sets the javaWSDLParam.
-  * @param javaWSDLParam The javaWSDLParam to set
-  */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-    this.javaWSDLParam = javaWSDLParam;
-  }
-
-  /**
-   * @param serverProject The serverProject to set.
-   */
-  public void setServerProject(IProject serverProject) {
-    this.serverProject = serverProject;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser() {
-    return webServicesParser;
-  }
-
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser) {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public String getWsdlURI()
-  {
-  	File file = new File(getJavaWSDLParam().getOutputWsdlLocation()); 
-    String url = "";
-	  try {
-    	url = file.toURL().toString();
-    }
-	  catch(MalformedURLException mue){}
-	return url;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index d83dc372f..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
-{
-  public TDCheckAxisDeploymentDescriptors(String moduleName) 
-  {
-	super(moduleName);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index 4f44cc52d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.common.BundleUtils;
-
-public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
-	
-	private final String DEPLOY_XSL = "deploy.xsl";	//$NON-NLS-1$
-	private final String DEPLOY_BAK = "deploy.wsdd.bak";		//$NON-NLS-1$
-	private final String CLASSNAME_PARAM = "newClassName";		//$NON-NLS-1$
-    private MessageUtils msgUtils_;
-    private MessageUtils coreMsgUtils_;
-	private JavaWSDLParameter javaWSDLParam_;
-	private IProject serviceProject_;
-	// rm private Model model_;
-	
-	private String moduleName_;
-
-	public UpdateAxisWSDDFileTask( String moduleName) 
-	{
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-		moduleName_ = moduleName;
-	}
-	
-	public UpdateAxisWSDDFileTask(JavaWSDLParameter javaWSDLParam) {
-	    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-	    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	    coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-		javaWSDLParam_ = javaWSDLParam;
-	}
-
-	/**
-	* Execute UpdateAxisWSDDFileTask
-	*/
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-	    IStatus status = Status.OK_STATUS;		
-		if (javaWSDLParam_ == null) {
-		  status = StatusUtils.errorStatus(coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"));
-		  environment.getStatusHandler().reportError(status);
-		  return status;		  
-		}
-
-		// rm 
-		/*
-		if (model_ == null) {
-		  status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
-		  return status;		  
-		}
-		*/
-	
-		IProject project = serviceProject_;
-		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-		if (projectURL == null) {
-		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}));
-		    environment.getStatusHandler().reportError(status);
-		    return status;		  
-		} else {
-			javaWSDLParam_.setProjectURL(projectURL);
-		}
-		String outputLocation = javaWSDLParam_.getJavaOutput();
-		if (outputLocation == null) {
-			return status;
-		}
-//		try {
-//			if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-//				return status;
-//		} catch (Exception ex) {
-//		    status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-//		    environment.getStatusHandler().reportError(status);
-//		    return status;		  
-//		}
-
-//		String webContentPath =	ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
-		String webContentPath =	J2EEUtils.getWebContentContainer( project, moduleName_ ).getLocation().toString();
-		try {
-
-			if (javaWSDLParam_.getDeploymentFiles() != null
-				&& javaWSDLParam_.getDeploymentFiles().length > 0) {
-
-				String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
-				Path deployPath = new Path(wsdd_deploy);
-				String deployBackup =
-					deployPath
-						.removeLastSegments(1)
-						.append(DEPLOY_BAK)
-						.toString();
-				FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
-				String deployXSL = getPluginFilePath(DEPLOY_XSL).toString();
-
-				TransformerFactory tFactory = TransformerFactory.newInstance();
-
-				// Use the TransformerFactory to instantiate a Transformer that will work with  
-				// the stylesheet you specify. This method call also processes the stylesheet
-				// into a compiled Templates object.
-				Transformer transformer =
-					tFactory.newTransformer(new StreamSource(deployXSL));
-				transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
-				// Use the Transformer to apply the associated Templates object to an XML document
-				// (foo.xml) and write the output to a file (foo.out).
-				transformer.transform(
-					new StreamSource(deployBackup),
-					new StreamResult(new FileOutputStream(wsdd_deploy)));
-
-			}
-
-		} catch (Exception e) {
-		    String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()}; 
-		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_UPDATE_AXIS_WSDD", errorMsgStrings), e);
-		    environment.getStatusHandler().reportError(status);
-		    return status;		  		  
-		}
-		
-		return status;
-	}
-
-	private IPath getPluginFilePath(String pluginfileName)
-		throws CoreException {
-		try {
-
-			URL localURL =
-				Platform.asLocalURL(
-					BundleUtils.getURLFromBundle( WebServiceAxisCreationUIPlugin.ID, pluginfileName));
-			return new Path(localURL.getFile());
-		} catch (MalformedURLException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					msgUtils_.getMessage(
-						"MSG_PLUGIN_FILE_URL"),
-					e));
-		} catch (IOException e) {
-			throw new CoreException(
-				new org.eclipse.core.runtime.Status(
-					IStatus.WARNING,
-					WebServiceAxisCreationUIPlugin.ID,
-					0,
-					msgUtils_.getMessage(
-						"MSG_PLUGIN_FILE_URL"),
-					e));
-		}
-	}
-
-
-	/**
-	* Sets the javaWSDLParam.
-	* @param javaWSDLParam The javaWSDLParam to set
-	*/
-	public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-		javaWSDLParam_ = javaWSDLParam;
-	}
-	
-	public JavaWSDLParameter getJavaWSDLParam()
-	{
-		return javaWSDLParam_;
-	}	
-
-	public void setServiceProject(IProject serviceProject)
-	{
-	  serviceProject_ = serviceProject;
-	}
-	
-	// rm 
-	/*
-	public void setModel(Model model)
-	{
-	  model_ = model;
-	}
-	*/	
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 5ddb13dc4..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- */
-public class BUAxisDefaultingCommand extends AbstractDataModelOperation
-{
-  
-  //Provide
-  private IServer serviceExistingServer_;
-  private JavaWSDLParameter javaWSDLParam_;
-  private String javaBeanName_;
-  private WebServicesParser parser_;
-  private boolean forceBuild_ = true;
-  private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
-  private ValidationManager validationManager_;
-  private boolean customizeServiceMappings_ = false;
-  
-  //This is proxy and client related information
-  //which can be nulled for commands dealing
-  //with service creation.
-  //rsk revisit
-  private Boolean isProxyProject_ = Boolean.FALSE;
-  private String clientRuntimeID_ = null;
-  private IProject proxyProject_ = null;
-  private IProject sampleProject_ = null;
-  private String sampleServerTypeID_ = null;
-  private IServer sampleExistingServer_ = null;
-  
-  private MessageUtils msgUtils_;
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-    
-  	String       pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-    
-//    if (serviceIds_.getServerInstanceId() != null) { // server exists
-//    	serviceExistingServer_ = ServerCore.findServer(serviceIds_.getServerInstanceId());
-//    }
-//    if (serviceExistingServer_ != null)
-//    {
-//      serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
-//    }
-//    else
-//    {
-//    	serviceServerTypeID_ = serviceIds_.getServerId();
-//      // server will be created in ServerDeployableConfigurationCommand
-//    }
-    
-    //javaWSDLParam
-    javaWSDLParam_ = new JavaWSDLParameter();
-     
-//    if (initialSelection_ == null) {
-//    	Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-//				msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION"), Status.ERROR);
-//		env.getStatusHandler().reportError(status);
-//		return status;
-//    }
-    
-	if (javaBeanName_ == null) {
-		IStatus status = StatusUtils.errorStatus(
-				msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"));
-		environment.getStatusHandler().reportError(status);
-		return status;
-	}
-//    try {
-//		
-//		javaBeanName_ = getJavaBeanFromInitialSelection(environment);
-//		
-//	} catch (CoreException e) {
-//		Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-//				msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION") + " " //$NON-NLS-1$
-//				+e.getCause().toString(), Status.ERROR);
-//		environment.getStatusHandler().reportError(status);
-//		return status;
-//	}
-    
-    //parser
-    parser_ = new WebServicesParserExt();
-    
-    
-    
-    //validationManager
-    validationManager_ = new ValidationManager();
-    
-    return Status.OK_STATUS;
-  }
-  
-	
-  /**
-   * @return Returns the clientRuntimeID_.
-   */
-  public String getClientRuntimeID()
-  {
-    return clientRuntimeID_;
-  }
-  /**
-   * @return Returns the forceBuild_.
-   */
-  public boolean getForceBuild()
-  {
-    return forceBuild_;
-  }
-  /**
-   * @return Returns the isProxyProject_.
-   */
-  public Boolean getIsProxyProject()
-  {
-    return isProxyProject_;
-  }
-  /**
-   * @return Returns the javaBeanName_.
-   */
-  public String getJavaBeanName()
-  {
-    return javaBeanName_;
-  }
-  /**
-   * @return Returns the javaWSDLParam_.
-   */
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam_;
-  }
-  /**
-   * @return Returns the parser_.
-   */
-  public WebServicesParser getParser()
-  {
-    return parser_;
-  }
-  /**
-   * @return Returns the proxyProject_.
-   */
-  public IProject getProxyProject()
-  {
-    return proxyProject_;
-  }
-  /**
-   * @return Returns the sampleExistingServer_.
-   */
-  public IServer getSampleExistingServer()
-  {
-    return sampleExistingServer_;
-  }
-  /**
-   * @return Returns the sampleProject_.
-   */
-  public IProject getSampleProject()
-  {
-    return sampleProject_;
-  }
-  /**
-   * @return Returns the sampleServerTypeID_.
-   */
-  public String getSampleServerTypeID()
-  {
-    return sampleServerTypeID_;
-  }
-  /**
-   * @return Returns the validationManager_.
-   */
-  public ValidationManager getValidationManager()
-  {
-    return validationManager_;
-  }
-  
-  /**
-   * @return Returns the serviceExistingServer_.
-   */
-  public IServer getServiceExistingServer()
-  {
-    return serviceExistingServer_;
-  }
-  
- 
-  public boolean getCustomizeServiceMappings()
-  {
-    return customizeServiceMappings_;
-  }
-  /**
-   * @return Returns the isWebProjectStartupRequested.
-   */
-  public Boolean getIsWebProjectStartupRequested()
-  {
-    return IsWebProjectStartupRequested;
-  }
-
-public void setJavaBeanName(String javaBeanName) {
-	this.javaBeanName_ = javaBeanName;
-}
-  
-//  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-//  {
-//    serviceIds_ = ids;
-//  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
deleted file mode 100644
index 2345bc160..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
-  private String             pluginId_  = "org.eclipse.jst.ws.consumption.ui";
-  private String             thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
-  private IProject           serverProject_ = null;
-  private Composite          parent_ = null;
-  private IWizardContainer   context_ = null;
-  private JavaResourceFilter filter_ = new JavaResourceFilter();
-  private IResource          initialResource_ = null;
-  
-  /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
-  private String INFOPOP_PBCL_PAGE = "PBCL0001";
-  
-  private Text beanClassText_;
-  /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
-  private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
-  private Button beanResourceBrowseButton_;
-  /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-   
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, thisPlugin ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
-                                         "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
-                                         INFOPOP_PBCL_TEXT_BEAN_CLASS,
-                                         SWT.SINGLE | SWT.BORDER);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                 {
-                                                   public void widgetSelected( SelectionEvent evt )
-                                                   {
-                                                     handleBrowseClasses();  
-                                                   }
-                                                 } );
-    
-    beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
-                                                          "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
-                                                          INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
-    beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleBrowseFiles();  
-                                                      }
-                                                    } );
-    
-    return this;
-  }
-  
-  private void handleBrowseClasses()
-  {
-    String className = DialogUtils.browseClasses( parent_.getShell(), 
-                                                  serverProject_, context_ );
-
-    if (className!=null) beanClassText_.setText(className);
-    
-  }
-  
-  private void handleBrowseFiles()
-  {
-    IResource topResource = serverProject_;
-    
-    if (topResource == null)
-    {
-      topResource = ResourceUtils.getWorkspaceRoot();
-    }
-    
-    IResource resource 
-      = DialogUtils.browseResources( parent_.getShell(),
-                                     topResource,
-				                     initialResource_,
-				                     filter_ );
-    
-    if( resource != null )
-    {
-      IPath  path     = resource.getFullPath();
-      String basename = path.lastSegment();
-      
-      if( basename != null && basename.length() > 0 )
-      {
-        String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-        String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-        
-        if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
-        {
-          beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
-        }
-        
-        beanClassText_.setText(beanClass);
-      }
-    }   
-  }
-  
-  public void setCurrentPage( IWizardPage page )
-  {
-    context_ = page.getWizard().getContainer();
-  }
-
-  public void setBeanClassName(String beanClassName)
-  {
-    beanClassText_.setText(beanClassName);
-  }
-  
-  public String getBeanClassName()
-  {
-    return beanClassText_.getText().trim();  
-  }
-  
-  public void setServerProjectName( String name )
-  {
-    serverProject_ = (IProject)ResourceUtils.findResource( new Path( name ).makeAbsolute() );  
-  }
-    
-  public void setInitialResource( IResource resource )
-  {
-    initialResource_ = resource;  
-  }  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index e9ee35179..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor 
-{
-  private String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-  
-  private Button   rpcEncodedButton_;
-  private Button   rpcLiteralButton_;
-  private Button   docLiteralButton_;
-  
-  private Listener statusListener_;
-  
-  private JavaWSDLParameter javaParameter_;
-  
-  /* CONTEXT_ID PBCF0001 for the Bean Config Page */
-  private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_PAGE = "TOOLTIP_PBCF_PAGE";
-	
-  private Text uriText_;
-  /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-	
-  private Text wsdlFolderText_;
-  /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-	
-  private Text wsdlFileText_;
-  /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-	
-  private Tree methodsTree_;
-  /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
-  private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_TREE_METHODS = "TOOLTIP_PBME_TREE_METHODS";
-	
-  private Button selectAllMethodsButton_;
-  /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
-  private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_BUTTON_SELECT_ALL = "TOOLTIP_PBME_BUTTON_SELECT_ALL";
-	
-  private Button deselectAllMethodsButton_;
-  /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
-  private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
-  private final String TOOLTIP_PBME_BUTTON_DESELECT_ALL = "TOOLTIP_PBME_BUTTON_DESELECT_ALL";
-	
-  private Button showMappingsCheckbox_;
-  /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */   
-  private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    String       baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils     = new MessageUtils( pluginId_ + ".plugin", this );
-    MessageUtils baseConUtils = new MessageUtils( baseConPluginId + ".plugin", this );
-    UIUtils      uiUtils        = new UIUtils(msgUtils, pluginId_ );
-    UIUtils      baseConUiUtils = new UIUtils( baseConUtils, pluginId_ );
-    
-    statusListener_ = statusListener;    
-	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBCF_PAGE ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-    
-    Composite configGroup = uiUtils.createComposite( parent, 2 );
-    
-    uriText_ = uiUtils.createText( configGroup, "LABEL_URI",
-                                   TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFolderText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FOLDER_NAME",
-                                          TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    wsdlFileText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FILE_NAME",
-                                        TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER  );
-    wsdlFileText_.addListener( SWT.Modify, statusListener );
-    
-    uiUtils.createHorizontalSeparator( parent, 6 );
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group    methodsGroup = baseConUiUtils.createGroup( parent, "LABEL_METHODS", null, null );
-	methodsGroup.setLayoutData( uiUtils.createFillAll() );
-	
-	GridLayout layout = new GridLayout();
-	layout.marginHeight = 0;
-	layout.marginWidth = 0;
-	methodsGroup.setLayout( layout );
-	
-	methodsTree_ = uiUtils.createTree( methodsGroup, TOOLTIP_PBME_TREE_METHODS, 
-	                                   INFOPOP_PBME_TREE_METHODS,
-	                   				   SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL	| SWT.CHECK );
-	methodsTree_.addListener( SWT.Selection, statusListener );
-
-    Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-    
-    selectAllMethodsButton_ 
-      = baseConUiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL", 
-                                  TOOLTIP_PBME_BUTTON_SELECT_ALL,
-                                  INFOPOP_PBME_BUTTON_SELECT_ALL );
-    selectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                  {
-                                                    public void widgetSelected( SelectionEvent evt )
-                                                    {
-                                                      handleSelectAll( true );
-                                                    }
-                                                  });
-    
-    deselectAllMethodsButton_ 
-      = baseConUiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL", 
-                                  TOOLTIP_PBME_BUTTON_DESELECT_ALL,
-                                  INFOPOP_PBME_BUTTON_DESELECT_ALL );
-    deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSelectAll( false );
-                                                      }
-                                                    });
-    
-    // TODO this group has no TOOLTIP or INFOPOP.
-    Group styleGroup = uiUtils.createGroup( parent, "LABEL_STYLE_USE", null, null );
-    
-    // TODO radio buttons have no TOOLTIP or INFOPOP.
-    docLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_DOC_LITERAL", null, null );
-    rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_LITERAL", null, null );
-    rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_ENCODED", null, null );
-    
-    showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_BEAN2XML",
-                                                    "TOOLTIP_P2N_SHOW_MAPPINGS",
-                                                    INFOPOP_P2N_SHOW_MAPPINGS );
-                                            
-    return this;
-  }
-  
-  public void handleSelectAll( boolean value )
-  {
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  items[i].setChecked(value);
-	}
-	
-	statusListener_.handleEvent( null );
-  }
-  
-  public void setCustomizeServiceMappings( boolean value )
-  {
-    showMappingsCheckbox_.setSelection( value );
-  }
-  
-  public boolean getCustomizeServiceMappings()
-  {
-    return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
-  }
-  
-  public void setJavaParameter( JavaWSDLParameter javaParameter )
-  {
-    javaParameter_ = javaParameter;
-    
-	String wsdlLocation = javaParameter.getOutputWsdlLocation();
-
-	// TODO Verify that we need to find the WSDL in the eclipse file system.
-	//IFile file 
-	//  = ResourceUtils.getWorkspaceRoot().getFileForLocation(new Path(wsdlLocation));
-	//IPath wsdlPath = file.getFullPath();
-	IPath wsdlPath = new Path( wsdlLocation );
-	
-	wsdlFolderText_.setText(wsdlPath.removeLastSegments(1).toString());
-	wsdlFileText_.setText(wsdlPath.lastSegment());
-	
-	String location = javaParameter.getUrlLocation();
-	uriText_.setText(location == null ? "" : location);  
-	
-	methodsTree_.removeAll();
-	Hashtable methods = javaParameter.getMethods();
-	Enumeration e = methods.keys();
-	
-	while( e.hasMoreElements() )
-	{
-	  String   name = (String) e.nextElement();
-      TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-      
-   	  item.setData(name);
-      item.setText(name);
-      item.setChecked((((Boolean) methods.get(name)).booleanValue()));
-	}
-	
-	TreeItem[] items = methodsTree_.getItems();
-	
-	if( items.length > 0 ) 
-	{
-	  methodsTree_.setSelection( new TreeItem[]{ items[0] } );
-	}
-	
-	String style = javaParameter.getStyle();
-	
-	if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
-	{
-	  rpcEncodedButton_.setSelection(true);
-	}
-	else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
-	{
-	  rpcLiteralButton_.setSelection(true);	  
-	}
-	else
-	{
-	  docLiteralButton_.setSelection(true);  
-	}
-  }
-  
-  public JavaWSDLParameter getJavaParameter()
-  {
-    IPath wsdlPath 
-      = new Path( wsdlFolderText_.getText().trim() ).append( wsdlFileText_.getText().trim() );
-	    
-	// TODO Do we need to go to the eclipse file system??
-	//String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
-	String wsdlLocation = wsdlPath.toString();
-	
-	javaParameter_.setOutputWsdlLocation(wsdlLocation);
-	javaParameter_.setInputWsdlLocation(wsdlLocation);
-	
-	Hashtable methods = new Hashtable();
-
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  TreeItem item = items[i];
-	  methods.put((String)item.getData(), new Boolean(item.getChecked()));
-	}
-	
-	javaParameter_.setMethods(methods);
-	
-	if( rpcEncodedButton_.getSelection()) 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
-	} 
-	else if( rpcLiteralButton_.getSelection()) 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
-	} 
-	else 
-	{
-	  javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
-	  javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
-	}
-    
-	return javaParameter_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    IStatus       result   = null;
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    if( wsdlFileText_.getText().equals( "" ) )
-    {
-      result = StatusUtils.errorStatus( msgUtils.getMessage( "PAGE_MSG_NO_FILE_SPECIFIED" ) ); 
-    }
-    else
-    {
-      TreeItem[] items        = methodsTree_.getItems();
-      boolean    itemSelected = false;
-      
-      for( int index = 0; index < items.length; index++ )
-      {
-        if( items[index].getChecked() )
-        {
-          itemSelected = true;
-          break;
-        }
-      }
-      
-      if( !itemSelected )
-      {
-        result = StatusUtils.errorStatus( msgUtils.getMessage( "PAGE_MSG_NO_METHOD_SELECTED" )); 
-      }
-    }
-    
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index 684c41ced..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
+++ /dev/null
@@ -1,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.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-
-public class ValidateObjectSelectionCommand extends AbstractDataModelOperation
-{
-  private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
-  private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-  private MessageUtils msgUtils_;
-  private IStructuredSelection objectSelection;
-  private String serviceProjectName;
-
-  
-  /**
-   * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
-   */
-  public ValidateObjectSelectionCommand()
-  {
-    super();
-    String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-		Environment environment = getEnvironment();
-    //Make sure a bean is selected
-    String javaBeanName = null;
-    if (objectSelection != null && !objectSelection.isEmpty())
-    {
-      Object object = objectSelection.getFirstElement();
-      if (object instanceof String)
-      {
-        javaBeanName = ((String)object);
-      }
-      else
-      {
-      	//The ObjectSelectionWidget never appeared and so the IStucturedSelection from 
-      	//ObjectSelectionWidgetOutputCommand is the initial selection. 
-      	//Get the Java bean name from the selection.
-      	try
-		{
-      	  System.out.println(object.getClass().toString());
-      	  javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
-		} catch (CoreException ce)
-		{
-		  IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"));
-		  environment.getStatusHandler().reportError(errorStatus);
-		  return errorStatus;			
-		}
-      }
-    }    
-    
-    if (javaBeanName==null || javaBeanName.length()==0)
-    {
-      IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"));
-      environment.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-    //Make sure a project is selected
-    IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
-    if (serviceProject==null)
-    {
-      IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_NO_PROJECT"));
-      environment.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    //Make sure the selected bean can be loaded from the selected project
-	if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
-		|| javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
-		javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
-	}
-	
-    try
-    {
-	  JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(serviceProject);
-	  JavaClass javaClass = (JavaClass)JavaRefFactory.eINSTANCE.reflectType(javaBeanName, jMOF.getResourceSet());
-	  if (!javaClass.isExistingType()) 
-	  {		
-		IStatus errorStatus = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }));
-		environment.getStatusHandler().reportError(errorStatus);
-		return errorStatus;
-	  }
-    } catch (CoreException ce)
-    {
-	  IStatus errorStatus = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }));
-	  environment.getStatusHandler().reportError(errorStatus);
-      return errorStatus;      
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  /**
-   * @param serviceProjectName The serviceProjectName to set.
-   */
-  public void setServiceProjectName(String serviceProjectName)
-  {
-    this.serviceProjectName = serviceProjectName;
-  }
-  
-  /**
-   * @param objectSelection The objectSelection to set.
-   */
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    this.objectSelection = objectSelection;
-  }
-
-  private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
-  {
-    String beanClass = "";
-    JavaResourceFilter filter = new JavaResourceFilter(); 
-    //IStructuredSelection selection = initialSelection_;
-    //
-    if (objectSelection != null)
-    {
-      Object obj = objectSelection.getFirstElement();
-      if (obj != null)
-      {
-        // get the IResource represented by the selection
-        IResource res = null;
-        
-        res = ResourceUtils.getResourceFromSelection(obj);
-        
-        if (filter.accepts(res))
-        {
-          // get the package-qualified class name without file extensions
-          String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
-          if (beanPackage==null)
-            beanPackage = "";
-          else
-            beanPackage = beanPackage + ".";
-
-          beanClass = beanPackage + res.getName();
-
-          if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
-            beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
-          }
-        }
-      }
-    }
-    
-    //
-    return beanClass;
-  }    
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index d6965e8b6..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection initialSelection;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI_;
-  private JavaWSDLParameter javaWSDLParam;
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-    javaWSDLParam = new JavaWSDLParameter();
-    javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
-    javaWSDLParam.setSkeletonDeploy(true);
-    javaWSDLParam.setMetaInfOnly(false);
-    return Status.OK_STATUS;
-    
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-  }
-
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-  }
-  
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser == null)
-		webServicesParser = WSDLParserFactory.getWSDLParser();
-    return webServicesParser;
-  }
-
-  public String getWebServiceURI()
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object firstElement = initialSelection.getFirstElement();
-      if (firstElement instanceof IFile)
-      {
-        IFile ifile = (IFile)firstElement;
-        String fileExtension = ifile.getFileExtension();
-        if (fileExtension.equals("wsdl") ||
-            fileExtension.equals("wsil") ||
-            fileExtension.equals("html"))
-        {
-          return ifile.getFullPath().toString();  
-        }
-      }
-    }
-    return "";
-  }
-  
-  public String getWsdlURI()
-  {
-	  return wsdlURI_;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-	  wsdlURI_ = wsdlURI;
-	  
-  }
-  
-  public boolean getGenWSIL()
-  {
-    return false;
-  }
-  
-  public String getWsilURI()
-  {
-    String wsURI = getWsdlURI();
-    int index = wsURI.lastIndexOf('.');
-    if (index != -1)
-    {
-      StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
-      sb.append(".wsil");
-      return sb.toString();
-    }
-    return "";
-  }
-  
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam;
-  }
-
-  public String getHttpBasicAuthPassword()
-  {
-    return getWebServicesParser().getHTTPBasicAuthPassword();
-  }
-
-  public String getHttpBasicAuthUsername()
-  {
-    return getWebServicesParser().getHTTPBasicAuthUsername();
-  }
-  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 611beb04d..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
-  private JavaWSDLParameter javaWSDLParam;
-
-  /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
-  private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
-  private static final String TOOLTIP_PBSC_PAGE = "TOOLTIP_PBSC_PAGE";
-  
-  // private Text uriText_;
-  /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
-  //private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
-  //private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-  
-  private Text wsdlFolderText_;
-  /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-  
-  private Text wsdlFileText_;
-  /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
-  private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
-  private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-  
-  private Combo skeletonFolderText_;
-  /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
-  private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
-  private static final String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER = "TOOLTIP_PBSC_TEXT_SKELETON_FOLDER";
-  //
-
-  /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
-  // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
-  // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-  
-  private Button showMappingsCheckbox_;
-  /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page  */
-  private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-	
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId        = "org.eclipse.jst.ws.axis.creation.ui";
-    String       conPluginId     = "org.eclipse.jst.ws.axis.consumption.ui";
-    String       baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-    
-    MessageUtils msgUtils        = new MessageUtils( pluginId + ".plugin", this );
-    MessageUtils conMsgUtils     = new MessageUtils( conPluginId + ".plugin", this );
-    MessageUtils baseConMsgUtils = new MessageUtils( baseConPluginId + ".plugin", this );
-    UIUtils      uiUtils         = new UIUtils( msgUtils, pluginId );
-    UIUtils      conUiUtils      = new UIUtils( conMsgUtils, pluginId );
-    UIUtils      baseConUiUtils  = new UIUtils( baseConMsgUtils, pluginId );
-
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PBSC_PAGE );
-  	parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBSC_PAGE ) );
-    
-    Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
-    /*
-    uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
-                                   TOOLTIP_PBCF_TEXT_URI,
-                                   INFOPOP_PBCF_TEXT_URI,
-                                   SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    */
-
-    wsdlFolderText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FOLDER_NAME",
-                                          TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
-                                          INFOPOP_PBCF_TEXT_WSDL_FOLDER,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    wsdlFileText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FILE_NAME",
-                                        TOOLTIP_PBCF_TEXT_WSDL_FILE,
-                                        INFOPOP_PBCF_TEXT_WSDL_FILE,
-                                        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, "LABEL_SKELETON_ROOT_NAME",
-        TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
-        INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
-        SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
-    uiUtils.createHorizontalSeparator( parent, 5 );
-
-    showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
-                                                       "TOOLTIP_N2P_SHOW_MAPPINGS",
-                                                       INFOPOP_N2P_SHOW_MAPPINGS );
-        
-    return this;
-  }
-  
-  public void setEndpointURI(String endpointURI)
-  {
-  	/*
-    if (endpointURI != null)
-      uriText_.setText(endpointURI);
-    */
-  }
-  
-  public void setOutputWSDLFolder(String outputWSDLFolder)
-  {
-    if (outputWSDLFolder != null)
-      wsdlFolderText_.setText(outputWSDLFolder);
-  }
-  
-  public void setOutputWSDLFile(String outputWSDLFile)
-  {
-    if (outputWSDLFile != null)
-      wsdlFileText_.setText(outputWSDLFile);
-  }
-  
-  public void setOutputJavaFolder(String outputJavaFolder)
-  {
-    if (outputJavaFolder != null)
-    {
-      int index = skeletonFolderText_.indexOf(outputJavaFolder);
-      if (index != -1)
-        skeletonFolderText_.select(index);
-      else if (skeletonFolderText_.getItemCount() <= 0)
-      {
-        String root = getWorkspaceRootLocation();
-        if (outputJavaFolder.startsWith(root))
-          skeletonFolderText_.setText(outputJavaFolder.substring(root.length()));
-        else
-          skeletonFolderText_.setText(outputJavaFolder);
-      }
-    }
-  }
-  
-  public void setShowMapping(boolean showMapping)
-  {
-    showMappingsCheckbox_.setSelection(showMapping);
-  }
-  
-  public boolean getShowMapping()
-  {
-    return showMappingsCheckbox_.getSelection();
-  }
-
-  /**
-   * @return Returns the javaWSDLParam.
-   */
-  public JavaWSDLParameter getJavaWSDLParam() {
-    String root = getWorkspaceRootLocation();
-    File file = new File(root);
-    try
-    {
-      root = file.toURL().toString();
-      char lastChar = root.charAt(root.length()-1);
-      if (lastChar == '/' || lastChar == '\\')
-        root = root.substring(0, root.length()-1);
-    }
-    catch (MalformedURLException murle)
-    {
-    }
-    javaWSDLParam.setOutput(root + wsdlFolderText_.getText());
-    javaWSDLParam.setJavaOutput(root + skeletonFolderText_.getText());
-	  return javaWSDLParam;
-  }
-
-  /**
-   * @param javaWSDLParam The javaWSDLParam to set.
-   */
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
-	  this.javaWSDLParam = javaWSDLParam;
-  }
-  
-  public void setServerProject(IProject serviceProject)
-  {
-    String originalSkeletonFolder = skeletonFolderText_.getText();
-    skeletonFolderText_.removeAll();
-    IPath[] paths = ResourceUtils.getAllJavaSourceLocations(serviceProject);
-    for (int i = 0; i < paths.length ; i++)
-      skeletonFolderText_.add(paths[i].toString());
-    int index = skeletonFolderText_.indexOf(originalSkeletonFolder);
-    if (index != -1)
-      skeletonFolderText_.select(index);
-    else
-      skeletonFolderText_.select(0);
-  }
-  
-  private String getWorkspaceRootLocation()
-  {
-  	return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
deleted file mode 100644
index 615e05ba0..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOperation
-{
-  private String wsdlURI;
-  private IProject serverProject;
-  private JavaWSDLParameter javaWSDLParam;
-  private String moduleName_;
-
-  public SkeletonConfigWidgetDefaultingCommand( String moduleName )
-  {
-    moduleName_ = moduleName;
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-	{
-    String root = getRootURL();
-    javaWSDLParam.setOutput( root + getOutputWSDLFolder());
-    javaWSDLParam.setJavaOutput(root + getOutputJavaFolder());  
-    return Status.OK_STATUS;
-    
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-  
-  public void setServerProject(String serverProject)
-  {
-    this.serverProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject);
-  }
-
-  public String getEndpointURI()
-  {
-    return null;
-  }
-  
-  public String getOutputWSDLFolder()
-  {
-	  IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject, moduleName_ ).append("wsdl");
-      return wsdlPath.toString();
-  }
-  
-  public String getOutputWSDLFile()
-  {
-    int index = wsdlURI.lastIndexOf('/');
-    if (index == -1)
-      index = wsdlURI.lastIndexOf('\\');
-    return wsdlURI.substring(index+1, wsdlURI.length());
-  }
-  
-  public String getOutputJavaFolder()
-  {
-    if (serverProject!=null){
-      return ResourceUtils.getJavaSourceLocation(serverProject, moduleName_).toString();
-    }
-    return null;
-  }
-
-  public boolean getShowMapping()
-  {
-    return false;
-  }
-  
-  public boolean isShowMapping()
-  {
-    return getShowMapping();
-  }
-  
-  public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
-  {
-  	this.javaWSDLParam = javaWSDLParam;
-  }
-  
-  public JavaWSDLParameter getJavaWSDLParam()
-  {
-    return javaWSDLParam;
-  }
-  
-  private String getRootURL()
-  {
-    String rootURL = ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString(); 
-    File   file    = new File( rootURL );
-    
-    try
-    {
-      rootURL = file.toURL().toString();
-      
-      char lastChar = rootURL.charAt(rootURL.length()-1);
-      
-      if (lastChar == '/' || lastChar == '\\')
-      {
-        rootURL = rootURL.substring(0, rootURL.length()-1);
-      }
-    }
-    catch (MalformedURLException murle)
-    {
-    }
-    
-    return rootURL;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
deleted file mode 100644
index 539b63fb5..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-* This is the class for the
-* Axis bottom up Java Bean scenario
-* 
-*/
-public class WSBeanAxisType implements CommandWidgetBinding
-{	
-  private String serverName_;
-  private String runtimeName_;
-  private boolean isWebModuleRequired_;
-
-
-  /**
-  * Returns a locale specific label for the Server supported by this Web Service type
-  * @return A locale specific server label from server plugins
-  */
-  public String getServerLabel()
-  {
-    return serverName_;
-  }
-
-  /**
-  * Sets the server label to the appropriate name found in the server plugins.
-  * @param server name
-  */
-  public void setServerLabel(String serverLabel)
-  {
-    serverName_ = serverLabel;
-  }
-  
-  /**
-  * Returns a locale specific label for the deployment runtime of this Web Service type
-  * @return A locale specific label for the deployment runtime
-  */
-  public String getRuntimeLabel()
-  {
-    return runtimeName_;
-  }
-
-  /**
-  * Sets the runtime label for the appropriate runtime
-  * @param server name
-  */
-  public void setRuntimeLabel(String runtimeLabel)
-  {
-    runtimeName_ = runtimeLabel;
-  }
-
-
-  /**
-  * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
-  * @return true if requireWebModule
-  */
-  public boolean isWebModuleRequired()
-  {
-    return isWebModuleRequired_;
-  }
-
-  /**
-  * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
-  * @param requireWebModule 
-  */
-  public void setWebModuleRequired(boolean requireWebModule)
-  {
-    isWebModuleRequired_ = requireWebModule;
-  }
-
-  
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
-	 */
-	public boolean isEJBModuleRequired() {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
-	 */
-	public void setEJBModuleRequired(boolean arg0) {
-		return;
-
-	}
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    /*
-    dataRegistry.addMapping( CurrentPageCommand.class, "CurrentPage", BeanClassWidget.class );
-    //BeanClassWidget - as target
-    dataRegistry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", BeanClassWidget.class, "BeanClassName", null);
-    //BeanClassWidget - as source
-    dataRegistry.addMapping(BeanClassWidget.class, "BeanClassName", DefaultsForServerJavaWSDLCommand.class, "JavaBeanName", null);    //BeanConfigWidget
-    */
-    // ObjectSelectionWidget
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", DefaultsForServerJavaWSDLCommand.class);
-    
-    //BeanConfigWidget - as target
-    dataRegistry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BeanConfigWidget.class, "JavaParameter", null );
-    //BeanConfigWidget - as source
-
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);       
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
-    //AxisMappingsWidget - as target
-    dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-    
-    //AxisMappingsWidget - as source
-
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);       
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);    
-    
-    //dataRegistry.addMapping( DefaultsForConfig.class, "JavaParameter", BeanConfigWidget.class );
-    //dataRegistry.addMapping( DefaultsForConfig.class, "CustomizeServiceMappings", BeanConfigWidget.class );
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    /*
-    widgetRegistry.add( "BeanSelection", 
-                        msgUtils.getMessage("PAGE_TITLE_WSBEAN_CLASS"),
-                        msgUtils.getMessage("PAGE_DESC_WSBEAN_CLASS"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new BeanClassWidget();
-                          }
-                        } );
-    */
-
-    widgetRegistry.add( "BeanConfig", 
-                        msgUtils.getMessage("PAGE_TITLE_WSBEAN_CONFIG"),
-                        msgUtils.getMessage("PAGE_DESC_WSBEAN_CONFIG"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new BeanConfigWidget();
-                          }
-                        } );
-
-    String       consPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-    MessageUtils consMsgUtils = new MessageUtils( consPluginId_ + ".plugin", this );
-
-    widgetRegistry.add( "AxisServiceBeanMapping", 
-                        consMsgUtils.getMessage("PAGE_TITLE_WS_BEAN2XML"),
-                        consMsgUtils.getMessage("PAGE_DESC_P2N_MAPPINGS"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
-                          }
-                        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-          //dead code - doesn't matter what gets returned here.
-    	  return new SimpleFragment();
-      }
-    };
-  }
-    
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
deleted file mode 100644
index ede1075bf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements CommandWidgetBinding 
-{
-	private String serverName_;
-	private String runtimeName_;
-	private boolean isWebModuleRequired_;
-
-	/**
-	* Returns a locale specific label for the Server supported by this Web Service type
-	* @return A locale specific server label from server plugins
-	*/
-	public String getServerLabel() {
-		return serverName_;
-	}
-
-	/**
-	* Sets the server label to the appropriate name found in the server plugins.
-	* @param server name
-	*/
-	public void setServerLabel(String serverLabel) {
-		serverName_ = serverLabel;
-	}
-
-	/**
-	* Returns a locale specific label for the deployment runtime of this Web Service type
-	* @return A locale specific label for the deployment runtime
-	*/
-	public String getRuntimeLabel() {
-		return runtimeName_;
-	}
-
-	/**
-	* Sets the runtime label for the appropriate runtime
-	* @param server name
-	*/
-	public void setRuntimeLabel(String runtimeLabel) {
-		runtimeName_ = runtimeLabel;
-	}
-
-	/**
-	* Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
-	* @return true if requireWebModule
-	*/
-	public boolean isWebModuleRequired() {
-		return isWebModuleRequired_;
-	}
-
-	/**
-	* Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
-	* @param requireWebModule 
-	*/
-	public void setWebModuleRequired(boolean requireWebModule) {
-		isWebModuleRequired_ = requireWebModule;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
-	 */
-	public boolean isEJBModuleRequired() {
-
-		return false;
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
-	 */
-	public void setEJBModuleRequired(boolean arg0) {
-		return;
-
-	}
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    // SkeletonConfigWidget
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidget.class, "ServerProject", new ProjectName2IProjectTransformer());
-    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "EndpointURI", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFolder", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFile", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
-    // AxisMappingsFragment
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", AxisMappingsFragment.class);
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "ShowMapping", AxisMappingsFragment.class);
-
-    // AxisMappingsWidget
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
-    // WSDL2JavaCommand
-    dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-    dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    /*
-    widgetRegistry.add( "WSDLSelection", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
-		                new WidgetContributorFactory()
-                        {
-		                  public WidgetContributor create()
-		                  {
-		                    return new WSDLSelectionWidget();
-		                  }
-		                } );
-
-    widgetRegistry.add( "WSDLSelectionTreeWidget", 
-        msgUtils.getMessage("PAGE_TITLE_WSDL_SELECTION"),
-        msgUtils.getMessage("PAGE_DESC_WSDL_SELECTION"),
-        new WidgetContributorFactory()
-        {
-          public WidgetContributor create()
-        {
-            return new WSDLSelectionTreeWidget();
-        }
-        });
-    */
-
-    widgetRegistry.add( "SkeletonConfig", 
-                        msgUtils.getMessage("PAGE_TITLE_WSSKEL_CONFIG"),
-                        msgUtils.getMessage("PAGE_DESC_WSSKEL_CONFIG"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new SkeletonConfigWidget();
-                          }
-                        } );
-
-    widgetRegistry.add( "AxisMappingsWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_XML2BEAN"),
-                        msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
-                          }
-                        } );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-          //dead code - doesn't matter what gets returned here. 
-    	  return new SimpleFragment();
-      }
-    };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index c5d15943e..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             beanConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private BeanConfigWidget                    beanWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisBeanConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSBeanAxisType() );
-	  
-	  beanConfigWidget_ = adapter_.getWidget( "BeanConfig" );
-	  beanWidget_       = (BeanConfigWidget)beanConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisServiceBeanMapping" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return beanConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == beanConfigWidget_ && beanWidget_.getCustomizeServiceMappings() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index cbab9b4e9..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory {
-
-	private INamedWidgetContributor             skelConfigWidget_;
-	private INamedWidgetContributor             mappingsWidget_;
-	private SkeletonConfigWidget                skelWidget_;
-	private WidgetBindingToWidgetFactoryAdapter adapter_;
-	
-	public AxisSkeletonConfigWidgetFactory()
-	{
-	  adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSWSDLAxisType() );
-	  
-	  skelConfigWidget_ = adapter_.getWidget( "SkeletonConfig" );
-	  skelWidget_       = (SkeletonConfigWidget)skelConfigWidget_.getWidgetContributorFactory().create();
-	  mappingsWidget_   = adapter_.getWidget( "AxisMappingsWidget" );
-	}
-	
-	public INamedWidgetContributor getFirstNamedWidget() 
-	{
-	  return skelConfigWidget_;
-	}
-
-	public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-	{
-	  return widgetContributor == skelConfigWidget_ && skelWidget_.getShowMapping() ? mappingsWidget_ : null;
-	}
-	
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-	  adapter_.registerDataMappings( dataRegistry );
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
deleted file mode 100644
index 696537baf..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.GeronimoAxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisOutputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisRunInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.CopyDeploymentFileCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BUAxisDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
-	private AxisWebServiceInfo axisWebServiceInfo_;
-
-	public AxisWebService(WebServiceInfo info)
-	{
-		super(info);
-	}
-
-	public ICommandFactory assemble(Environment env, IContext ctx,
-			ISelection sel, String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		
-		Vector commands = new Vector();
-    EclipseEnvironment environment = (EclipseEnvironment)env;
-		
-		if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-			
-			registerBUDataMappings( environment.getCommandManager().getMappingRegistry());
-			
-			commands.add(new BUAxisInputCommand(this, project, module));
-//			commands.add(new ValidateObjectSelectionCommand());
-			commands.add(new BUAxisDefaultingCommand());
-			commands.add(new DefaultsForServerJavaWSDLCommand(module));
-			commands.add(new JavaToWSDLMethodCommand());
-			// commands.add(new SimpleFragment( "BeanConfig" ));
-			// commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
-			commands.add(new BUCheckAxisDeploymentDescriptors(module));
-			commands.add(new CopyAxisJarCommand(module));
-			commands.add(new WaitForAutoBuildCommand());
-			commands.add(new Java2WSDLCommand());
-			commands.add(new RefreshProjectCommand());
-			commands.add(new WSDL2JavaCommand());
-			commands.add(new MoveJavaFilesTask(module));
-			commands.add(new UpdateAxisWSDDFileTask(module));
-			commands.add(new UpdateWEBXMLCommand(module));
-			commands.add(new RefreshProjectCommand());
-			commands.add(new BuildProjectCommand());
-			commands.add(new AxisOutputCommand(this));
-			
-		} else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-			
-			registerTDDataMappings( environment.getCommandManager().getMappingRegistry());
-			
-			commands.add(new TDAxisInputCommand(this, project, module));
-			commands.add(new AxisSkeletonDefaultingCommand());
-		    commands.add(new ValidateWSDLCommand());
-		    commands.add(new SkeletonConfigWidgetDefaultingCommand(module));
-//			commands.add(new SimpleFragment( "SkeletonConfig" ));
-//			commands.add(new SimpleFragment( "AxisMappingsWidget" ));
-		    commands.add(new TDCheckAxisDeploymentDescriptors(module));
-			commands.add(new CopyAxisJarCommand(module));
-		    commands.add(new WSDL2JavaCommand());
-		    commands.add(new MoveDeploymentFilesTask(module));
-		    commands.add(new Skeleton2WSDLCommand(module));
-		    commands.add(new UpdateWEBXMLCommand(module));
-		    commands.add(new RefreshProjectCommand());
-		    commands.add(new BuildProjectCommand());
-			commands.add(new AxisOutputCommand(this));
-			
-		} else {
-			System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
-			return null;
-		}
-		
-		
-		return new SimpleCommandFactory(commands);
-	}
-
-	public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		return null;
-	}
-
-	public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-			String project, String module, String earProject, String ear)
-	{
-		Vector commands = new Vector();
-
-		if (ctx.getScenario().getValue() == WebServiceScenario.CLIENT) {
-			System.out
-					.println("Error - WebServiceScenario should not be Client for AxisWebService");
-			return null;
-		} else {// For BOTTOM_UP and TOP_DOWN
-			commands.add(new AxisRunInputCommand(this, project, module));
-//			commands.add(new StartProjectCommand(module));
-			if (getWebServiceInfo().getServerFactoryId().equals("org.eclipse.jst.server.geronimo.10")) {
-				commands.add(new GeronimoAxisDeployCommand(project, module));
-			}
-			else {
-			    commands.add(new AxisDeployCommand());
-			}
-			commands.add( new CopyDeploymentFileCommand( project, module ) );
-			commands.add(new RefreshProjectCommand());
-			if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-				commands.add(new ComputeAxisSkeletonBeanCommand());
-				commands.add(new OpenJavaEditorCommand());
-			}
-			return new SimpleCommandFactory(commands);
-		}
-	}
-	
-	public void registerBUDataMappings(DataMappingRegistry registry) 
-	  {
-		//BUAxisInputCommand
-//		registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-		registry.addMapping(BUAxisInputCommand.class, "JavaBeanName", BUAxisDefaultingCommand.class );
-		
-	    //ValidateObjectSelectionCommand
-//	    registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-//	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-	    
-	    //BUAxisDefaultingCommand
-//	    registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-//KSC   registry.addMapping(BUAxisInputCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-	    	    
-	    //BUAxisCommands2 - these run after BeanClassWidget
-	    //DefaultsForServerJavaWSDLCommand
-	    registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
-	    registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
-	    
-	    //JavaWSDLMethodCommand
-	    registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
-	    // BUAxisCommands3 - these run after BeanConfigWidget
-    
-	    //CheckAxisDeploymentDescriptorsTask
-	    //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCheckAxisDeploymentDescriptors.class, "ServerProject", new StringToIProjectTransformer());
-	    
-	    //CopyAxisJarCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-	    	    
-	    //Java2WSDLCommand
-	    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-	    
-	    //RefreshProjectCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-	    
-	    //WSDL2JavaCommand
-	    registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-	    
-
-	    //MoveJavaFilesTask
-	    registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-	    
-	    //UpdateAxisWSDDFileTask
-	    registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-	    
-	    //UpdateWEBXMLCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-	    
-	    //BuildProjectCommand
-	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
-	    registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
-	    registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-	    
-	    //StartProjectCommand
-//	    registry.addMapping(BUAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());    
-//	    registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-//KSC   registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-//	    registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-//	    registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-//	    registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-//	    registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-	        
-		// AxisOutputCommand
-	    registry.addMapping(Java2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
-		registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisOutputCommand.class);    
-		
-		// Run extension
-		
-		// GeronimoAxisDeployCommand
-		registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);		
-	    
-		//AxisDeployCommand
-	    registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-		
-	    //RefreshProjectCommand
-	    registry.addMapping(AxisRunInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
-	    
-	    
-	  }
-
-	public void registerTDDataMappings(DataMappingRegistry dataRegistry)
-	  {
-	    // Transformers
-	    ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
-		// TODO:  map "InitialSelection" and "ObjectSelection" from TDAxisInputCommand
-		
-//	    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-//	    dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-//	    dataRegistry.addMapping(TDAxisInputCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-	    
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.class);
-		dataRegistry.addMapping(TDAxisInputCommand.class, "WsdlURI", AxisSkeletonDefaultingCommand.class);
-	    // ValidateWSDLCommand
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-	    
-	    // SkeletonConfigWidgetDefaultingCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-	    
-	    // CheckAxisDeploymentDescriptorsTask
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCheckAxisDeploymentDescriptors.class, "ServerProject", projectTransformer);
-    
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-//		WSDL2JavaCommand
-	  	dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-		
-	    // MoveDeploymentFilesTask
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
-	    // CopyAxisJarCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
-	    // Skeleton2WSDLCommand
-	    dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
-	    // UpdateWEBXMLCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
-	    // RefreshProjectCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-	    
-	    // BuildProjectCommand
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
-	    // GeronimoAxisDeployCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", GeronimoAxisDeployCommand.class);
-	    
-	    // AxisDeployCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-	    
-	    // AxisOutputCommand
-	    dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
-		dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisOutputCommand.class); 
-	    
-	    // ComputeAxisSkeletonBeanCommand
-	    dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
-	    //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
-	    //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-	    
-	    // OpenJavaEditorCommand
-	    dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
-	    dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
-	  }
-	public AxisWebServiceInfo getAxisWebServiceInfo() {
-		return axisWebServiceInfo_;
-	}
-
-	public void setAxisWebServiceInfo(AxisWebServiceInfo axisWebServiceInfo) {
-		axisWebServiceInfo_ = axisWebServiceInfo;
-	}
-}	
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 1e7f78be2..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-
-public class AxisWebServiceInfo {
-	
-	private JavaWSDLParameter javaWSDLParameter;
-
-	public JavaWSDLParameter getJavaWSDLParameter() {
-		return javaWSDLParameter;
-	}
-
-	public void setJavaWSDLParameter(JavaWSDLParameter javaWSDLParameter) {
-		this.javaWSDLParameter = javaWSDLParameter;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index 38c8c87d7..000000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class AxisWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
-	public IWebService getWebService(WebServiceInfo info)
-	{
-    return new AxisWebService(info);
-	}
-
-	public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
-	{
-		return new AxisWebServiceClient(info);
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
deleted file mode 100644
index 95d29077a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.project b/bundles/org.eclipse.jst.ws.consumption.ui/.project
deleted file mode 100644
index 788372810..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.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.consumption</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.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 2e5bcdfa1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,71 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.internal.consumption.ui.action,
- org.eclipse.jst.ws.internal.consumption.ui.command,
- org.eclipse.jst.ws.internal.consumption.ui.command.data,
- org.eclipse.jst.ws.internal.consumption.ui.common,
- org.eclipse.jst.ws.internal.consumption.ui.extension,
- org.eclipse.jst.ws.internal.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.consumption.ui.preferences,
- org.eclipse.jst.ws.internal.consumption.ui.selection,
- org.eclipse.jst.ws.internal.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample,
- org.eclipse.jst.ws.internal.consumption.ui.wizard,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi,
- org.eclipse.jst.ws.internal.consumption.ui.wsil,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt,
- org.eclipse.jst.ws.internal.consumption.ui.server
-Require-Bundle: org.eclipse.wst.ws.parser,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.ws,
- org.eclipse.jem.workbench,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.jst.j2ee.webservices.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.ws.ui,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.wst.wsdl.validation,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
deleted file mode 100644
index ffb8cb268..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
-src.includes = schema/
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
deleted file mode 100644
index 8da3a2131..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
deleted file mode 100644
index a113c85cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
deleted file mode 100644
index eaba51f62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
deleted file mode 100644
index 1ee05fa2e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
deleted file mode 100644
index 1060dd967..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
deleted file mode 100644
index 590d3965f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
deleted file mode 100644
index 68b7a2651..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
deleted file mode 100644
index 927ad5ad4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
deleted file mode 100644
index 641fe843a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
deleted file mode 100644
index a3061e6ff..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
deleted file mode 100644
index afb6cb7d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
deleted file mode 100644
index 53e7dbd12..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
deleted file mode 100644
index 11b34b7db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
deleted file mode 100644
index 618a946cd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
deleted file mode 100644
index 8fb844f5b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
deleted file mode 100644
index 7c5916fb6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
deleted file mode 100644
index ccd373839..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,121 +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 Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-
-XP_PUBLIC_UDDI_REGISTRY_TYPES=Public UDDI Registry Types
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
-XP_WEB_SERVICE_CLIENT_TYPES=Web Service Client Types
-XP_WEB_SERVICE_TEST=Web Service Test
-XP_WEB_SERVICE_SERVER_RUNTIME_TYPES=Web Service Server Runtime Types
-XP_WEB_SERVICE_CLIENT_PROJECT_TYPE=clientProjectType
-XP_OBJECT_SELECTION_WIDGET=objectSelectionWidget
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-PLUGIN_IMPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_CLIENT=Access an existing XML web service
-PLUGIN_IMPORT_WIZARD_DESC_WS=A wizard for importing a web service
-IMPORT_WIZARD_DESC_WSIL=Import WSDL references to a WSIL document
-
-#
-# Web Samples IDs
-#
-SAMPLE_TYPE_WEBSERVICES_ID=Web service sample JSPs
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-ACTION_GEN_SAMPLE=Generate Sample JSPs
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Hide Generate Java bean Proxy Dialog
-CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG=Hide Proxy To Sample Generation Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Hide the dialog for generating the Java bean proxy action.
-TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE=Hide the dialog for generating the sample application action.
-
-#
-#       Web Services Preferance Pages
-#
-# Categories
-
-PREFERENCE_CATEGORY_SERVER_RUNTIME=Server and Runtime
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_TEST_FACILITY=Test Facility Defaults
-PREFERENCE_CATEGORY_DIALOGS=Popup Dialog Selection
-
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP=SAP UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST=SAP UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS=XMethods Registry
-PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM=NTT Communications Registry
-
-#
-# WSIL proxy
-#
-IMPORT_WIZARD_NAME_WSIL=WSIL
-POPUP_GENERATE_WSIL=Generate WSIL
-
-#
-# Web Service Server Runtime Type
-#
-WEBSERVICETYPE_NAME_WSDL=Skeleton Java bean Web Service
-WEBSERVICETYPE_NAME_JAVA=Java bean Web Service
-
-#
-# Client project type
-#
-LABEL_CLIENT_TYPE_WEB=Web
-LABEL_CLIENT_TYPE_EJB=EJB
-LABEL_CLIENT_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_TYPE_CONTAINERLESS=Java
-
-#
-# Handlers Configuration wizard page
-#
-POPUP_ADD_HANDLERS=Configure handlers
-LABEL_HANDLERS_CONFIG=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
deleted file mode 100644
index 84a767c1d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,707 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension-point
-      id="publicUDDIRegistryType"
-      name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
-   <extension-point
-      id="privateUDDIRegistryType"
-      name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
-   <extension-point
-      id="webServiceTest"
-      name="%XP_WEB_SERVICE_TEST"
-      schema="schema/webServiceTest.exsd"/>
-
-   <extension-point
-      id="objectSelectionWidget"
-      name="%XP_OBJECT_SELECTION_WIDGET"
-      schema="schema/objectSelectionWidget.exsd"/>
-
-   <!-- UDDI Registry Types -->
-   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
-      <publicUDDIRegistryType
-            name="%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM"
-            class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm">
-      </publicUDDIRegistryType>
-   </extension>
-
-   <!-- Test Facilities -->
-   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceTest">
-
-      <webServiceTest
-            methodsneeded="true"
-            name="%SAMPLE_TYPE_WEBSERVICES_ID"
-            java="true"
-            codegen="true"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.WebServiceWSSampleExecutable"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest">
-      </webServiceTest>
-
-      <webServiceTest
-            methodsneeded="false"
-            name="%WSEXPLORER_ID"
-            java="false"
-            codegen="false"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable">
-      </webServiceTest>
-
-   </extension>
-
-   <!-- Dynamic Wizards -->
-
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
-            icon="icons/full/ctool16/newclient_webserv_wiz.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <description>
-               %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ClientWidgetBinding"
-            title="%WIZARD_TITLE_WSC"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/gen_sample_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.GenSampleWidgetBinding"
-            title="%WIZARD_TITLE_WSC"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-      </dynamicWizard>
-   </extension>
-
-   <!-- extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/config_handler_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigServiceHandlersWidgetBinding"
-            title="%LABEL_HANDLERS_CONFIG"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-      </dynamicWizard>
-   </extension -->
-
-   <!-- extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/config_handler_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigClientHandlersWidgetBinding"
-            title="%LABEL_HANDLERS_CONFIG"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-      </dynamicWizard>
-   </extension -->
-
-   <!-- extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/config_handler_wiz.gif"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigureHandlersWidgetBinding"
-            title="%LABEL_HANDLERS_CONFIG"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
-      </dynamicWizard>
-   </extension -->   
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
-            icon="icons/import_ws.gif"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="wsimport">
-         <description>
-               %PLUGIN_IMPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/import_ws_wiz.gif"
-            name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
-            id="wsimport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.importWizards">
-      <wizard
-            name="%IMPORT_WIZARD_NAME_WSIL"
-            icon="icons/wsil/import_wsil.gif"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="wsilimport">
-         <description>
-               %IMPORT_WIZARD_DESC_WSIL
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/wsil/import_wiz_banner_wsil.gif"
-            name="%IMPORT_WIZARD_NAME_WSIL"
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
-            id="wsilimport">
-      </dynamicWizard>
-   </extension>
-
-   <!-- Preference Pages -->
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-
-      <page
-            name="%PREFERENCE_CATEGORY_SERVER_RUNTIME"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage"
-            id="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage">            
-      </page>
-      
-      <page
-            name="%PREFERENCE_CATEGORY_DIALOGS"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.wst.command.internal.env.ui.preferences.ActionDialogsPreferencePage"
-            id="org.eclipse.jst.wss.popup.category">
-      </page>
-
-      <page
-            name="%PREFERENCE_CATEGORY_TEST_FACILITY"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage">
-      </page>
-
-      <page
-            name="%PREFERENCE_CATEGORY_PROJECT_TOPOLOGY"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage">
-      </page>
-      
-   </extension>
-
-   <!-- Main Menu Actions -->
-
-   <extension point="org.eclipse.ui.actionSets">
-
-      <actionSet
-            label="%COMMAND_LAUNCH_WS_EXPLORER"
-            visible="true"
-            id="org.eclipse.jst.ws.consumption">
-         <menu
-               label="%MENU_RUN"
-               path="additions"
-               id="org.eclipse.ui.run">
-            <separator name="explorer">
-            </separator>
-         </menu>
-         <action
-               label="%COMMAND_LAUNCH_WS_EXPLORER"
-               icon="icons/registry.gif"
-               tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
-               class="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction"
-               menubarPath="org.eclipse.ui.run/explorer"
-               toolbarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction">
-        </action>
-     </actionSet>
-
-   </extension>
-
-   <!-- "Don't Show Me" Extensions -->
-
-   <extension
-         point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
-      <actionDialogPreferenceType
-            showcheckbox="true"
-            name="%CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG"
-            category="org.eclipse.jst.wss.popup.category"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY"
-            infopop="org.eclipse.jst.ws.consumption.ui.PPAD0004"
-            alwayshide="false"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG"
-            category="org.eclipse.jst.wss.popup.category"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE"
-            infopop="org.eclipse.jst.ws.consumption.ui.PPAD0005"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            showcheckbox="false"
-            alwayshide="false"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-      </actionDialogPreferenceType>
-
-      <!-- actionDialogPreferenceType
-            showcheckbox="false"
-            alwayshide="false"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-      </actionDialogPreferenceType -->
-
-   </extension>
-
-   <!-- Popups -->
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsil"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-         <action
-               label="%ACTION_GEN_SAMPLE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-         <action
-               label="%ACTION_GEN_SAMPLE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="wsilimport">
-         </action>
-      </objectContribution>
-
-      <!-- objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="webservices.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-         </action>
-      </objectContribution>   
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
-         </action>
-         <visibility>
-			<objectState
-                  name="type"
-                  value="Handlers">
-            </objectState>
-         </visibility>
-      </objectContribution>     
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
-         </action>
-      </objectContribution>            
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="webservicesclient.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="ejb-jar.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>    
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="web.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution>  
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="application-client.xml"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution> 
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
-         <action
-               label="%POPUP_ADD_HANDLERS"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
-         </action>
-      </objectContribution -->      
-      
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         <action
-               label="%ACTION_GENERATE_JAVA_PROXY"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-               label="%POPUP_GENERATE_WSIL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="wsilimport">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-         objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-         nameFilter="*"
-         id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
-         <action
-            label="%POPUP_GENERATE_WSIL"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-            menubarPath="additions"
-            id="wsilimport">
-         </action>
-      </objectContribution>
-
-   </extension>
-
-   <!-- Object Selection Widgets -->
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
-      </objectSelectionWidget>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer"            
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
-      </objectSelectionWidget>
-   </extension>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
-      <objectSelectionWidget
-            class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer"
-            id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget">
-      </objectSelectionWidget>
-   </extension>
-   
-   <!-- New extension points for WTP M4 -->
-   <extension-point id="wsImpl" name="Web service implementations"/>
-   <extension-point id="wsClientImpl" name="Web service client implementations"/>
-   <extension-point id="serviceType" name="Extensions that provide unique combinations of service implementations, scenarios, and module types "/>
-   <extension-point id="clientType" name="Extensions that provide unique combinations of client implementations and module types"/>
-   <extension-point id="webServiceRuntime" name="Web service runtimes"/>
-   <extension-point id="tester" name="Web service test facilities"/>
-
-<!-- M4 Extensions to the new extension points -->
-
-<!-- Test Extensions beginning  -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
-  <tester
-    id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
-    label="%SAMPLE_TYPE_WEBSERVICES_ID"
-    testWSDL="no"
-    wsClientImplIds="org.eclipse.jst.ws.client.type.java"
-    moduletypes="webmodule"
-    methodsneeded="true"
-    class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.GSTCWebServiceTester">
-  </tester>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
-  <tester
-    id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorer"
-    label="%WSEXPLORER_ID"
-    testWSDL="yes"
-    wsClientImplIds="org.eclipse.jst.ws.client.type.java"
-    moduletypes="webmodule"
-    methodsneeded="false"
-    class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WSEWebServiceTester">
-  </tester>
-</extension>
-
-<!-- Test Extensions end  -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-  <webServiceImpl
-            id="org.eclipse.jst.ws.wsImpl.java"
-            label="%WEBSERVICETYPE_NAME_JAVA"
-            resourceTypeMetadata="File IResource CompilationUnit"
-            extensionMetadata=".java .class"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
-  </webServiceImpl>
-</extension>   
-<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
-  <webServiceClientImpl
-            id="org.eclipse.jst.ws.client.type.java"
-            label="Java Proxy">
-  </webServiceClientImpl>
-</extension>   
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
-  <serviceType
-            id="org.eclipse.jst.ws.serviceType.java"
-            implId="org.eclipse.jst.ws.wsImpl.java"
-            buModuleTypesInclude="jst.web"
-            buModuleTypesExclude=""
-            tdModuleTypesInclude="jst.web"
-            tdModuleTypesExclude="">
-  </serviceType>
-</extension>   
-
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
-  <clientType
-            id="org.eclipse.jst.ws.clientType.java.webOnly"
-            implId="org.eclipse.jst.ws.client.type.java"
-            moduleTypesInclude="jst.web"
-			moduleTypesExclude="">
-  </clientType>
-</extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
-  <clientType
-            id="org.eclipse.jst.ws.clientType.java.j2ee"
-            implId="org.eclipse.jst.ws.client.type.java"
-            moduleTypesInclude="jst.web jst.ejb jst.appclient jst.utility"
-			moduleTypesExclude="">
-  </clientType>
-</extension>
-
-   	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="StartClientServer"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand"
-             class="org.eclipse.jst.ws.internal.consumption.ui.server.StartClientWidgetFactory"/>
-    </extension> 
-    	
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
deleted file mode 100644
index 699521323..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="clientProjectType" name="clientProjectType"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            This extension point defines client container types.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.clientProjectType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="clientProjectType">
-      <complexType>
-         <attribute name="include" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type only works with these particular project types.  For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="exclude" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type DOES NOT work with these particular project types.  For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This label represents this client project type.  It is displayed to the user so it must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  A unique identifier for this client project type.  This identifier is referenced in the clientProjectType attribute of the webServiceClientType element of an org.eclipse.jst.ws.consumption.ui.webServiceClientType extension.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
deleted file mode 100644
index 61cefe041..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="objectSelectionWidget" name="objectSelectionWidget"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.objectSelectionWidget.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="objectSelectionWidget">
-      <annotation>
-         <documentation>
-            This extension point entry allows an extender to add new ways of browsing/finding artifacts that can be used to create Web services.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This class defines Selection Widget to be displayed on the Object Selection page of the Web services wizards.  This class must implement the org.eclipse.jst.ws.consumption.ui.widgets.object.IObjectSelectionWidget interface.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This id uniquely identifies this objectSelectionWidget element.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="transformer" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a class that must implement the org.eclipse.wst.command.internal.provisional.env.core.data.Transformer interface.  This interface contains a transform method.  Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection.  This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
deleted file mode 100644
index 3bbe2f214..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="" id="webServiceClientType" name="Web Service Client Types"/>
-      </appInfo>
-      <documentation>
-         This extension point defines Web Service Client types.  This is done by defining webServiceClientType elements.  These elements refer to a server and a Web Service runtime.  These are respectively defined in the webServiceServer element and the webServiceRuntime element.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceClientType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceClientType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceServer">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular server type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="factoryId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the factory id for a server.  This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this server should be used as the default server.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular server as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is a local ID for this server.  The server attribute of the webserviceClientType element refers to this ID.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtimeTypeIds" type="string">
-            <annotation>
-               <documentation>
-                  This attribute is currently a place holder for future development.  Please, do not use.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceRuntime">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services runtime.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This label is displayed to the user for this runtime.  Therefore, is must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A description of this Web Services runtime.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this runtime should be used as the default runtime.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular runtime as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="j2eeversion" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the J2EE versions supported by this runtime.  The allowable values are 12, 13, and 14.  If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be &quot;12 13&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceClientType">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services client type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the ID for this Web Service Client type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name for this Web Service Client type.  It is displayed to the user so it must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="clientType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the kind of Web Service Client type being defined. (ie. the value of the Java client is org.eclipse.jst.ws.client.type.java.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtime" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the runtime ID for this Web Service client type.  There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="server" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the server for this Web Service client type.  There should be a corresponding webServiceServer element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="clientProjectType" type="string" use="default" value="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
-            <annotation>
-               <documentation>
-                  This attribute contains a space delimited list of client project type ids supported by this by this webServiceClientType element.  The client project type ids are defined by the org.eclipse.jst.ws.consumption.ui.clientProjectType extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="developBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE development phase.  The Command and UI elements in this binding always come first in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="assemblyBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE assembly phase.  The Command and UI elements in this binding always come after the development phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="deployBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE deploy phase.  The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="installBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE install phase.  The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
deleted file mode 100644
index ec44bcaf7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceServerRuntimeType" name="Web Service Server Runtime Types"/>
-      </appInfo>
-      <documentation>
-         This extension point defines Web Service Server types.  This is done by defining webServiceServerRuntimeType elements.  These elements refer to a server and a Web Service runtime.  These are respectively defined in the webServiceServer element and the webServiceRuntime element.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceServerRuntimeType" minOccurs="1" maxOccurs="unbounded"/>
-            <element ref="webServiceType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceServer">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular server type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="factoryId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the factory id for a server.  This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this server should be used as the default server.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular server as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is a local ID for this server.  The server attribute of the webserviceServerRuntimeType element refers to this ID.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtimeTypeIds" type="string">
-            <annotation>
-               <documentation>
-                  This attribute is currently a place holder for future development.  Please, do not use.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceRuntime">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services runtime.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This label is displayed to the user for this runtime.  Therefore, is must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string">
-            <annotation>
-               <documentation>
-                  A description of this Web Services runtime.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="isDefault" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  This parameter indicates if this runtime should be used as the default runtime.  Note:  this default parameter is only used in the absence of other information.  If the user has defined a particular runtime as their default then this parameter is ignored.  Should contain a value of either &quot;true&quot; or &quot;false&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="j2eeversion" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the J2EE versions supported by this runtime.  The allowable values are 12, 13, and 14.  If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be &quot;12 13&quot;.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceServerRuntimeType">
-      <annotation>
-         <documentation>
-            This element specifies information about a particular Web Services server runtime type.  An entry for this element defines a valid combination of server, runtime, and webservice type.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the ID for this Web Service Server Runtime type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the name for this Web Service Server Runtime type.  It is displayed to the user so it must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="runtime" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the runtime ID for this Web Service Server Runtime type.  There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="server" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute specifies the server for this Web Service Server Runtime type.  There should be a corresponding webServiceServer element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="type" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is the kind of Web Service Runtime type being defined. (eg. the value of a Java Bean Webservice is org.eclipse.jst.ws.type.java)
-There should be a corresponding webServiceType element with an attribute called id that has this value.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="developBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE development phase.  The Command and UI elements in this binding always come first in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="assemblyBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE assembly phase.  The Command and UI elements in this binding always come after the development phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="deployBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE deploy phase.  The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="installBinding" type="string">
-            <annotation>
-               <documentation>
-                  This attribute specifies a CommandWidgetBinding class.  This class specifies the Commands and UI elements associate with J2EE install phase.  The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="requireEJBModule" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If the Webservice for this Server Runtime Type is required to be in an EJB module then the value of this attribute should be true.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="requireWebModule" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  If the Webservice for this Server Runtime Type is required to be in an Web module then the value of this attribute should be true.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceType">
-      <annotation>
-         <documentation>
-            This element defines a particular Web service kind.  Such as a Java Bean web service, a Skeleton Web service, an EJB  Web service, etc.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This a unique ID for this Web service type.  It is referenced in the webServiceServerRuntimeType element with the type attribute.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This is a translatable label for this web service type.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="resourceTypeMetadata" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list class Names. (ie.No package prefix)  The classes listed define the allowable Eclipse resources that this web service type understands and turn into a Web service.  For example, if a user selects a Java source file in the package explorer view and then starts the Web services wizard a CompilationUnit object will be passed in as part of an IStructuredSelection.  By putting &quot;CompilationUnit&quot; as one of the classes in this attribute it indicates that this type can create a Web service from the CompilationUnit.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="extensionMetadata" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute allows this Web service type to restrict names of the input files that it understands.  For example, if the value is set to &quot;.java .class&quot; it indicates that this Web service type only understands resource names that end with .java or end with .class.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="objectSelectionWidget" type="string" use="required">
-            <annotation>
-               <documentation>
-                  On page 2 of the Web service wizard there is an Object selection page.  This selection page can be customized using this attribute, since different Web service types may need different methods of selecting them.  The value of this attribute should be the id of a org.eclipse.jst.ws.consumption.ui.objectSelectionWidget extension.  The predefined id for a Java selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.JavaBeanSelectionWidget.  The predefined id for a WSDL selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.WSDLSelectionWidget.  The predefined id for an EJB selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.EJBSelectionWidget.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="includeNatures" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type only works with these particular project types.  For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="excludeNatures" type="string" use="required">
-            <annotation>
-               <documentation>
-                  This attribute contains a blank delimited list of Project Nature Ids.  The listed IDs indicate that this type DOES NOT work with these particular project types.  For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
deleted file mode 100644
index e462b0487..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceTest" name="Web Service Test"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <documentation>
-            This extension point defines Web service test facilities that can be plugged into the Web services wizards.
-         </documentation>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceTest.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="webServiceTest">
-      <complexType>
-         <attribute name="methodsneeded" type="boolean">
-            <annotation>
-               <documentation>
-                  This attribute indicates if this test facility need to methods from a proxy bean.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  The value of this attribute is displayed to the user for this test facility.  It must be translated.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="java" type="boolean">
-            <annotation>
-               <documentation>
-                  This attribute indicates whether this test facility is intended for clients that generate a Java bean as output.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="codegen" type="boolean">
-            <annotation>
-               <documentation>
-                  This attribute indicates if this test facility generates code or not, such as JSP files.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  This attribute contains a class name.  The class must implement org.eclipse.jst.ws.ext.WebServiceExecutable.  This class allows the extender to provide the Commands that will execute for this test facility.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  This is a unique identifier for this test facility.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
deleted file mode 100644
index 376ed9fb8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,564 +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.
-#
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-#
-# Web services "Internet" preferences extension.
-#
-
-#
-# Web Samples IDs
-#
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Show Generate Java bean Proxy Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Show the dialog for generating the Java bean proxy action.
-
-#
-#       Web Services Preferance Pages
-#
-# Categories
-#
-
-#
-# Preferences Tooltips
-#
-
-#
-#Server Runtime Preferences
-#
-TOOLTIP_SRPF_COMBO_SERVER=The preferred server type
-TOOLTIP_SRPF_COMBO_RUNTIME=The preferred Web service runtime
-TOOLTIP_SRPF_COMBO_J2EE=The preferred J2EE version
-
-#
-# Pop-up actions
-#
-
-#
-# General messages.
-#
-MSG_ERROR_TASK_EXCEPTED=IWAB0234E An internal error occurred. Details: {0}
-MSG_ERROR_NO_SERVER_RUNTIME=No suitable server can be found for the {0} Web service runtime. Go to Window > Preferences. Select Server > Installed Runtimes and configure one of the following: {1}
-
-
-
-
-#
-#Runtime labels
-#
-
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Common wizard strings.
-#
-LABEL_FOLDER_NAME=Folder:
-LABEL_JSP_FOLDER_NAME=JSP folder:
-LABEL_WEB_PROJECT_NAME=Web project:
-LABEL_WEBSERVICETYPE=Web service type:
-LABEL_J2EE_VERSION=J2EE version:
-LABEL_NA=N/A
-
-BUTTON_BROWSE=Browse...
-BUTTON_BROWSE_FILES=Browse files...
-BUTTON_USE_ABSOLUTE_LOCATION=Use absolute location URI for WSDL input statements
-BUTTON_USE_INLINE_SCHEMA=Use inline schema
-
-BOTTOMUP_LABEL=Bottom up
-TOPDOWN_LABEL=Top down
-CLIENT_LABEL=Client
-COMBINED_TYPE_AND_RUNTIME_LABEL={0} {1}
-
-
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-#
-# WebServiceClientSelectionPage
-#
-
-#
-# WebServiceServerSelectionPage
-#
-
-#
-# WebServiceProjectPage
-#
-PAGE_TITLE_WS_PROJECT=Web Services
-PAGE_DESC_WS_PROJECT=Review your Web service options and make any necessary changes before proceeding to the next page.
-BUTTON_START_WEB_PROJECT=Start Web service in Web project
-GROUP_SCENARIO_SERVICE=Service
-GROUP_SCENARIO_CLIENT=Client proxy
-LABEL_WEBSERVICECLIENTTYPE=Client proxy type:
-
-
-
-# Items common to WebServiceRuntimeSelectionPage and WebServiceClientRuntimeSelectionPage
-# WebServiceRuntimeSelectionPage
-PAGE_TITLE_WS_RUNTIME_SELECTION=Service Deployment Configuration
-PAGE_DESC_WS_RUNTIME_SELECTION=Choose from the list of runtimes and deployment servers, or use the default settings.
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Server:
-LABEL_EDIT_BUTTON=Edit...
-LABEL_SERVICE_EAR_MODULE=Service EAR module:
-LABEL_CLIENT_EAR_MODULE=Client EAR module:
-LABEL_CLIENT_MODULE=Client module:
-LABEL_SERVICE_MODULE=Service module:
-LABEL_CLIENT_PROJECT=Client project:
-LABEL_SERVICE_PROJECT=Service project:
-LABEL_CLIENT_EAR_PROJECT=Client EAR project:
-LABEL_SERVICE_EAR_PROJECT=Service EAR project:
-
-#
-# Client component type labels
-#
-LABEL_CLIENT_COMP_TYPE_WEB=Web
-LABEL_CLIENT_COMP_TYPE_EJB=EJB
-LABEL_CLIENT_COMP_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_COMP_TYPE_CONTAINERLESS=Java
-
-
-TOOLTIP_PWRS_TEXT_RUNTIME=The runtime to be used.
-TOOLTIP_PWRS_TEXT_SERVER=The server to be used.
-TOOLTIP_PWRS_J2EE_VERSION=J2EE version to be used.
-
-LABEL_SELECTION_VIEW_TITLE=Server-Side Deployment Selection:
-LABEL_SELECTION_VIEW_RUNTIME=Choose Web service runtime first
-LABEL_SELECTION_VIEW_SERVER=Choose server first
-LABEL_SELECTION_VIEW_EXPLORE=Explore options
-
-LABEL_TREE_EXISTING_SERVERS=Existing Servers
-LABEL_TREE_SERVER_TYPES=Server Types
-
-MSG_INVALID_SRT_SELECTIONS=This server and runtime combination is not supported.  Choose a different server or runtime to proceed through the Web services wizard.
-MSG_NO_RUNTIME=No runtime specified for the {0} scenario.
-MSG_NO_SERVER=No server specified for the {0} scenario.
-MSG_ERROR_STUB_ONLY={0} has only stub runtimes associated with it. Choose a different server or configure a non-stub runtime in the server preferences.
-
-MSG_SERVER_TARGET_MISMATCH=The project, {0}, has a server target which is not compatible with the selected server type
-MSG_J2EE_MISMATCH=The project, {0}, has a different J2EE level from the selected J2EE level
-MSG_SERVICE_PROJECT_EMPTY=The service project {0} cannot be empty. Select a service project {0}.
-MSG_SERVICE_EAR_EMPTY=The service EAR {0} cannot be empty. Select a service EAR {0}.
-MSG_CLIENT_PROJECT_EMPTY=The client project {0} cannot be empty. Select a client project {0}.
-MSG_CLIENT_EAR_EMPTY=The client EAR {0} cannot be empty. Select a client EAR {0}.
-MSG_INVALID_EJB_PROJECT={0} is not an EJB project. Choose an EJB project, or enter a new EJB project name.
-MSG_INVALID_WEB_PROJECT={0} is not a Web project. Choose a Web project, or enter a new Web project name.
-MSG_INVALID_PROJECT_TYPE={0} is not a {1} project. Choose a {1} project, or enter a new project name.
-MSG_MODULE=module
-MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules.
-
-MSG_SAME_CLIENT_AND_SERVICE_EARS=Your selected service and client {0} modules have the same name.  Proceeding with this configuration may result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS=Your selected service and client {0} modules have the same name.  Proceeding with this configuration will result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_PROJECTS=Your selected service and client projects are the same.  Proceeding with this configuration will result in errors.
-MSG_WRONG_CLIENT_PROJECT_TYPE=The selected client project, {0}, is not a {1} project. Please select a {1} project or enter a new project name.
-MSG_CLIENT_SUB=client
-MSG_SERVICE_SUB=service
-MSG_GENERAL_PROJECT_AND_EAR=Select the {0} project and the EAR project with which you want it to be associated.
-MSG_EAR_PROJECT_WILL_BE_CREATED=If an EAR or project does not exist or is currently unassociated, it will be created and \nassociated as required when you click Next.
-
-MSG_EAR_WILL_BE_ASSOCIATED=The selected {0} project will be associated with the EAR project.
-MSG_PROJECT_WILL_BE_CREATED=The {0} project will be created and associated with the EAR project.
-MSG_EAR_WILL_BE_CREATED=The {0} EAR project will be created and associated with the project.
-MSG_PROJECT_AND_EAR_CREATED=The {0} project and EAR project will be created and associated with one another.
-
-# WebServiceClientRuntimeSelectionPage
-PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION=Client Environment Configuration
-PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION=Choose from the list of supported runtimes and servers for the client environment, or use the default settings.
-
-LABEL_CLIENT_SELECTION_VIEW_TITLE=Client-Side Environment Selection:
-LABEL_CLIENT_TYPE=Client type:
-LABEL_WEB=Web
-LABEL_EJB=EJB
-LABEL_NO_LABEL=
-
-#
-# Items common to WebServiceMappingsPage, WebServiceMappingsPage (client), and WebServiceSOAPBindingPage
-#
-PAGE_MSG_VALIDATION_INTERNAL_ERROR=An internal error occurred during page validation. See logs for details.
-
-#
-# WebServiceMappingsPage
-#
-PAGE_TITLE_WS_XML2BEAN=Web Service Skeleton XML to Java Mappings
-PAGE_DESC_N2P_MAPPINGS=Define custom mapping for namespace to package.
-MSG_MAPPING_DUPLICATE_ENTRIES=Duplicate {0} mapped to the same {1}.
-
-
-#
-# The two ITEM_* strings are entries in a list box of mappings.
-# There are two forms, one when the page is in Java-to-XML mode:
-#   <java-bean-name>, <encoding-style>
-# and one when the page is in XML-to-Java mode:
-#   <xml-namespace-uri>:<xml-short-name>, <encoding-style>
-# where:
-#   <java-bean-name> is a fully-qualified Java class name
-#   <xml-namespace-uri> is the namespace of an XML type
-#   <xml-short-name> is the XML type name within the namespace
-#   <encoding-style> is the encoding style (SOAP or Literal XML)
-#
-
-#
-# WebServiceProxyPage
-#
-BUTTON_GENERATE_PROXY=Generate a proxy
-
-#
-# WebServiceSkeletonConfigPage
-#
-PAGE_DESC_WSSKEL_CONFIG=Define a skeleton Java bean as a Web service.
-PAGE_TITLE_WSSKEL_CONFIG=Web Service Skeleton Java Bean Configuration
-TOOLTIP_PBSC_TEXT_SKELETON_FOLDER=Folder for generated Java skeleton.
-TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE=Browse folders.
-LABEL_SKELETON_ROOT_NAME=Skeleton folder:
-
-#
-# WebServiceBeanClassPage
-#
-LABEL_BEAN_CLASS_NAME=Bean:
-PAGE_MSG_BEAN_CANNOT_BE_EMPTY=Please select a Java bean class.
-BUTTON_BROWSE_CLASSES=Browse classes...
-
-
-#
-# WebServiceTestPage
-#
-PAGE_TITLE_WSTEST=Web Service Test Page
-PAGE_DESC_WSTEST=Select a test facility
-LABEL_TEST_TYPES=Test Facility
-CHECKBOX_TEST_WEBSERVICE=Test the Web service
-CHECKBOX_MONITOR_WEBSERVICE=Monitor the Web service
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=An error occurred. Unable to launch WSDL test facility.
-
-#
-# WebServiceExplorerPage
-#
-BUTTON_LAUNCH_SERVICE_TEST=Launch
-
-#
-# WebServiceClientTestPage
-#
-PAGE_TITLE_WS_SAMPLE=Web Service Client Test
-PAGE_DESC_WS_SAMPLE=Do you want to test the generated proxy?
-BUTTON_TEST=Test the generated proxy
-LABEL_TEST_TYPES=Test facility
-BUTTON_RUN_TEST=Run test on server
-LABEL_METHODS=Methods
-MSG_ERROR_JTS_JSP_GEN=IWAB0313E Error encountered while generating the sample.
-LABEL_JSP_PROJECT_NAME=JSP project:
-MSG_ERROR_JTS_PROXY_NOT_COMPILED=IWAB0357E The Generated proxy was not found. WebService sample jsps cannot be generated.
-MSG_ERROR_MALFORMED_URL=IWAB0358E Test client URL is malformed.
-
-#
-# WebServiceISDPage
-#
-
-#
-# WebServiceBeanConfigPage
-#
-
-#
-# WebServiceBeanMethodsPage
-#
-BUTTON_SELECT_ALL=Select All
-BUTTON_DESELECT_ALL=Deselect All
-TOOLTIP_PBME_BUTTON_SELECT_ALL=Select all methods
-TOOLTIP_PBME_BUTTON_DESELECT_ALL=Deselect all methods
-
-#
-# WebServiceEJBConfigPage
-#
-
-#
-# WebServiceWSDLSelectionPage
-#
-PAGE_TITLE_WSDL_SELECTION=Web Service WSDL File Selection
-PAGE_DESC_WSDL_SELECTION=Select a WSDL file.
-
-
-#
-# WebServicePublishPage
-#
-PAGE_TITLE_WS_PUBLISH=Web Service Publication
-PAGE_DESC_WS_PUBLISH=Do you want to publish your Web service?
-PAGE_TITLE_WS_FIND=Find a Web service
-PAGE_DESC_WS_FIND=Do you want to find a Web service?
-BUTTON_WS_PUBLISH=Launch the Web Services Explorer to publish this Web service to a UDDI Registry
-BUTTON_WS_PUBLISH_PRIVATE_UDDI=Launch the Web Services Explorer to publish this Web service to the Unit Test UDDI Registry
-BUTTON_WS_FIND=Launch the Web Services Explorer to find a Web service from a UDDI Registry
-BUTTON_WS_FIND_PRIVATE_UDDI=Launch the Web Services Explorer to find a Web service from the Unit Test UDDI Registry
-LABEL_PUBLIC_UDDI_REGISTRIES=Public UDDI Registry
-
-#
-# EJB UI strings
-#
-LABEL_EJB_BEAN_NAME=EJB bean
-TABLE_TITLE_EJB_BEAN_NAMES=Stateless EJB beans
-TABLE_TITLE_EJB_PROJECT_NAME=EJB project
-LABEL_EAR_PROJECTS=EAR projects
-TOOLTIP_EAR_PROJECTS=Enterprise application projects.
-TOOLTIP_TABLE_BEAN_NAMES=Select an EJB.
-
-#
-# Tooltips for WebServiceWSDLSelectionPage
-#
-TOOLTIP_PWWS_PAGE=
-
-#
-# Tooltips for beans.WebServiceBeanClassPage
-#
-TOOLTIP_PBCL_PAGE=
-TOOLTIP_PBCL_TEXT_BEAN_CLASS=Selected Java bean.
-TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE=Browse classes.
-TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE=Browse Java files.
-
-
-#
-# Tooltips for beans.WebServiceTestPage
-#
-TOOLTIP_PSTP_COMBOBOX_TEST=Test facilities available to test the service.
-TOOLTIP_PSTP_LAUNCH_BUTTON=Launch the selected test facility.
-
-
-
-
-#
-# Tooltips for WebServiceRuntimeSelectionPage
-#
-TOOLTIP_PWRS_PAGE=
-TOOLTIP_PWRS_LIST_RUNTIMES=Select from the following deployment runtime(s).
-TOOLTIP_PWRS_LIST_SERVERS=Select from application server(s).
-TOOLTIP_PWRS_RADIO_SERVER=Server oriented selection.
-TOOLTIP_PWRS_RADIO_RUNTIME=Runtime oriented selection.
-TOOLTIP_PWRS_RADIO_EXPLORE=Explore combinations.
-TOOLTIP_PWRS_COMBO_PROJECT=Web project.
-
-#
-# Tooltips for WebServiceClientRuntimeSelectionPage
-#
-TOOLTIP_PWCR_COMBO_CLIENT_TYPE=Client type.
-
-
-#
-# Tooltips for WebServiceProjectPage
-#
-TOOLTIP_PWPR_COMBO_TYPE=Web service implementation type.
-TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE=Service defaults for this wizard scenario.
-TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY=Enable/disable proxy generation for this scenario.
-TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT=Start Web service in Web project for this scenario.
-TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS=Launch the Web Services Explorer to publish the Web service in this scenario to a UDDI Registry.
-TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE=Select this to explore the Web service created.
-TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE=Select this to monitor the SOAP traffics of this Web service.
-TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT=Client proxy defaults for this wizard scenario.
-TOOLTIP_PWPR_COMBO_CLIENTTYPE=Client proxy selection type.
-
-#
-# Tooltips for WebServicePublishPage
-#
-TOOLTIP_PWPB_PAGE=
-TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH=Publish the Web service.
-
-
-#
-# WSIL proxy
-#
-
-PAGE_WSIL_IMPORT=WSIL Import Page
-TITLE_WSIL_IMPORT=WSIL Import
-DESC_WSIL_IMPORT=Import WSDL references to a WSIL document
-PAGE_TITLE_WS_SELECTION=Web Service Selection Page
-PAGE_DESC_WS_SELECTION=Enter a web service URI.
-
-PAGE_MSG_LOADING_WEB_SERVICE_URI=Loading Web service URI...
-PAGE_MSG_INVALID_WEB_SERVICE_URI=Invalid Web service URI.  Enter an URI to a WSDL, WSIL or HTML document.
-PAGE_MSG_NO_SUCH_FILE=File "{0}" does not exists.
-PAGE_MSG_SELECTION_MUST_BE_WSDL=Selection must be WSDL.
-PAGE_MSG_INVALID_WSIL_FILE_NAME=Invalid WSIL file name.  WSIL file name must end with .wsil
-
-
-
-MSG_ERROR_URI_NOT_RESOLVABLE=IWAB0469E "{0}" is not resolvable.
-MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT=IWAB0551E WSDL file at {0} has no service element.
-
-LABEL_WSIL_URI=WSIL URI:
-LABEL_BROWSE=Browse
-LABEL_WSDL=WSDL:
-LABEL_WSDL_URI=WSDL URI
-LABEL_IMPORT=Import...
-LABEL_ADD=Add
-LABEL_REMOVE=Remove
-LABEL_WS_SELECTION=Enter an URI to a WSDL, WSIL or HTML document:
-LABEL_SELECT_WSDL=Select a WSDL
-LABEL_VALIDATE_MESSAGES=WSDL validation messages:
-
-
-TOOLTIP_WSIL_IMPORT_PAGE=This page allows you to add WSDL references to a WSIL document.
-TOOLTIP_WSIL_TEXT_WSIL=Enter the location of a new or existing WSIL document.
-TOOLTIP_WSIL_BUTTON_BROWSE_WSIL=Browse for a WSIL document.
-TOOLTIP_WSIL_TABLE_WSDL=Enter the URIs of the WSDLs that are going to be added as service references.
-TOOLTIP_PCON_PAGE=Select a web service for consumption.
-TOOLTIP_PCON_TEXT_WS=Enter an URI to a WSDL, WSIL or HTML document.
-TOOLTIP_PCON_BUTTON_BROWSE_WS=Browse for a web service resource.
-TOOLTIP_VALIDATE_TEXT_MESSAGE=Messages from WSDL validation.
-TOOLTIP_TABLE_VALIDATE_MESSAGE=Use the Web Service Profile Validation preference to enable or disable WSDL validation.
-
-#
-# Tooltips for client.WebServiceClienTestPage
-#
-TOOLTIP_PWSM_PAGE=
-TOOLTIP_PWSM_CHECKBOX_TEST=Enable/disable Test.
-TOOLTIP_PWSM_COMBOBOX_TEST=Select the test type.
-TOOLTIP_PWSM_CHECKBOX_LAUNCH=Run test on a server.
-TOOLTIP_PWSM_TEXT_JSP_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE=Browse folders.
-TOOLTIP_PWSM_BUTTON_SELECT_ALL=Select all methods.
-TOOLTIP_PWSM_BUTTON_DESELECT_ALL=Deselect all methods.
-TOOLTIP_PWSM_COMBO_PROJECT=Web project for generated sample.
-TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_TREE_METHODS=Methods to generate into the sample.
-TOOLTIP_PWSM_EAR_PROJECT=EAR project for the generated sample.
-
-#
-# HTTP Basic Auth
-#
-DIALOG_TITLE_HTTP_BASIC_AUTH=HTTP Basic Authentication
-LABEL_URL=URL:
-LABEL_HTTP_BASIC_AUTH_USERNAME=User name:
-LABEL_HTTP_BASIC_AUTH_PASSWORD=Password:
-
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=Enter your HTTP basic authentication user name.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Enter your HTTP basic authentication password.
-
-#
-# Web Service Server Runtime Type
-#
-
-
-#
-# Client project type
-#
-
-#
-# Generate Handler Skeleton
-#
-TASK_LABEL_GEN_HANDLER_SKELETON=Generate handler skeleton command
-TASK_DESC_GEN_HANDLER_SKELETON=Generate handler skeleton command
-MSG_ERROR_GENERATE_HANDLER_SKELETON=IWAB0359E Error in generating handler skeleton.
-MSG_ERROR_WRITE_FILE=IWAB0360E Error in writing file {0}.
-
-#
-# Handlers Configuration wizard page
-#
-LABEL_HANDLERS_CONFIG=Handler Configuration
-LABEL_BUTTON_ADD=Add
-LABEL_BUTTON_REMOVE=Remove
-LABEL_BUTTON_MOVE_UP=Move Up
-LABEL_BUTTON_MOVE_DOWN=Move Down
-LABEL_BUTTON_GEN_SKELETON=Generate skeleton classes for new handlers
-LABEL_COMBO_SOURCE_LOC=Output folder:
-LABEL_COMBO_WS_CLIENT_REF=Client Service Reference:
-LABEL_COMBO_WS_SERVICE_DESC=Service Description:
-
-LABEL_HANDLER_NAME=Name
-LABLE_HANDLER_CLASS=Class Name
-LABEL_HANDLER_PORT=Port Name
-
-DIALOG_TITLE_WS_ADD_HANDLER=Add New Handler
-LABEL_TEXT_HANDLER_NAME=Name:
-LABEL_TEXT_HANDLER_CLASS=Class name:
-LABEL_TEXT_HANDLER_PORT=Port name:
-
-PAGE_TITLE_SERVICE_HDLR_CONFIG=Service Handlers Configuration
-PAGE_DESC_SERVICE_HDLR_CONFIG=Configure service-side handlers
-PAGE_TITLE_CLIENT_HDLR_CONFIG=Client Handlers Configuration
-PAGE_DESC_CLIENT_HDLR_CONFIG=Configure client-side handlers
-
-TOOLTIP_EDIT_WS_HANDLERS=Configure Web Service Handlers
-TOOLTIP_BUTTON_GEN_SKELETON=Select to generate skeleton classes for new handlers.
-TOOLTIP_COMBO_SOURCE_LOC=Select the output location for file generation.
-TOOLTIP_TEXT_HANDLER_NAME=Handler name
-TOOLTIP_TEXT_HANDLER_CLASS=Handler class name
-TOOLTIP_TEXT_HANDLER_PORT=Handler port component name
-TOOLTIP_WS_CLIENT_REF=Select a client service-reference to show its handlers.
-TOOLTIP_WS_SERVICE_DESC=Select a service description to show its handlers.
-
-#
-# OpenJavaEditorCommand
-#
-MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR=IWAB0029E Unable to open class {0} from project {1} in the Java editor.
-
-#
-# CheckIfServiceProject
-# 
-MSG_WARN_IS_SERVICE_PROJECT=The selected client project, {0}, contains the Web service. Proceeding with this configuration may result in runtime errors when invoking the Web service. Would you like to proceed?
-MSG_USER_ABORTED=User pressed cancel in warning dialog which warned about the selected client project being the service project.
-
-
-#
-# Missing third party file error message
-#
-MSG_MISSING_THIRD_PARTY_FILES=Missing third party files.  Refer to http://www.eclipse.org/webtools/wst/components/ws/download_instructions_for_jars.html
-
-#
-# WSDLSelectionOutputCommand
-#
-MSG_WARNING_NO_SERVICE_ELEMENT=The WSDL file does not contain a Service element.  Therefore a service interface and Java proxy will not be generated and as a result, a Java test client will not be launched.  Click OK to proceed, or click Cancel to select another WSDL file.  Alternately, exit the wizard and use the WSDL editor to create a Service WSDL document.
-
-#
-# CheckWSDLValidationCommand
-#
-STILL_VALIDATING_WSDL=Still performing WSDL validation.  \nClick Ignore to ignore WSDL validation and continue. \nClick IgnoreAll to always ignore WSDL validation and continue.  \nClick Cancel to wait for WSDL validation to complete.
-IGNORE_LABEL=Ignore
-IGNORE_DESCRIPTION=Ignore the WSDL validation and continue
-IGNORE_ALL_LABEL=Ignore All
-IGNORE_ALL_DESCRIPTION=Always ignore WSDL validation and continue
-CANCEL_LABEL=Cancel
-TASK_LABEL_CHECK_WSDL_VALIDATION=Check for WSDL validation
-TASK_DESC_CHECK_WSDL_VALIDATION=Check if WSDL validation has completed
-CANCEL_DESCRIPTION=Cancel
-WAIT_FOR_WSDL=Do not continue with wizard.  Wait for WSDL validation to complete.
-
-#
-# Start server page
-#
-PAGE_TITLE_WS_START_SERVER=Server startup page
-PAGE_DESC_WS_START_SERVER=Start the server from this page.
-LABEL_START_SERVER_TEXT1=In order to proceed the server "{0}" must be started.
-LABEL_START_SERVER_TEXT2=Once the server is started the "next" button will be enabled.
-LABEL_START_SERVER_TEXT3=The "back" button can be used while the server is starting to
-LABEL_START_SERVER_TEXT4=change any previous settings in this wizard.
-LABEL_START_SERVER_BUTTON=Start server
-TOOLTIP_START_SERVER_BUTTON=Start the server
-TEXT_SERVER_STATUS=Currently the server is {0}.
-TEXT_SERVER_MSG=Server {0}
-TEXT_SERVER_STARTED=started
-TEXT_SERVER_STARTING=starting
-TEXT_SERVER_STOPPED=stopped
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
deleted file mode 100644
index b34dc7e66..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
+++ /dev/null
@@ -1,60 +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.consumption.ui.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-
-public class LaunchWSEAction implements IWorkbenchWindowActionDelegate
-{
-  public void run(IAction action)
-  {
-    EclipseStatusHandler             handler     = new EclipseStatusHandler();
-    TransientResourceContext         context     = new TransientResourceContext();
-    EclipseEnvironment               environment = new EclipseEnvironment( null, context, handler ); 
-    WSExplorerLauncherCommand        cmd         = new WSExplorerLauncherCommand();
-    
-    String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-	LaunchOption[] launchOptions = new LaunchOption[] {
-		new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation),
-		new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)
-	};
-    cmd.setLaunchOptions(launchOptions);
-    cmd.setEnvironment( environment );
-	  cmd.execute( null, null );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
-   */
-  public void dispose() {  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
-   */
-  public void init(IWorkbenchWindow window) {  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-   */
-  public void selectionChanged(IAction action, ISelection selection) {  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
deleted file mode 100644
index 6508f699c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
+++ /dev/null
@@ -1,96 +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.consumption.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- * This command checks to see if the selected client project is the
- * service project. If so, the user is warned.
- */
-public class CheckForServiceProjectCommand extends AbstractDataModelOperation
-{
-  MessageUtils msgUtils;
-  SelectionListChoices runtime2ClientTypes;
-  String wsdlURI;
-  WebServicesParser webServicesParser;
-    
-  public CheckForServiceProjectCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils = new MessageUtils(pluginId + ".plugin", this);  
-  }
-  
-  public void setRuntime2ClientTypes( SelectionListChoices runtime2ClientTypes )
-  {
-    this.runtime2ClientTypes = runtime2ClientTypes;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-    if (runtime2ClientTypes==null || wsdlURI==null || wsdlURI.length()==0 || webServicesParser==null)
-      return status;
-    
-    String clientProjectName = runtime2ClientTypes.getChoice().getChoice().getList().getSelection();
-    if (clientProjectName==null || clientProjectName.length()==0)
-      return status;
-    
-    IProject clientProject = ProjectUtilities.getProject(clientProjectName);
-    ValidationUtils vu = new ValidationUtils();
-    boolean isServiceProject = vu.isProjectServiceProject(clientProject, wsdlURI, webServicesParser);
-    if (isServiceProject)
-    {
-      IStatus wStatus = StatusUtils.warningStatus( msgUtils.getMessage("MSG_WARN_IS_SERVICE_PROJECT", new String[]{clientProjectName}) );
-      try
-      {
-        environment.getStatusHandler().report(wStatus);
-      }
-      catch (StatusException se)
-      {
-        //User decided to abort. Return an error status
-        IStatus eStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_USER_ABORTED") );
-        return eStatus;
-      }
-    }
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
deleted file mode 100644
index 75fe3a5c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
+++ /dev/null
@@ -1,250 +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.consumption.ui.command;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-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.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.common.EnvironmentUtils;
-
-
-
-public class GenerateHandlerSkeletonCommand extends AbstractDataModelOperation
-{
-
-  private MessageUtils msgUtils_;
-  private IPath outputLocation_;
-  private String[] handlerNames_;
-  private boolean genSkeleton_;
-  private String handlerNameForEdit_ = null;
-  
-  public GenerateHandlerSkeletonCommand()
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-  	msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-  }
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env          = getEnvironment();
-    MultiStatus status       = null;
-    IStatus     returnStatus = Status.OK_STATUS;
-  	
-  	if (!genSkeleton_)	return returnStatus; 
-  	
-  	int i;
-  	boolean error = false;
-  	
-  	IStatus writeStatus;	
-  	
-  	
-    for (i=0; i<handlerNames_.length; i++) 
-    {
-    	writeStatus = writeFile(env, handlerNames_[i], outputLocation_, monitor );
-    	// handle status return
-    	if (writeStatus.getSeverity() == Status.ERROR) 
-      {  // write status is OK or ERROR
-    		error = true;
-    		if (status == null) 
-        {
-    			status = StatusUtils.multiStatus( msgUtils_.getMessage("MSG_ERROR_GENERATE_HANDLER_SKELETON"), new IStatus[0] );
-    		}
-    		status.add(writeStatus);
-    	} 
-    }
-    
-    if (error) 
-    {
-       env.getStatusHandler().reportError(status);
-       returnStatus = status;
-    }
-    
-  	return returnStatus;
-  }
-  
-  private IStatus writeFile (Environment env, String className, IPath outputLocation, IProgressMonitor monitor ) 
-  {
-  	IStatus status = Status.OK_STATUS;
-  	int index;
-  	
-  	String simpleClassName = className;
-  	String packageName = null;
-  	IPath filePath = outputLocation;
-  	if (className != null) {
-  		index = className.lastIndexOf('.');
-  		if (index != -1) {
-  			simpleClassName = className.substring(index + 1);
-  			packageName = className.substring(0, index);
-  			
-  		  	String packageSegment = packageName;
-  		  	int j = 0;
-  		  	j = packageSegment.indexOf('.');
-  		  	while (j != -1) {
-  		  		filePath = filePath.append(packageSegment.substring(0, j));
-  		  		packageSegment = packageSegment.substring(j + 1);
-  		  		j = packageSegment.indexOf('.');
-  		  	}
-  		    filePath = filePath.append(packageSegment);
-  		}
-  		else {
-  		  packageName = "";
-  		}
-  	}
-  	
-  	filePath = filePath.append(simpleClassName);
-  	
-  	filePath = filePath.addFileExtension("java");
-
-  	// check if Handler already exists; do not overwrite existing Handlers
-  	IResource workspaceRes = ResourceUtils.findResource(filePath);
-  	if (workspaceRes!=null && workspaceRes.exists()) {
-  		return status;
-  	}
-  	
-  	if (handlerNameForEdit_ == null){
-  		handlerNameForEdit_ = className;
-  	}
-  	
-  	OutputStream outputStream = FileResourceUtils.newFileOutputStream( EnvironmentUtils.getResourceContext(env), filePath, monitor, env.getStatusHandler());
-  	// create buffered writer for writing file
-  	BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(outputStream));
-  	try {
-  		if (packageName.length() != 0) {
-  			bw.write("package " +packageName+";");
-  			bw.newLine();
-  			bw.newLine();
-  		}
-  		bw.write("import javax.xml.rpc.handler.GenericHandler;");
-  		bw.newLine();
-  		bw.write("import javax.xml.rpc.handler.MessageContext;");
-  		bw.newLine();
-  		bw.write("import javax.xml.namespace.QName;");
-  		bw.newLine();
-  		bw.newLine();
-  		
-  		bw.write("public class "+simpleClassName+" extends GenericHandler");
-  		bw.newLine();
-  		bw.write("{");
-  		bw.newLine();
-  		bw.newLine();
-  		
-  		bw.write("   public QName[] getHeaders ()");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body");
-  		bw.newLine();
-  		bw.write("      return null;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		bw.newLine();
-  		bw.write("   public boolean handleRequest( MessageContext context )");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body or delete method to use GenericHandler");
-  		bw.newLine();
-  		bw.write("      return true;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		bw.newLine();
-  		bw.write("   public boolean handleResponse( MessageContext context )");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body or delete method to use GenericHandler ");
-  		bw.newLine();
-  		bw.write("      return true;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		bw.newLine();
-  		bw.write("   public boolean handleFault( MessageContext context )");
-  		bw.newLine();
-  		bw.write("   {");
-  		bw.newLine();
-  		bw.write("      // Fill in method body or delete method to use GenericHandler");
-  		bw.newLine();
-  		bw.write("      return true;");
-  		bw.newLine();
-  		bw.write("   }");
-  		bw.newLine();
-  		
-  		bw.newLine();
-  		bw.write("}");
-  		bw.close();
-  		status = Status.OK_STATUS;	
-  	} 
-    catch (IOException e) 
-    {
-  		status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_WRITE_FILE", new String[]{ className }), e );
-  		if (bw != null) {
-  			try {
-  				bw.close();
-  			} catch (IOException e1) {
-  			}
-  		}
-  	}
-  	return status;
-  }
-  
-  public void setOutputLocation(IPath outputLocation) 
-  {
-	this.outputLocation_ = outputLocation;
-  }
-  
-  public void setHandlerNames (String[] handlerNames)
-  {
-  	this.handlerNames_ = handlerNames;
-  }
-  
-  public void setGenSkeletonEnabled(boolean genSkeleton)
-  {
-  	this.genSkeleton_ = genSkeleton;
-  }
-  
-  public IProject getProject(){
-  	IProject project = null;
-  	if (outputLocation_!=null){
-  		project = ResourceUtils.getProjectOf(outputLocation_);
-  	}
-  	return project;
-  }
-  
-  public List getClassNames(){
-  	List classes = new ArrayList();
-  	if (handlerNameForEdit_!=null){
-  		classes.add(handlerNameForEdit_);
-  	}
-  	return classes;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
deleted file mode 100644
index c809e7a4e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
+++ /dev/null
@@ -1,93 +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.consumption.ui.command;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-public class OpenJavaEditorCommand extends AbstractDataModelOperation
-{
-  private List classNames;
-  private IProject project;
-
-  public OpenJavaEditorCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    OpenJavaEditorJob job = new OpenJavaEditorJob(classNames, project);
-    job.setPriority(Job.LONG);
-    job.schedule();
-    return Status.OK_STATUS;
-  }
-
-  public void setClassNames(List classNames)
-  {
-    this.classNames = classNames;
-  }
-
-  public void setProject(IProject project)
-  {
-    this.project = project;
-  }
-  
-  private class OpenJavaEditorJob extends UIJob
-  {
-    private List classNames;
-    private IProject project;
-
-    public OpenJavaEditorJob(List classNames, IProject project)
-    {
-      super("org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorJob");
-      this.classNames = classNames;
-      this.project = project;
-    }
-    
-    public IStatus runInUIThread(IProgressMonitor monitor)
-    {
-      if (project != null && classNames != null)
-      {
-        IJavaProject javaProject = JavaCore.create(project);
-        for (Iterator it = classNames.iterator(); it.hasNext();)
-        {
-          String className = (String)it.next();
-          try
-          {
-            IType type = javaProject.findType(className);
-            JavaUI.openInEditor(type);
-          }
-          catch (Throwable t)
-          {
-            return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{className, project.getName()}), t);
-          }
-        }
-        return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.OK, WebServiceConsumptionUIPlugin.ID, 0, "", null);
-      }
-      else
-        return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{classNames != null ? classNames.toString() : "", project != null ? project.getName() : ""}), null);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
deleted file mode 100644
index 0ddde2b30..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,80 +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.consumption.ui.command;
-
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.WSIComplianceUtils;
-
-
-
-public class WSINonCompliantRuntimeCommand extends AbstractDataModelOperation
-{
-
-  private IProject serviceProject_;
-  private MessageUtils msgUtils_;
-	
-  public WSINonCompliantRuntimeCommand()
-  {
-    String       pluginId = "org.eclipse.wst.ws.ui";
-  	msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-  }
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    
-  	PersistentWSISSBPContext wsiSSBPContext = WSUIPlugin.getInstance().getWSISSBPContext(); 
-  	PersistentWSIAPContext wsiAPContext = WSUIPlugin.getInstance().getWSIAPContext(); 
-    Vector statusSSBP = new Vector();
-    statusSSBP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiSSBPContext), "id", 0,
-        msgUtils_.getMessage("WSI_SSBP_INCOMPLIANT_RUNTIME"), null ) );
-    Status[] statusesSSBP = (Status[]) statusSSBP.toArray(new Status[statusSSBP.size()]);
-    
-    Vector statusAP = new Vector();
-    statusAP.add( new Status( WSIComplianceUtils.getWSISeverity(serviceProject_, wsiAPContext), "id", 0, 
-    		msgUtils_.getMessage("WSI_AP_INCOMPLIANT_RUNTIME"), null ));
-    Status[] statusesAP = (Status[]) statusAP.toArray(new Status[statusAP.size()]);
-
-    if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesSSBP, serviceProject_, wsiSSBPContext)) 
-    {
-    	if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesAP, serviceProject_, wsiAPContext)) 
-      {
-    		return Status.OK_STATUS;
-    	} 
-      else 
-      {
-    		return StatusUtils.errorStatus(	msgUtils_.getMessage("NOT_OK") );
-    	}
-    } 
-    else 
-    {
-		  return StatusUtils.errorStatus( msgUtils_.getMessage("NOT_OK") );
-		}
-  }
-  
-  public void setServiceProject(IProject serviceProject) {
-	this.serviceProject_ = serviceProject;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
deleted file mode 100644
index 8f8400b6e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.command.data;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-public class EclipseIPath2URLStringTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    String s = value.toString();
-    if (s.indexOf(":") < 0)
-    {
-      IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(value.toString());
-      if (res.exists())
-      {
-        try
-        {
-          s = res.getLocation().toFile().toURL().toString();
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-    }
-    return s;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
deleted file mode 100644
index 0f772542b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
+++ /dev/null
@@ -1,31 +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.consumption.ui.command.data;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class ProjectName2IProjectTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-	String project     = (String)value;
-	int    slashIndex  = project.indexOf( '/' );
-	String projectName = project;
-	
-	if( slashIndex != -1 )
-	{
-	  projectName = project.substring( 0, slashIndex );
-	}
-	
-    return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
deleted file mode 100644
index c96075d21..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
+++ /dev/null
@@ -1,38 +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
- *******************************************************************************/
-/*
- * Created on Apr 20, 2004
- */
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/*
- * Transforms a server instance id to an IServer
- */
-public class ServerInstToIServerTransformer implements Transformer {
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform(Object value) {
-    
-    String existingServerInstId = (String)value;
-    IServer serverInst = null;
-    if (existingServerInstId != null) {
-    	serverInst = ServerCore.findServer(existingServerInstId);
-    }
-    return serverInst;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
deleted file mode 100644
index 0e228a0c8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
+++ /dev/null
@@ -1,36 +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.consumption.ui.command.data;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerName2IServerTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    {
-      String serverName = value.toString();
-      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(serverName))
-            return server;
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
deleted file mode 100644
index a603ed932..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
+++ /dev/null
@@ -1,35 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishFragment extends SequenceFragment
-{
-  public FinishFragment()
-  {	
-	add(new FinishTestFragment() );
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
deleted file mode 100644
index ae8a5c96c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,570 +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.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class ServerSelectionUtils
-{
-  /*
-   * Returns reasonable defaults for server factory id and instance id based on 
-   * an existing project
-   * index [0] contains factoryId, index[1] contains instance Id.
-   * @deprecated
-   */
-  public static String[] getServerInfoFromExistingProject(IProject project, String componentName, String runtimeId, boolean askExtenders)
-  {
-    String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
-    // If the project has been added to an existing server, pick that server
-    //IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(project, componentName), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
-    if (firstSupportedServer != null)
-    {
-      serverInfo[0] = firstSupportedServer.getServerType().getId();
-      serverInfo[1] = firstSupportedServer.getId();
-      return serverInfo;
-      	
-    }
-    
-    
-    //Does the project have a runtime-target?
-    IRuntime runtimeTarget = getRuntimeTarget(project.getName());
-    if (runtimeTarget != null)
-    {
-      //Look for an existing server which is compatible with the runtime-target
-      IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
-      if (compatibleServers!=null && compatibleServers.length > 0)
-      {
-        IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, runtimeId);
-        if (firstSupportedCompatServer != null)
-        {
-          serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
-          serverInfo[1] = firstSupportedCompatServer.getId();
-          return serverInfo;
-          
-        }  
-      }
-      
-      //No existing compatible server was found. Choose a compatible server type.
-      
-      //If the preferred server is compatible with the project's runtime target, use it.
-      PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String pFactoryId = ctx.getServerFactoryId();
-      IServerType serverType = ServerCore.findServerType(pFactoryId);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
-      	{
-      	  serverInfo[0] = pFactoryId;
-      	  return serverInfo;
-      	}
-      }     
-      
-      //The preferred server was not compatible. Pick the first valid compatible server type.
-      String factoryId = getFirstSupportedServerType(runtimeTarget, runtimeId);
-      if (factoryId != null) serverInfo[0] = factoryId;
-      return serverInfo;
-
-    }
-    
-    if (askExtenders)
-    {
-      ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
-      if (recommendedServerInfo!=null)
-      {
-        if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
-          serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-        
-        if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
-          serverInfo[1] = recommendedServerInfo.getServerInstanceId(); 
-
-        return serverInfo;
-      }
-
-    }
-    
-    //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
-    String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
-    List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
-    String[] compatServerInfo = getCompatibleExistingServer(runtimes,runtimeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(runtimes, runtimeId);
-    if (factoryId != null) serverInfo[0] = factoryId; 
-    return serverInfo;   
-    
-  }
-
-  /*
-   * Returns reasonable defaults for server factory id and instance id based on 
-   * an existing project
-   * index [0] contains factoryId, index[1] contains instance Id.
-   */
-  /*
-  public static String[] getServerInfoFromExistingProject(IProject project, String runtimeId, boolean askExtenders)
-  {
-    String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
-    // If the project has been added to an existing server, pick that server
-    IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-    IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
-    if (firstSupportedServer != null)
-    {
-      serverInfo[0] = firstSupportedServer.getServerType().getId();
-      serverInfo[1] = firstSupportedServer.getId();
-      return serverInfo;
-      	
-    }
-    
-    
-    //Does the project have a runtime-target?
-    IRuntime runtimeTarget = getRuntimeTarget(project.getName());
-    if (runtimeTarget != null)
-    {
-      //Look for an existing server which is compatible with the runtime-target
-      IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
-      if (compatibleServers!=null && compatibleServers.length > 0)
-      {
-        IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, runtimeId);
-        if (firstSupportedCompatServer != null)
-        {
-          serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
-          serverInfo[1] = firstSupportedCompatServer.getId();
-          return serverInfo;
-          
-        }  
-      }
-      
-      //No existing compatible server was found. Choose a compatible server type.
-      
-      //If the preferred server is compatible with the project's runtime target, use it.
-      PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      String pFactoryId = ctx.getServerFactoryId();
-      IServerType serverType = ServerCore.findServerType(pFactoryId);
-      if (serverType!=null){
-      	String serverRuntimeId = serverType.getRuntimeType().getId();
-      	if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
-      	{
-      	  serverInfo[0] = pFactoryId;
-      	  return serverInfo;
-      	}
-      }     
-      
-      //The preferred server was not compatible. Pick the first valid compatible server type.
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null) serverInfo[0] = factoryId;
-      return serverInfo;
-
-    }
-    
-    if (askExtenders)
-    {
-      ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
-      if (recommendedServerInfo!=null)
-      {
-        if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
-          serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-        
-        if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
-          serverInfo[1] = recommendedServerInfo.getServerInstanceId(); 
-
-        return serverInfo;
-      }
-
-    }
-    
-    //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
-    String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
-    List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
-    List suppRuntimes = getRuntimeTargetsSupportedByWSRuntime(runtimes, runtimeId);
-    String[] compatServerInfo = getCompatibleExistingServer(suppRuntimes,typeId); 
-    if ( compatServerInfo != null)
-    {
-      return compatServerInfo;
-    }
-    
-    //No existing compatible server, pick a type.
-    String factoryId = getFirstSupportedServerType(suppRuntimes, typeId);
-    if (factoryId != null) serverInfo[0] = factoryId; 
-    return serverInfo;   
-    
-  }
-  */
-  
-  /*
-   * Given a list of existing servers, this returns the first one that is supported
-   * by the given Web service runtime id. 
-   * Returns null of there are no supported servers in the array.
-   */
-  public static IServer getFirstSupportedServer(IServer[] servers, String webServiceRuntimeId)
-  {
-    //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-    if (servers != null && servers.length > 0) {
-      for (int i = 0; i < servers.length; i++)
-      {
-        String serverFactoryId = servers[i].getServerType().getId();
-        if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(webServiceRuntimeId, serverFactoryId))
-        {
-          return servers[i];
-        }
-      }
-    }
-    return null;
-  }
-  
-  
-  /*
-   * Returns the factory id of a server type compatible with the Web service type and the runtime target.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(IRuntime runtimeTarget, String webServiceRuntimeId)
-  {
-    String runtimeId = runtimeTarget.getRuntimeType().getId();
-    WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
-    String[] serverFactoryIds = wsrt.getServerFactoryIds();
-    for (int i=0; i<serverFactoryIds.length; i++)
-    {
-      IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
-      if (serverType!=null){
-        String serverRuntimeId = serverType.getRuntimeType().getId();
-        if (serverRuntimeId.equals(runtimeId))
-        {
-          return serverFactoryIds[i];
-        }
-      }
-    }
-    return null;
-  }
-  
-
-  /*
-   * Return the factory id of the first server type compatible with the runtimeTargets and webServiceRuntimeId.
-   * Returns null if there are none.
-   */
-  public static String getFirstSupportedServerType(List runtimeTargets, String webServiceRuntimeId)
-  {
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String factoryId = getFirstSupportedServerType(runtimeTarget, webServiceRuntimeId);
-      if (factoryId != null && factoryId.length()>0)
-        return factoryId;
-    }
-    
-    return null;
-  }  
-  /*
-   * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
-   * Returns null if there are none.
-   * @deprecated
-   */
-  /*
-  public static String getFirstSupportedServerType(List runtimeTargets, String typeId)
-  {
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
-      if (factoryId != null && factoryId.length()>0)
-        return factoryId;
-    }
-    
-    return null;
-  }
-  */
-  public static IRuntime getRuntimeTarget(String projectName)
-  {
-  	if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
-  		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  		if( project != null && project.exists() ){
-  			return ServerCore.getProjectProperties(project).getRuntimeTarget(); 
-  		}
-  	}
-  	return null;
-  }
-  
-  public static IServer getFirstExistingServerFromFactoryId(String factoryId)
-  {
-  	IServer[] servers = ServerCore.getServers();
-  	if (servers==null || servers.length!=0)
-        return null;
-  	else
-  	{
-  	  for (int i=0; i<servers.length; i++)
-  	  {
-  	    IServer server = (IServer)servers[i];
-  	    if (server.getServerType().getId().equals(factoryId))
-  	    {
-  	      return server;
-  	    }
-  	  }
-  	}
-    return null;
-  }
-  
-  public static IServer[] getCompatibleExistingServers(IRuntime runtime)
-  {
-    if (runtime == null)
-      return null;
-    
-    IServer[] servers = ServerCore.getServers();
-    if (servers==null || servers.length==0)
-      return null;
-    
-    ArrayList compatibleServersList = new ArrayList();
-    String runtimeId = runtime.getRuntimeType().getId();
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer server = (IServer)servers[i];
-      String serverRuntimeId = server.getRuntime().getRuntimeType().getId();
-      if (serverRuntimeId.equals(runtimeId))
-        compatibleServersList.add(server);
-      
-    }
-    if (compatibleServersList.size()<1)
-      return null;
-    
-    
-    Object[] compatibleServersArray = compatibleServersList.toArray();
-    IServer[] compatibleServers = new IServer[compatibleServersArray.length];
-    for (int j=0; j<compatibleServersArray.length; j++)
-    {
-      compatibleServers[j] = (IServer)compatibleServersArray[j];
-    }
-    
-    return compatibleServers;
-  }
-  
-
-  /*
-   * Returns the factory Id and instance id of the first exiting server compatible
-   * with the runtime targets and typeId
-   * Returns null if there are none.
-   * The item at [0] is the factory id.
-   * The item at [1] is the instance id.
-   * @deprecated
-   */
-  public static String[] getCompatibleExistingServer(List runtimeTargets, String webServiceRuntimeId)
-  {
-    String[] serverInfo = new String[2];
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
-      IServer compatServer = getFirstSupportedServer(existingCompatServers, webServiceRuntimeId);
-      if (compatServer != null)
-      {
-        serverInfo[0] = compatServer.getServerType().getId();
-        serverInfo[1] = compatServer.getId();
-        return serverInfo;
-      }
-    }
-    return null;
-  }
-  
-  /*
-   * Returns the factory Id and instance id of the first exiting server compatible
-   * with the runtime targets and typeId
-   * Returns null if there are none.
-   * The item at [0] is the factory id.
-   * The item at [1] is the instance id.
-   * @deprecated
-   */
-  /*
-  public static String[] getCompatibleExistingServer(List runtimeTargets, String typeId)
-  {
-    String[] serverInfo = new String[2];
-    for (int i=0; i<runtimeTargets.size(); i++ )
-    {
-      IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
-      IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
-      IServer compatServer = getFirstSupportedServer(existingCompatServers, typeId);
-      if (compatServer != null)
-      {
-        serverInfo[0] = compatServer.getServerType().getId();
-        serverInfo[1] = compatServer.getId();
-        return serverInfo;
-      }
-    }
-    return null;
-  }
-  */
-  
-  public static ServerInfo getExtenderRecommendation(IProject project)
-  {
-    try
-    {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
-    for (int i=0; i<elements.length; i++)
-    {
-      Object serverDefaulterObject = elements[i].createExecutableExtension("class");
-      if (serverDefaulterObject instanceof IServerDefaulter)
-      {
-        IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
-        ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
-        if (serverInfo != null)
-          return serverInfo;
-      }
-      
-    }
-    } catch (CoreException ce)
-    {
-      return null;
-    }
-    
-    return null;
-  }
-  
-  /**
-   * Use this method to get a server factory id and instance id that is compatible with the given Web
-   * service runtime.
-   * @param webServiceRuntimeId
-   * @param j2eeVersion String representation of the int values in J2EEVersionConstants i.e. "12", "13", "14"
-   * @return String[] index [0] contains factoryId, index[1] contains instance Id.
-   */
-  public static String[] getServerFromWebServceRuntimeAndJ2EE(String webServiceRuntimeId, String j2eeVersion)
-  {
-    String[] serverInfo = new String[2];
-    
-    //Get all possible valid servers. If there are none, we can't default intelligently, return null.
-
-    WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
-    String[] validServerFactoryIds = wsrt.getServerFactoryIds();
-    if (validServerFactoryIds==null || validServerFactoryIds.length<1)
-      return null;
-    
-    //Get all existing servers
-    IServer[] servers = ServerCore.getServers(); //Get all existing servers
-    
-    //Get the preferred server.
-  	PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-  	String prefServerFactoryId = context.getServerFactoryId();
-  	
-    boolean preferredIsValid =  containsString(validServerFactoryIds, prefServerFactoryId)
-                                && isServerValid(prefServerFactoryId, j2eeVersion);
-    if (preferredIsValid)
-    {
-      for (int i=0; i<servers.length; i++)
-      {
-        IServer server = (IServer)servers[i];
-        String thisFactoryId = server.getServerType().getId();
-        
-        if (thisFactoryId.equals(prefServerFactoryId))
-        {
-          serverInfo[0] = prefServerFactoryId;
-          serverInfo[1] = server.getId();
-          return serverInfo;
-        }                
-      }      
-    }
-    
-    //Either the preferred server was not valid or it was valid but does not exist.
-    //Check the existing servers for validity
-    for (int i=0; i<servers.length; i++)
-    {
-      IServer server = (IServer)servers[i];
-      String thisFactoryId = server.getServerType().getId();
-      
-      boolean thisServerValid = containsString(validServerFactoryIds, thisFactoryId) 
-                                && isServerValid(thisFactoryId, j2eeVersion);
-      if (thisServerValid)
-      {
-        serverInfo[0] = thisFactoryId;
-        serverInfo[1] = server.getId();
-        return serverInfo;        
-      }
-    }          
-
-    //None of the existing servers is valid. Pick the preferred one if valid. Otherwise, pick the
-    //first valid server type.
-    if (preferredIsValid)
-    {
-      serverInfo[0] = prefServerFactoryId;
-      return serverInfo;
-    }
-    else
-    {
-      for (int i=0; i<validServerFactoryIds.length; i++ )
-      {
-        boolean isValid = isServerValid(validServerFactoryIds[i], j2eeVersion);
-        if (isValid)
-        {
-          serverInfo[0] = validServerFactoryIds[i];
-          return serverInfo;
-        }
-      }      
-    }
-    
-    //We can't determine a valid server selection. Return null.
-    return null;
-  }
-  
-  private static boolean isServerValid(String serverFactoryId, String j2eeVersion)
-  {
-   if (serverFactoryId==null || serverFactoryId.length()==0 || j2eeVersion==null || j2eeVersion.length()==0)
-     return true;
-   
-   String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
-   if (runtimeTargetId == null || runtimeTargetId.length()==0)
-     return false;
-   String webModuleType = IServerTargetConstants.WEB_TYPE;
-   boolean isValid = ServerUtils.isTargetValidForProjectType(runtimeTargetId, j2eeVersion, webModuleType);
-   return isValid;
-  }
-  /*
-   * Returns true is a contains b, false otherwise.
-   */
-  private static boolean containsString(String[] a, String b)
-  {
-    if (a==null || a.length<0 || b == null || b.length()==0 )
-      return false;
-    
-    for (int i=0; i<a.length; i++)
-    {
-      String s = a[i];
-      if (s.equals(b))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
deleted file mode 100644
index 44345accc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,376 +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.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class ValidationUtils
-{
-  MessageUtils msgUtils;
-
-  /**
-   * 
-   */
-  public ValidationUtils()
-  {
-    String pluginId = WebServiceConsumptionUIPlugin.ID; //"org.eclipse.jst.ws.consumption.ui";
-    msgUtils = new MessageUtils( pluginId + ".plugin", this );
-  }
-  
-  public IStatus validateProjectTargetAndJ2EE(String projectName, String compName, String earName, String earCompName, String serverFactoryId, String j2eeLevel)
-  {
-    IProject p = ProjectUtilities.getProject(projectName);
-    IProject earP = null;
-    if (earName!=null && !earName.equalsIgnoreCase("")) {
-    	earP = ProjectUtilities.getProject(earName);
-    }
-    IStatus targetStatus = doesProjectTargetMatchServerType(p, serverFactoryId);
-    if (earP!=null && targetStatus.getSeverity()==Status.OK)
-    {
-      //check the EAR      
-      IStatus earTargetStatus = doesProjectTargetMatchServerType(earP, serverFactoryId);
-      if(earTargetStatus.getSeverity()==Status.ERROR)
-      {
-        return earTargetStatus;
-      }            
-    }
-    else
-    {
-      return targetStatus;
-    }
-    
-
-    //Validate service side J2EE level    
-    IStatus j2eeStatus = doesProjectMatchJ2EELevel(p, compName, j2eeLevel);
-    if(earP!=null && j2eeStatus.getSeverity()==Status.OK)
-    {
-      IStatus earJ2EEStatus = doesProjectMatchJ2EELevel(earP, earCompName, j2eeLevel);
-      if(earJ2EEStatus.getSeverity()==Status.ERROR)
-      {
-        return earJ2EEStatus;
-      }
-    }
-    else
-    {
-      return j2eeStatus;
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  private IStatus doesProjectTargetMatchServerType(IProject p, String serverFactoryId)
-  {
-    if (p!=null && p.exists())
-    {
-      IRuntime projectTarget = ServerSelectionUtils.getRuntimeTarget(p.getName());
-      if (projectTarget!=null)
-      {
-        String projectTargetId = projectTarget.getRuntimeType().getId();
-        String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
-        if (serverTargetId!=null && serverTargetId.length()>0)
-        {
-          if(!projectTargetId.equals(serverTargetId))
-          { 
-            return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVER_TARGET_MISMATCH",new String[]{p.getName()}) );
-          }
-        }
-      }
-    }
-    return Status.OK_STATUS;        
-  }
-
-  private IStatus doesProjectMatchJ2EELevel(IProject p, String compName, String j2eeLevel)
-  {
-
-    try {
-		if (p!=null && p.exists())
-		{
-  	  int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p, compName);
-		  if (projectJ2EELevel!=-1)
-		  {
-		    String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
-		    if (j2eeLevel!=null && j2eeLevel.length()>0)
-		    {
-		      if (!projectJ2EELevelString.equals(j2eeLevel))
-		      {
-		        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_J2EE_MISMATCH",new String[]{p.getName()}) );
-		      }
-		    }
-		  }
-		}
-	} catch(Exception e){
-    
-  }
-    
-    return Status.OK_STATUS;        
-  }
-  
-  public IStatus validateProjectType(String projectName, SelectionListChoices runtime2ClientTypes)
-  {
-    IStatus status = Status.OK_STATUS;
-    IProject p = ProjectUtilities.getProject(projectName);
-    if (p==null || !p.exists())
-    {
-      //Project does not exist which means a new project of the correct type will be created
-      //We're done. All is good.
-      return status;
-    }
-      
-    //If the project exists, we should see it in the project list for the selected client
-    //project type.
-    String[] projectNames = runtime2ClientTypes.getChoice().getChoice().getList().getList();
-    for (int i=0; i<projectNames.length; i++)
-    {
-      if (projectName.equals(projectNames[i]))
-      {
-        //Found the project. All is good.
-        return status;
-      }
-    }
-    
-    //Didn't find the project. Return an error.
-    //Get the label for the client type id
-    String clientTypeLabel = getClientTypeLabel(runtime2ClientTypes.getChoice().getList().getSelection());
-    String message = msgUtils.getMessage("MSG_WRONG_CLIENT_PROJECT_TYPE",new String[]{projectName, clientTypeLabel});
-    IStatus eStatus = StatusUtils.errorStatus( message );
-    return eStatus;
-    
-  }
-  
-  
-  private String getClientTypeLabel( String type )
-  {	  
-	  if (type.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
-	  }
-	  else if (type.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
-	  }
-	  else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
-	  }
-	  else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
-	  {
-		  return msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
-	  }
-	  else
-	  {
-		  //No known label, return the typeId itself. 
-		  return type;
-	  }	  	  
-  }  
-  
-  /**
-   * 
-   * @param p
-   * @param wsdlURL
-   * @param parser
-   * @return
-   */
-  public boolean isProjectServiceProject(IProject p, String wsdlURL, WebServicesParser parser)
-  {
-    if (p==null || wsdlURL==null || wsdlURL.length()==0 || parser==null)
-      return false;
-    
-    IResource wsXML = getWebServcesXML(p);
-    if (wsXML==null)
-      return false;
-    
-    
-      //Make a list of all the wsdl-port's in webservices.xml
-    WebServicesManager wsm = WebServicesManager.getInstance();
-    //WebServiceEditModel wsEditModel = wsm.getWSEditModel(p);
-    //WebServices ws = wsEditModel.getWebServices();
-    Iterator wsDescs = wsm.getInternalWebServicesDescriptions().iterator();
-    ArrayList wsdlPortList = new ArrayList();
-    while(wsDescs.hasNext())
-    {
-      WebServiceDescription wsDesc = (WebServiceDescription)wsDescs.next();
-      Iterator pcs = wsDesc.getPortComponents().iterator();
-      while(pcs.hasNext())
-      {
-        PortComponent pc = (PortComponent)pcs.next();
-        WSDLPort wsdlPort = pc.getWsdlPort();
-        wsdlPortList.add(new QualifiedName(wsdlPort.getNamespaceURI(), wsdlPort.getLocalPart()));
-      }
-    }
-    
-    ArrayList portList = getPortNamesFromWsdl(wsdlURL, parser);
-
-    //If any of the QualifiedNames in portList equals any of the QualifiedNames
-    //in wsdlPortList, this is the service project. Return true.
-    Object[] ports = portList.toArray();
-    Object[] wsdlPorts = wsdlPortList.toArray();
-    for (int i = 0; i < ports.length; i++)
-    {
-      QualifiedName portName = (QualifiedName) ports[i];
-      for (int j = 0; j < wsdlPorts.length; j++)
-      {
-        QualifiedName wsdlPortName = (QualifiedName) wsdlPorts[j];
-        if (portName.equals(wsdlPortName))
-        {
-          return true;
-        }
-      }
-    }
-
-    return false;
-  }
-  
-  /**
-   * @deprecated
-   * 
-   */
-  private IResource getWebServcesXML(IProject p)
-  {
-	  // 
-//    J2EENature nature = (J2EENature) J2EENature.getRegisteredRuntime(p);
-//    if (nature == null)
-//      return null;
-
-//    IResource moduleRoot = nature.getModuleServerRoot();
-//	IResource moduleRoot = ResourceUtils.getWebModuleServerRoot(p);
-	IResource moduleRoot = J2EEUtils.getFirstWebContentContainer(p);  
-    if (!(moduleRoot instanceof IContainer))
-      return null;
-
-    IResource webServicesXML=null;
-//    if (nature instanceof J2EEWebNatureRuntime)
-	if (ResourceUtils.isWebProject(p))
-    {
-      StringBuffer wsPath = new StringBuffer();
-      wsPath.append("WEB-INF/");
-      wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
-      webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString()); 
-    }
-    else //Must be an Application Client Module or an EJB Module
-    {
-      StringBuffer wsPath = new StringBuffer();
-      wsPath.append("META-INF/");
-      wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
-      webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString());     
-    }
-    
-    return webServicesXML;
-  }
-  
-  private ArrayList getPortNamesFromWsdl(String wsdlURL, WebServicesParser parser)
-  {
-  	ArrayList portNameList = new ArrayList();
-  	Definition def = parser.getWSDLDefinition(wsdlURL);
-    Map services = def.getServices();
-    Service service = null;
-    for (Iterator it = services.values().iterator(); it.hasNext();)
-    {
-      service = (Service)it.next();
-      String namespace = service.getQName().getNamespaceURI();
-      Map ports = service.getPorts();
-      for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
-      {
-      	Port port = (Port)it2.next();
-      	portNameList.add(new QualifiedName(namespace, port.getName()));
-      }
-    }        
-  	
-  	return portNameList;
-  	
-  }
-  
-  private class QualifiedName
-  {
-    String namespaceURI;
-
-    String localPart;
-
-    /**
-     * @param namespaceURI
-     * @param localPart
-     */
-    public QualifiedName(String namespaceURI, String localPart)
-    {
-      super();
-      this.namespaceURI = namespaceURI;
-      this.localPart = localPart;
-    }
-
-    /**
-     * @return Returns the localPart.
-     */
-    public String getLocalPart()
-    {
-      return localPart;
-    }
-
-    /**
-     * @param localPart
-     *          The localPart to set.
-     */
-    public void setLocalPart(String localPart)
-    {
-      this.localPart = localPart;
-    }
-
-    /**
-     * @return Returns the namespaceURI.
-     */
-    public String getNamespaceURI()
-    {
-      return namespaceURI;
-    }
-
-    /**
-     * @param namespaceURI
-     *          The namespaceURI to set.
-     */
-    public void setNamespaceURI(String namespaceURI)
-    {
-      this.namespaceURI = namespaceURI;
-    }
-
-    public boolean equals(QualifiedName qn)
-    {
-      return (qn.getNamespaceURI().equals(namespaceURI) && qn.getLocalPart()
-          .equals(localPart));
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
deleted file mode 100644
index c888d6f34..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,108 +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.consumption.ui.extension;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-public class ClientRootFragment extends SequenceFragment 
-{
-  public ClientRootFragment()
-  {
-    add( new SimpleFragment( new PreClientDevelopCommand(), "" ) );
-    add( new DevelopClientFragment() );
-    add( new SimpleFragment( new PreClientAssembleCommand(), "" ) );
-    add( new AssembleClientFragment() );
-    add( new SimpleFragment( new PreClientDeployCommand(), "" ) );
-    add( new DeployClientFragment() );
-    add( new SimpleFragment( new PreClientInstallCommand(), "" ) );
-    add( new InstallClientFragment() );
-    add( new SimpleFragment( new PreClientRunCommand(), 
-    	 "org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientRunCommand" ) );
-    add( new RunClientFragment() );
-  }
-
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", DevelopClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", DevelopClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", DevelopClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", DevelopClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", DevelopClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", DevelopClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", DevelopClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", DevelopClientFragment.class );
-  	
-	// Map the PreClientDevelopCommand into the dataObject.
-	registry.addMapping( PreClientDevelopCommand.class, "DataObject", DataObjectCommand.class );
-		
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", AssembleClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", AssembleClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", AssembleClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", AssembleClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", AssembleClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", AssembleClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", AssembleClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", AssembleClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", DeployClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", DeployClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", DeployClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", DeployClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", DeployClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", DeployClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", DeployClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", DeployClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", InstallClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", InstallClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", InstallClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", InstallClientFragment.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", InstallClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", InstallClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", InstallClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", InstallClientFragment.class );
-	
-  	registry.addMapping( PreClientDevelopCommand.class, "WebService", RunClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Environment", RunClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Context", RunClientFragment.class );  
-  	registry.addMapping( PreClientDevelopCommand.class, "Selection", RunClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "Project", RunClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Module", RunClientFragment.class );  
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", RunClientFragment.class );
-  	registry.addMapping( PreClientDevelopCommand.class, "Ear", RunClientFragment.class );
-    
-    //Mappings from framework to framework commands
-    registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientAssembleCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientAssembleCommand.class );    
-    registry.addMapping( PreClientDevelopCommand.class, "J2eeLevel", PreClientAssembleCommand.class );
-    
-    registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientInstallCommand.class );
-    registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientInstallCommand.class );   
-
-    registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientRunCommand.class );    
-	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
deleted file mode 100644
index 948cb5cf8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
+++ /dev/null
@@ -1,106 +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.consumption.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientAssembleCommand extends AbstractDataModelOperation 
-{
-  private IWebServiceClient       webServiceClient_;
-  private String                  project_;
-  private String                  module_;
-  private String                  earProject_;
-  private String                  ear_;
-  private String                  j2eeLevel_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    
-    System.out.println("In Pre client assemble command.");
-
-	// Check if EAR module is req'd, ie. !=null
-	if (earProject_==null)
-		return Status.OK_STATUS;
-	
-    //Create the client EAR module
-    CreateModuleCommand command = new CreateModuleCommand();
-    command.setProjectName(earProject_);
-    command.setModuleName(ear_);
-    command.setModuleType(CreateModuleCommand.EAR);
-    command.setServerFactoryId(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-    command.setServerInstanceId( webServiceClient_.getWebServiceClientInfo().getServerInstanceId() );
-    command.setJ2eeLevel(j2eeLevel_);
-    command.setEnvironment( environment );
-    IStatus status = command.execute( null, null );
-    if (status.getSeverity()==Status.ERROR)
-    {
-      environment.getStatusHandler().reportError( status );
-      return status;
-    }     
-    
-    
-    //Associate the client module and service EAR
-    AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-    associateCommand.setProject(project_);
-    associateCommand.setModule(module_);
-    associateCommand.setEARProject(earProject_);
-    associateCommand.setEar(ear_);
-    associateCommand.setEnvironment( environment );
-    status = associateCommand.execute( null, null );
-    if (status.getSeverity()==Status.ERROR)
-    {
-      environment.getStatusHandler().reportError(  status );     
-    }     
-    
-    return status;
-  }
-  
-  public void setProject( String project )
-  {
-    project_ = project;
-  }
-    
-  public void setModule( String module )
-  {
-    module_ = module;
-  } 
-  
-  public void setEarProject( String earProject )
-  {
-    earProject_ = earProject;
-  }
-  
-  public void setEar( String ear )
-  {
-    ear_ = ear;  
-  }
-  
- 
-  public void setJ2eeLevel( String j2eeLevel )
-  {
-    j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public void setWebService( IWebServiceClient webServiceClient )
-  {
-    webServiceClient_ = webServiceClient;  
-  }   
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
deleted file mode 100644
index cb8966583..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
+++ /dev/null
@@ -1,26 +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.consumption.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-public class PreClientDeployCommand extends AbstractDataModelOperation 
-{
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
deleted file mode 100644
index feedac3a1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,259 +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.consumption.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class PreClientDevelopCommand extends AbstractDataModelOperation 
-{
-  /*	
-  private String ID_WEB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
-  private String ID_EJB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
-  private String ID_APP_CLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
-  private String ID_JAVA = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-  */
-  
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IContext          context_;
-  private ISelection        selection_;
-  private String            project_;
-  private String            module_;
-  private String            moduleType_;
-  private String            earProject_;
-  private String            ear_;
-  private IWebServiceClient webServiceClient_;
-  private String            j2eeLevel_;
-  private ResourceContext   resourceContext_;
-	private boolean						test_;
-  private String            wsdlURI_;
-  private Object            dataObject_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    
-    // Split up the project and module
-    int index = module_.indexOf("/");
-    if (index!=-1){
-      project_ = module_.substring(0,index);
-      module_ = module_.substring(index+1);
-    }
-
-    if (ear_!=null && ear_.length()>0)
-    {
-      int earIndex = ear_.indexOf("/");
-      if (earIndex!=-1) {
-        earProject_ = ear_.substring(0,earIndex);
-        ear_ = ear_.substring(earIndex+1);
-      }
-    }    
-    
-    IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils
-        .getWebServiceRuntime(typeRuntimeServer_.getRuntimeId());
-    WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
-    System.out.println("In Pre client develop command.");
-
-    wsInfo.setJ2eeLevel(j2eeLevel_);
-    wsInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
-    wsInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-    wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-    wsInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
-    wsInfo.setWsdlURL(wsdlURI_);
-    
-    webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
-    WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
-    context_ = new SimpleContext(true, true, true, true, true, true, test_,
-        false, scenario, resourceContext_.isOverwriteFilesEnabled(),
-        resourceContext_.isCreateFoldersEnabled(), resourceContext_
-            .isCheckoutFilesEnabled());
-
-    // Create the client module
-
-	int intModuleType = convertModuleType(moduleType_);
-
-	CreateModuleCommand command = new CreateModuleCommand();
-	command.setProjectName(project_);
-	command.setModuleName(module_);
-	command.setModuleType(intModuleType);
-	command.setServerFactoryId(typeRuntimeServer_.getServerId());
-	command.setJ2eeLevel(j2eeLevel_);
-  command.setEnvironment( environment );
-	IStatus status = command.execute( null, null );		
-
-    // rsk todo -- once the clientProjectType extension is gone, determination
-    // of what type of module to create will have to be done.
-    //if (moduleType_.equals(ID_WEB)) command.setModuleType(CreateModuleCommand.WEB);
-    //if (moduleType_.equals(ID_EJB)) command.setModuleType(CreateModuleCommand.EJB);
-    //if (moduleType_.equals(ID_APP_CLIENT)) command.setModuleType(CreateModuleCommand.APPCLIENT);
-    
-    command.setServerInstanceId( typeRuntimeServer_.getServerInstanceId() );
-
-
-    if (status.getSeverity() == Status.ERROR)
-    {
-      environment.getStatusHandler().reportError( status );
-    }
-    return status;
-  }
-  
-  private int convertModuleType(String type)
-  {
-	  if (type.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return CreateModuleCommand.WEB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return CreateModuleCommand.EJB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return CreateModuleCommand.APPCLIENT;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EAR_MODULE))
-	  {
-		  return CreateModuleCommand.EAR;
-	  }	  
-	  else
-	  {
-		  return -1;
-	  }
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	typeRuntimeServer_ = typeRuntimeServer;  
-  }
-  
-  public void setClientJ2EEVersion( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-    return j2eeLevel_;  
-  }
-  
-  public IWebServiceClient getWebService()
-  {
-	return webServiceClient_;  
-  }
-  
-  public IContext getContext()
-  {
-    return context_;
-  }
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;	  
-  }
-  
-  public ISelection getSelection()
-  {
-    return selection_;	  
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-
-  public String getProject()
-  {
-    return project_;    
-  }
-  
-  public String getModule()
-  {
-    return module_;	  
-  }
-  
-  public void setModule( String module )
-  {
-	module_ = module;
-  }
-  
-  public void setModuleType( String moduleType)
-  {
-    moduleType_ = moduleType;
-  }
-
-  public String getEarProject()
-  {
-    return earProject_;   
-  }
-  
-  public String getEar()
-  {
-	return ear_;  
-  }
-  
-  public void setEar( String ear )
-  {
-	ear_ = ear;  
-  }
-	
-  public void setTestService(boolean testService)
-  {
-	test_ = testService;
-  }		
-  
-  public void setWsdlURI(String uri)
-  {
-    wsdlURI_ = uri;
-  }
-  
-  public void setDataObject( Object object )
-  {
-    dataObject_ = object;	  
-  }
-  
-  public Object getDataObject()
-  {
-	Object result = null;
-	
-    if( dataObject_ != null && dataObject_ instanceof IWebService )
-	{
-	  // The data object has already been set with an IWebService
-	  // so we will keep this value.
-	  result = dataObject_;
-	}
-    else
-	{
-	  result = webServiceClient_;	
-	}
-	
-	return result;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
deleted file mode 100644
index df45d2f9a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientInstallCommand extends AbstractDataModelOperation 
-{
-  private IWebServiceClient webServiceClient_;
-  private String            project_;
-  private String            module_;
-  private String            earProject_;
-  private String            ear_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      Environment environment = getEnvironment();
-      
-      if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId()==null)
-      {
-        CreateServerCommand createServerCommand = new CreateServerCommand();
-        createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
-        createServerCommand.setEnvironment( environment );
-        IStatus createServerStatus = createServerCommand.execute(null, null);
-        if (createServerStatus.getSeverity()==Status.OK)
-        {
-          webServiceClient_.getWebServiceClientInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
-        }
-        else
-        {
-          if (createServerStatus.getSeverity()==Status.ERROR)
-          {
-            environment.getStatusHandler().reportError( createServerStatus );
-          }               
-          return createServerStatus;
-        }
-      }
-        
-      
-      
-      AddModuleToServerCommand command = new AddModuleToServerCommand();
-      command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
-      if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
-      {
-        command.setProject(earProject_);
-        command.setModule(ear_);
-      }
-      else
-      {
-        command.setProject(project_);
-        command.setModule(module_);       
-      }
-
-      command.setEnvironment( environment );
-      IStatus status = command.execute( null, null );
-      if (status.getSeverity()==Status.ERROR)
-      {
-        environment.getStatusHandler().reportError( status );
-      }     
-      return status;
-	  }
-
-    public void setProject( String project )
-    {
-      project_ = project;
-    }
-      
-    public void setModule( String module )
-    {
-      module_ = module;
-    } 
-    
-    public void setEarProject( String earProject )
-    {
-      earProject_ = earProject;
-    }
-    
-    public void setEar( String ear )
-    {
-      ear_ = ear;  
-    }
-    
-    public void setWebService( IWebServiceClient webServiceClient )
-    {
-      webServiceClient_ = webServiceClient;  
-    }    
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
deleted file mode 100644
index cc843529b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
+++ /dev/null
@@ -1,47 +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.consumption.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientRunCommand extends AbstractDataModelOperation 
-{
-  private IWebServiceClient webServiceClient_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    
-    System.out.println("In Pre client run command.");
-    StartServerCommand command = new StartServerCommand();
-    command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
-    command.setEnvironment( environment );
-    IStatus status = command.execute( monitor, null );
-    if (status.getSeverity()==Status.ERROR)
-    {
-      environment.getStatusHandler().reportError( status );       
-    }     
-    return status;    
-  }
-
-  public void setWebService( IWebServiceClient webServiceClient )
-  {
-    webServiceClient_ = webServiceClient;  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
deleted file mode 100644
index 092411ee4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,136 +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.consumption.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* 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 WebServiceConsumptionUIPlugin extends AbstractUIPlugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.consumption.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceConsumptionUIPlugin instance_;
-
-  private PersistentServerRuntimeContext serverRuntimeContext_;
-  
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceConsumptionUIPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceConsumptionUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
-  * @return The WebServiceConsumptionUIPlugin singleton.
-  */
-  static public WebServiceConsumptionUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
- /**
-  * 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 )
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", instance_ );
-    
-    if( key.startsWith("%"))
-    {
-      key = key.substring( 1, key.length() );
-    }
-    
-    return msgUtils.getMessage(key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See java.text.MessageFormat for
-  * further details on substitution.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @param args The substitution values for the message
-  * as required by the message in plugin.properties and
-  * by the rules of class java.text.MessageFormat.
-  * @return The locale-specific message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");;
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-
-  public PersistentServerRuntimeContext getServerRuntimeContext() 
-	{
-	  if (serverRuntimeContext_ == null)
-	  	{
-	  		serverRuntimeContext_ = new PersistentServerRuntimeContext();
-	  		serverRuntimeContext_.load();
-	  	}
-	  return serverRuntimeContext_;
-	}  
-  }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
deleted file mode 100644
index 946f456f7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,131 +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.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-/**
- * 
- */
-public class PersistentServerRuntimeContext extends PersistentContext {
-	
-	private String PREFERENCE_SERVER = "PREFERENCE_SERVER";
-	private String PREFERENCE_RUNTIME = "PREFERENCE_RUNTIME";
-	private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
-	
-	private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.50";
-	private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
-	private String J2EE_VERSION_DEFAULT = "14";
-	
-	public PersistentServerRuntimeContext()
-	{
-		super(WebServiceConsumptionUIPlugin.getInstance());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jst.ws.internal.context.Context#load()
-	 */
-	public void load() {
-		//Defaults will be set via the .ini customization. They are hard coded to default values in the
-		//absence of a .ini file.
-		String serverDefault = getDefaultString(PREFERENCE_SERVER);
-		if (serverDefault==null || serverDefault.length()==0)
-		{
-		  setDefault(PREFERENCE_SERVER, SERVER_FACTORY_ID_DEFAULT);
-		}
-
-		String runtimeDefault = getDefaultString(PREFERENCE_RUNTIME);
-		if (runtimeDefault==null || runtimeDefault.length()==0)
-		{
-		  setDefault(PREFERENCE_RUNTIME, RUNTIME_ID_DEFAULT);
-		}
-
-		String j2eeDefault = getDefaultString(PREFERENCE_J2EE_VERSION);
-		if (j2eeDefault==null || j2eeDefault.length()==0)
-		{
-		  setDefault(PREFERENCE_J2EE_VERSION, J2EE_VERSION_DEFAULT);
-		}
-
-				
-	}
-	
-	public String getDefaultServerFactoryId()
-	{
-		return getDefaultString(PREFERENCE_SERVER);
-	}
-
-	public String getDefaultRuntimeId()
-	{
-		return getDefaultString(PREFERENCE_RUNTIME);
-	}
-
-	public String getDefaultJ2EEVersion()
-	{
-		return getDefaultString(PREFERENCE_J2EE_VERSION);
-	}
-
-	public String getServerFactoryId()
-	{
-		String value = getValueAsString(PREFERENCE_SERVER); 
-		/*
-		if (value==null || value.length()==0)
-		{
-			value = SERVER_FACTORY_ID_DEFAULT; 
-			setServerFactoryId(value);
-		}
-		*/
-		return value;
-	}
-	
-	public String getRuntimeId()
-	{
-		String value = getValueAsString(PREFERENCE_RUNTIME);
-		/*
-		if (value==null || value.length()==0)
-		{
-			value = RUNTIME_ID_DEFAULT; 
-			setRuntimeId(value);
-		}
-		*/
-		return value;		
-	}
-	
-	public String getJ2EEVersion()
-	{
-		String value = getValueAsString(PREFERENCE_J2EE_VERSION);
-		/*
-		if (value==null || value.length()==0)
-		{
-			value = J2EE_VERSION_DEFAULT; 
-			setJ2EEVersion(value);
-		}
-		*/
-		return value;		
-	}
-	
-	public void setServerFactoryId(String id)
-	{
-		setValue(PREFERENCE_SERVER,id);
-	}
-	
-	public void setRuntimeId(String id)
-	{
-		setValue(PREFERENCE_RUNTIME, id);
-	}
-	
-	public void setJ2EEVersion(String version)
-	{
-		setValue(PREFERENCE_J2EE_VERSION, version);
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
deleted file mode 100644
index b2abb86e1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,392 +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.consumption.ui.preferences;
-
-import java.util.ArrayList;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-
-
-/**
- *
- */
-public class ServerRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener 
-{
-	private String pluginId_= "org.eclipse.jst.ws.consumption.ui";
-	private MessageUtils msgUtils_;
-	
-	/* CONTEXT_ID SRPF0001 for server preference on the server runtime preference page */
-	private String INFOPOP_SRPF_SERVER_PREF = pluginId_ + ".SRPF0001";
-	private Combo server_;
-
-	/* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
-	private String INFOPOP_SRPF_RUNTIME_PREF = pluginId_ + ".SRPF0002";
-	private Combo runtime_;	
-
-	/* CONTEXT_ID SRPF0003 for J2EE version preference on the server runtime preference page */
-	private String INFOPOP_SRPF_J2EE_PREF = pluginId_ + ".SRPF0003";
-	private Combo j2eeVersion_;
-	
-	SelectionListChoices serverToRuntimeToJ2EE_;
-	
-	public void init(IWorkbench workbench)   { }	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) 
-	{
-	  
-	  msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
-	  UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-	  
-	  Composite page = new Composite(parent, SWT.NONE);
-	  GridLayout gl = new GridLayout();
-	  gl.numColumns = 2;
-	  page.setLayout(gl);
-	  GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
-	  page.setLayoutData(gd);
-	  
-	  server_ = uiUtils.createCombo(page,"LABEL_SERVERS_LIST",
-	  		                        "TOOLTIP_SRPF_COMBO_SERVER",
-									INFOPOP_SRPF_SERVER_PREF,
-									SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-	  
-	  runtime_ = uiUtils.createCombo(page,"LABEL_RUNTIMES_LIST",
-	  		                         "TOOLTIP_SRPF_COMBO_RUNTIME",
-									 INFOPOP_SRPF_RUNTIME_PREF,
-									 SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-	  
-	  j2eeVersion_ = uiUtils.createCombo(page,"LABEL_J2EE_VERSION",
-                                         "TOOLTIP_SRPF_COMBO_J2EE",
-			                             INFOPOP_SRPF_J2EE_PREF,
-			                             SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);	  
-
-	  initializeValues();
-	  startListening();
-	  return page;
-	}
-
-	private void initializeValues()
-	{
-		PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-		//serverToRuntimeToJ2EE_ = WebServiceServerRuntimeTypeRegistry.getInstance().getServerToRuntimeToJ2EE();
-    serverToRuntimeToJ2EE_ = WebServiceRuntimeExtensionUtils.getServerToRuntimeToJ2EE();
-
-
-		setServerItems(serverToRuntimeToJ2EE_.getList().getList());
-		String defaultServerText = context.getServerFactoryId();
-		serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
-		setServerSelection(defaultServerText);
-		
-		setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-		String defaultRuntimeText = context.getRuntimeId();
-		serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
-		setRuntimeSelection(defaultRuntimeText);
-		
-		setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		String defaultJ2EEVersion = context.getJ2EEVersion();
-		serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
-		setJ2EESelection(defaultJ2EEVersion);
-		
-	}
-	
-	public void handleEvent(Event event)
-	{
-		if (server_ == event.widget)
-		{
-			handleServerSelected();
-		}
-		else if (runtime_ == event.widget)
-		{
-			handleRuntimeSelected();
-		}
-		else if (j2eeVersion_ == event.widget)
-		{			
-			handleJ2EESelected();
-		}			
-	}
-
-	private void handleServerSelected()
-	{
-		stopListening();
-		
-		String selectedText = getServerSelection();
-		serverToRuntimeToJ2EE_.getList().setSelectionValue(selectedText);
-		
-		//Update the runtime -------------------------------
-		setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-		if (serverToRuntimeToJ2EE_.getChoice().getList().getList().length > 0)
-		  serverToRuntimeToJ2EE_.getChoice().getList().setIndex(0);
-		
-		String newRuntimeText = serverToRuntimeToJ2EE_.getChoice().getList().getSelection();
-		if (newRuntimeText!=null && newRuntimeText.length()>0)
-			setRuntimeSelection(newRuntimeText);
-		
-		//Update the j2ee version -------------------------------
-		if (newRuntimeText!=null && newRuntimeText.length()>0)
-		{
-		  setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		  if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
-			  serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-			
-			String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
-			if (newJ2EEText!=null && newJ2EEText.length()>0)
-				setJ2EESelection(newJ2EEText);
-		}
-		else
-		{
-		  setJ2EEItems(new String[0]);
-		}
-		
-		startListening();
-	}
-	
-	private void handleRuntimeSelected()
-	{
-		stopListening();
-		
-		String selectedText = getRuntimeSelection();
-		serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(selectedText);
-		
-		//Update the j2ee version -------------------------------
-		setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
-		  serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-		
-		String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
-		if (newJ2EEText!=null && newJ2EEText.length()>0)
-			setJ2EESelection(newJ2EEText);
-				
-		startListening();		
-	}
-	
-	private void handleJ2EESelected()
-	{
-		stopListening();
-		
-		String selectedText = getJ2EESelection();
-		serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(selectedText);
-		
-		startListening();
-	}
-    /**
-	 * Does anything necessary because the default button has been pressed.
-	*/
-	protected void performDefaults()
-	{
-	  super.performDefaults();
-	  setToDefaults();
-	}
-	
-	private void setToDefaults()
-	{
-		PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-
-		String defaultServerText = context.getDefaultServerFactoryId();
-		serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
-		setServerSelection(defaultServerText);
-		
-		setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
-		String defaultRuntimeText = context.getDefaultRuntimeId();
-		serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
-		setRuntimeSelection(defaultRuntimeText);
-		
-		setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
-		String defaultJ2EEVersion = context.getDefaultJ2EEVersion();
-		serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
-		setJ2EESelection(defaultJ2EEVersion);		
-	}
-
-	/**
-	 * Do anything necessary because the OK button has been pressed.
-	 *  @return whether it is okay to close the preference page
-	 */
-	public boolean performOk()
-	{
-	  storeValues();
-	  return true;
-	}
-
-	private void storeValues()
-	{
-      PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-      context.setServerFactoryId(getServerSelection());
-      context.setRuntimeId(getRuntimeSelection());
-      context.setJ2EEVersion(getJ2EESelection());
-	}
-	
-	protected void performApply()
-	{
-	  performOk();
-	}
-	
-  	
-	private void startListening()
-	{
-	  server_.addListener(SWT.Selection,this);
-	  runtime_.addListener(SWT.Selection,this);
-	  j2eeVersion_.addListener(SWT.Selection,this);
-	}
-
-	private void stopListening()
-	{
-	  server_.removeListener(SWT.Selection, this);
-	  runtime_.removeListener(SWT.Selection, this);
-	  j2eeVersion_.removeListener(SWT.Selection, this);
-	}
-
-	private void setServerItems(String[] factoryIds)
-	{
-	  
-	  if (factoryIds != null)
-	  {
-	    ArrayList serverLabelsList = new ArrayList();
-		  for (int i=0;i<factoryIds.length;i++)
-		  {
-			  //String thisServerLabel = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryIds[i]);
-        String thisServerLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(factoryIds[i]);
-			  if (thisServerLabel!=null && thisServerLabel.length()>0)
-			  {
-			    serverLabelsList.add(thisServerLabel);
-			  }
-			
-		  }
-		  String[] serverLabels = convertToStringArray(serverLabelsList.toArray()); 
-		  server_.setItems(serverLabels);
-	  }
-		
-	}
-	
-	private void setRuntimeItems(String[] ids)
-	{
-	  if (ids != null)
-	  {
-		String[] runtimeLabels = new String[ids.length];
-		for (int i=0;i<ids.length;i++)
-		{
-		  //runtimeLabels[i] = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(ids[i]);
-      runtimeLabels[i] = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(ids[i]);
-		}
-		runtime_.setItems(runtimeLabels);
-	  }
-		
-	}
-	
-    private void setJ2EEItems(String[] versions)
-    {
-      if (versions != null)
-      {
-        String[] j2eeLabels = new String[versions.length];
-        for (int i = 0; i < versions.length; i++)
-        {
-          String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-          if (label != null && label.length()>0)
-            j2eeLabels[i] = label;
-          else
-            j2eeLabels[i] = msgUtils_.getMessage("LABEL_NA");
-        }
-        j2eeVersion_.setItems(j2eeLabels);
-        
-        //Disable the combo if it has no items.
-        if (j2eeLabels.length > 0)
-          j2eeVersion_.setEnabled(true);
-        else
-          j2eeVersion_.setEnabled(false);
-      }
-        
-    }
-	
-	private String getServerSelection()
-	{
-	  String serverLabel = server_.getText();
-	  //return WebServiceServerRuntimeTypeRegistry.getInstance().getServerFactoryId(serverLabel);
-    return WebServiceRuntimeExtensionUtils.getServerFactoryId(serverLabel);
-	}
-	
-	private String getRuntimeSelection()
-	{
-      String runtimeLabel = runtime_.getText();
-	  //return WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeId(runtimeLabel);
-      return WebServiceRuntimeExtensionUtils.getRuntimeId(runtimeLabel);
-	}
-	
-	private String getJ2EESelection()
-	{
-	  String j2eeLabel = j2eeVersion_.getText();
-	  return J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);		
-	}
-	
-	private void setServerSelection(String factoryId)
-	{
-		//String label = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryId);
-    String label = WebServiceRuntimeExtensionUtils.getServerLabelById(factoryId);
-		setSelection(server_,label);
-	}
-	
-	private void setRuntimeSelection(String id)
-	{
-		//String label = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(id);
-    String label = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(id);
-		setSelection(runtime_,label);		
-	}
-	
-	private void setJ2EESelection(String version)
-	{
-	  String label = J2EEUtils.getLabelFromJ2EEVersion(version);
-      setSelection(j2eeVersion_, label);
-	}
-	
-	private void setSelection(Combo combo, String s)
-	{
-		String[] items = combo.getItems();
-		for (int i=0; i<items.length; i++)
-		{
-			if (items[i].equals(s))
-			{
-				combo.select(i);
-				return;
-			}
-		}
-	}
-	
-	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;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
deleted file mode 100644
index 96b9860ad..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
+++ /dev/null
@@ -1,29 +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.consumption.ui.selection;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.Selection;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class SelectionTransformer implements Transformer 
-{
-  public Object transform(Object value) 
-  {
-	IStructuredSelection inSelection  = (IStructuredSelection)value;
-	Selection            outSelection = new Selection();
-	
-	outSelection.setSelection( inSelection.toArray() );
-	
-	return outSelection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
deleted file mode 100644
index a08597eeb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetContributor.java
+++ /dev/null
@@ -1,56 +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.consumption.ui.server;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartClientWidgetContributor implements INamedWidgetContributor 
-{
-  private IServer      server_;
-  private MessageUtils msgUtils_;
-	  
-  public StartClientWidgetContributor( IServer server )
-  {
-	server_ = server;
-	msgUtils_ = new  MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", this );
-  }
-  
-  public String getDescription() 
-  {
-	return msgUtils_.getMessage( "PAGE_DESC_WS_START_SERVER" );
-  }
-
-  public String getName() 
-  {
-	return "";
-  }
-
-  public String getTitle() 
-  {
-	return msgUtils_.getMessage( "PAGE_TITLE_WS_START_SERVER" );
-  }
-
-  public WidgetContributorFactory getWidgetContributorFactory() 
-  {
-	return new WidgetContributorFactory()
-	       {
-			 public WidgetContributor create() 
-			 {
-				return new StartServerWidget( server_ );
- 			 }
-	       };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
deleted file mode 100644
index 77f3dc230..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartClientWidgetFactory.java
+++ /dev/null
@@ -1,57 +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.consumption.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class StartClientWidgetFactory implements INamedWidgetContributorFactory 
-{
-  private IWebServiceClient webserviceClient_;
-  
-  public INamedWidgetContributor getFirstNamedWidget() 
-  {
-    IServer server = null;
-    
-    if( webserviceClient_ != null )
-    {
-      server = ServerCore.findServer(webserviceClient_.getWebServiceClientInfo().getServerInstanceId() );
-    }
-    
-    if( server != null && server.getServerState() != IServer.STATE_STARTED )
-    {
-      return new StartClientWidgetContributor( server );
-    }
-    
-	return null;
-  }
-
-  public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-  {
-	return null;
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-	dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", StartClientWidgetFactory.class );
-  }
-  
-  public void setWebService( IWebServiceClient webserviceClient )
-  {
-    webserviceClient_ = webserviceClient;  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
deleted file mode 100644
index 17ce11172..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
+++ /dev/null
@@ -1,444 +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.consumption.ui.server;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.wizard.ProgressMonitorPart;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.NullStatusHandler;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidget extends SimpleWidgetDataContributor 
-{
-  private IServer             server_;
-  private IStatus              status_;
-  private Listener            statusListener_;
-  private Button              button_;
-  private JobChangeAdapter    jobChangeAdapter_;
-  private Text                serverStateText_;
-  private ProgressMonitorPart progressMonitor_;
-  private MessageUtils        msgUtils_;
-  private String              pluginId_;
-  private Composite           buttonGroup_;
-    
-  /*CONTEXT_ID SSWP0001 Start the server button. */
-  private String INFOPOP_SSWP_SERVER_BUTTON = "SSWP0001";
-  
-  public StartServerWidget( IServer server )
-  {
-	pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-		
-    server_ = server;
-    
-    jobChangeAdapter_ = new JobChangeAdapter()
-                        {
-                          public void done(final IJobChangeEvent event) 
-                          {
-                        	Display.getDefault().asyncExec( new Runnable()
-                        			                        {
-	        					                              public void run() 
-							                                  {
-	        						                            if( !progressMonitor_.isDisposed() )
-	        						                            {
-							                                      setServerState();	
-							                                      progressMonitor_.done();
-							                                      reportErrorIfRequired( (StartServerJob)event.getJob() );
-	        						                            }
-							                                  }
-                        			                        });
-                          }
-                        };
-  }
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) 
-  {
-	statusListener_ = statusListener;
-	
-	UIUtils      uiUtils     = new UIUtils( msgUtils_, pluginId_ );
-	Composite    group       = uiUtils.createComposite( parent, 1 );
-	
-	Text         text1        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text1.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT1", new String[]{ server_.getName() } ));
-	
-	Text         text2        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text2.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT2", new String[]{ server_.getName() } ));
-	
-	Text         text3        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text3.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT3", new String[]{ server_.getName() } ));
-	
-	Text         text4        = uiUtils.createText( group, null, null, null, SWT.READ_ONLY );
-	text4.setText( msgUtils_.getMessage( "LABEL_START_SERVER_TEXT4", new String[]{ server_.getName() } )); 
-	
-	buttonGroup_ = uiUtils.createComposite( group, 2,-1, 0 );
-	serverStateText_ = uiUtils.createText( buttonGroup_, null, null, null, SWT.READ_ONLY );
-	serverStateText_.setLayoutData( new GridData() );
-		
-	button_ = uiUtils.createPushButton( buttonGroup_, 
-	                                    "LABEL_START_SERVER_BUTTON",
-			                            "TOOLTIP_START_SERVER_BUTTON",
-			                            INFOPOP_SSWP_SERVER_BUTTON );
-	
-	button_.addSelectionListener( new SelectionAdapter()
-			                      {
-									 public void widgetSelected( SelectionEvent evt )
-		                             {
-			                       	   serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STARTING" ) );
-			                    	   progressMonitor_.beginTask( getStateMessage( "TEXT_SERVER_MSG", "TEXT_SERVER_STARTING" ), IProgressMonitor.UNKNOWN );
-			                    	   button_.setEnabled( false );
-			                    	   buttonGroup_.pack();
-		                               startServerJob();
-		                             }	                          
-			                      } );	
-	
-	progressMonitor_ = new ProgressMonitorPart( group, new GridLayout() );
-	progressMonitor_.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-	
-	setServerState();
-	return this;
-  }
-
-  public IStatus getStatus() 
-  {
-	return status_;
-  }
-  
-  private void setServerState()
-  {
-	int state = server_.getServerState();
-	
-	switch( state )
-	{
-	  case IServer.STATE_STARTED:
-	  {
-		status_ = Status.OK_STATUS;
-		button_.setEnabled( false );
-		serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STARTED" ) );
-		
-	    break;	  
-	  }
-	  
-	  case IServer.STATE_STARTING:
-	  {
-		status_ = StatusUtils.errorStatus( "" );
-		button_.setEnabled( false );  
-		serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STARTING" ) );
-		progressMonitor_.beginTask( getStateMessage( "TEXT_SERVER_MSG", "TEXT_SERVER_STARTING" ), IProgressMonitor.UNKNOWN );
-		
-		// The server is still starting so we need to reconnect to the job
-		// that is starting it.
-		startServerJob();
-	    break;	  
-	  }
-	  
-	  default:
-	  {
-		status_ = StatusUtils.errorStatus( "" );
-        button_.setEnabled( true );
-		serverStateText_.setText( getStateMessage( "TEXT_SERVER_STATUS", "TEXT_SERVER_STOPPED" ) );
-		break;  
-	  }
-	};
-	
-	statusListener_.handleEvent( null );
-	buttonGroup_.pack();
-  }  
-  
-  private String getStateMessage( String mainKey, String subKey )
-  {
-	return msgUtils_.getMessage( mainKey, new String[]{ msgUtils_.getMessage( subKey ) } );
-  }
-  
-  // Connect to an existing server thread otherwise start a new one.
-  private void startServerJob()
-  {
-	IJobManager    jobManager     = Platform.getJobManager();
-	Job[]          jobs           = jobManager.find( StartServerFamily );
-	StartServerJob startServerJob = null;
-	
-	// There may be more than one job starting for different servers.
-	// Therefore, we need to find the one for our server if it is available.
-	for( int index = 0; index < jobs.length; index++ )
-	{
-	  StartServerJob jobFound = (StartServerJob)jobs[index];
-	  
-	  if( jobFound.getServer() == server_ )
-	  {
-	    startServerJob = jobFound;
-	    break;
-	  }
-	}
-	
-	if( startServerJob != null )
-	{
-	  synchronized( StartServerFamily ) 
-	  {
-        IStatus status = startServerJob.getStatus();
-        
-        // We are using status to determine if the job has completed or not.
-        // Normally, we would not get here if the job had already completed,
-        // but there is a slim window where the job manager gives us the job
-        // and then it immediately completes.
-        if( status == null )
-        {        
-          // The job had not completed yet so we will add a job change listener.
-          // We are adding the job listener here so that we don't have to assume
-          // that this instance of this widget is the same as the previous instance.
-          // If startServerJob already has "jobChangeAdapter_" added to it this
-          // method call will not have an effect.(Which is what we want.)
-          startServerJob.addJobChangeListener( jobChangeAdapter_ ); 
-          
-          // Note: this job was reporting progress to different progressMonitor_
-          //       control.  We need to tell the job that it should report progress
-          //       to our new progressMonitor_ control on this wizard page.
-          ProgressMonitorWrapper monitor = (ProgressMonitorWrapper)startServerJob.getMonitor();
-          monitor.setMonitor( progressMonitor_ );
-        }
-        else
-        {
-          // The job completed before we had a chance to add the job change listener
-          // Therefore, we will just call jobChangeAdapter_ directly to notify
-          // the UI that the job has completed.
-          jobChangeAdapter_.done( null );
-        }
-	  }
-	}
-	else
-	{
-	  startServerJob = new StartServerJob();	
-	  startServerJob.addJobChangeListener( jobChangeAdapter_ );
-	  startServerJob.schedule();
-	}
-  }
-     
-  private void reportErrorIfRequired( StartServerJob serverJob )
-  {
-	  IStatus status = serverJob.getStatus();
-	
-	  if( status.getSeverity() == Status.ERROR )
-	  {
-	    Shell                shell   = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-      EclipseStatusHandler handler = new EclipseStatusHandler( shell );
-      
-      handler.reportError( status );
-	  }
-  }
-  
-  final private static String  StartServerFamily = "StartServerFamily";
-  
-  // This class is used to start up the server in an Eclipse job.
-  private class StartServerJob extends Job
-  {
-	  private IStatus                status_ = null;
-	  private ProgressMonitorWrapper envMonitor_;
-	
-	  public StartServerJob()
-	  {
-	    super( "StartServerJob" );
-	  
-	    envMonitor_ = new ProgressMonitorWrapper( progressMonitor_ );
-	  }
-	
-	  public IServer getServer()
-	  {
-	    return server_;	
-	  }
-	
-	  public ProgressMonitorWrapper getMonitor()
-	  {
-	    return envMonitor_;	
-	  }
-	
-	  public boolean belongsTo(Object family) 
-	  {
-	    return family == StartServerFamily;
-	  }
-
-	  protected IStatus run(IProgressMonitor monitor) 
-	  {
-	    NullStatusHandler        handler         = new NullStatusHandler();
-	    TransientResourceContext resourceContext = new TransientResourceContext();
-	    EclipseEnvironment       environment     = new EclipseEnvironment( null,resourceContext, handler );
-	    StartServerCommand       serverCommand   = new StartServerCommand( false, false );
-	    
-	    serverCommand.setServerInstanceId( server_.getId() );
-      serverCommand.setEnvironment( environment );
-	    
-	    try
-	    {
-	      setStatus( serverCommand.execute( envMonitor_, null ) );		
-	    }
-	    catch( Throwable exc )
-	    {
-		    exc.printStackTrace();
-	      setStatus( StatusUtils.errorStatus( exc ) );
-	    }
-	  	
-	    return Status.OK_STATUS;
-	  }
-	
-	  // Calls to this method need to first synchronize on the
-	  // StartServerFamily object.
-	  public IStatus getStatus()
-	  {
-	    return status_;
-	  }
-	
-	  private void setStatus( IStatus status )
-	  {
-	    synchronized( StartServerFamily ) 
-	    {
-        status_ = status;
-	    }
-	  }
-  }
-    
-  private class ProgressMonitorWrapper implements IProgressMonitor
-  {
-    private IProgressMonitor monitor_ = new NullProgressMonitor();
-  	  	
-    public ProgressMonitorWrapper( IProgressMonitor monitor )
-    {
-      monitor_ = monitor;  
-    }
-    
-    public void setMonitor( IProgressMonitor monitor )
-    {
-      monitor_ = monitor;	
-    }
-    
-    public void beginTask(final String name, final int totalWork) 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-      		                          {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-                                      	    monitor_.beginTask( name, totalWork );
-                                          }
-                                        }
-      		                          } );
-    }
-
-    public void done() 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-              	                            monitor_.done();
-                                          }
-                                        }
-                                      } );
-    }
-
-    public void internalWorked(final double work) 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-              	                            monitor_.internalWorked( work );
-                                          }
-                                        }
-                                      } );
-    }
-
-    public boolean isCanceled() 
-    {
-      return progressMonitor_.isDisposed() ? false : monitor_.isCanceled();
-    }
-
-    public void setCanceled(boolean value) 
-    {
-      if( !progressMonitor_.isDisposed() )
-      {
-  	    monitor_.setCanceled( value );
-      }
-    }
-
-    public void setTaskName(final String name) 
-    {
-  	  Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-                  	                        monitor_.setTaskName( name );
-                                          }
-                                        }
-                                      } );
-    }
-
-    public void subTask( final String name) 
-    {
-  	  Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-                  	                        monitor_.subTask( name );
-                                          }
-                                        }
-                                      } );
-    }
-
-    public void worked(final int work) 
-    {
-      Display.getDefault().asyncExec( new Runnable()
-                                      {
-                                        public void run()
-                                        {
-                                          if( !progressMonitor_.isDisposed() )
-                                          {
-              	                            monitor_.worked( work );
-                                          }
-                                        }
-                                      } );
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
deleted file mode 100644
index 0514a0324..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.List;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-
-/**
- * AbstractHandlersWidgetDefaultingCmd
- *
- * Initialize and load the handlers data
- */
-public abstract class AbstractHandlersWidgetDefaultingCmd extends AbstractDataModelOperation 
-{
-  
-  private IStructuredSelection initialSelection_; 
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils( pluginId + ".plugin", this );    
-    IStatus status = Status.OK_STATUS;
-    
-    IStructuredSelection selection = initialSelection_;
-    if (selection == null) {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
-      env.getStatusHandler().reportError(status);
-      return status;         
-    }
-    
-    
-    return status;
-    
-  }
-  
-
-  public List getClientHandlers(){
-    return null;
-  }
-
-  public void setInitialSelection(IStructuredSelection initSelection){
-    this.initialSelection_ = initSelection;
-  }
-  
-  public IStructuredSelection getInitialSelection(){
-    return this.initialSelection_;
-  }
-  
-  protected IResource getResourceFromInitialSelection()
-  {
-    if (initialSelection_ != null && initialSelection_.size() == 1)
-    {
-      Object obj = initialSelection_.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          return resource;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }   
- 
-  public IProject getProject(){
-    
-    IResource resource = getResourceFromInitialSelection();
-	if (resource != null)
-	{
-	  return ResourceUtils.getProjectOf( resource.getFullPath() );
-	}
-	 
-	return null;
-  }
-  
-  public String getComponentName(){
-    IResource resource = getResourceFromInitialSelection();
-    if (resource!=null) {
-      IPath absolutePath = resource.getFullPath();
-      if (absolutePath.isAbsolute()) {
-        return absolutePath.segment(1);
-      }
-    }
-    return null;
-  }
-  
-//  public WebServiceEditModel getWebServiceEditModel() {
-//    WebServicesManager wsm = new WebServicesManager();
-//    IProject project = getProject();
-//    return wsm.getWSEditModel(project);    
-//  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
deleted file mode 100644
index cf0081546..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,266 +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
- *******************************************************************************/
-/*
- * Created on May 12, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-
-public class AddHandlerDialog extends Dialog implements Listener {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private MessageUtils msgUtils_;
-  private boolean validateOn_;
-  private boolean isClient_;
-  private String className;
-  private String name;
-  private String selectedPortName;
-  
-  private Text classNameText;
-  private Text nameText;
-  private Combo portNameCombo;
-  
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID AHDL0001 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_NAME  = "AHDL0001"; //$NON-NLS-1$
-  private final String TOOLTIP_TEXT_HANDLER_NAME = "TOOLTIP_TEXT_HANDLER_NAME";
-  
-  /* CONTEXT_ID AHDL0002 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_CLASS  = "AHDL0002"; //$NON-NLS-1$
-  private final String TOOLTIP_TEXT_HANDLER_CLASS = "TOOLTIP_TEXT_HANDLER_CLASS";
-  
-  /* CONTEXT_ID AHDL0001 for the Handler Config Page */
-  private final String INFOPOP_TEXT_HANDLER_PORT  = "AHDL0003"; //$NON-NLS-1$
-  private final String TOOLTIP_TEXT_HANDLER_PORT = "TOOLTIP_TEXT_HANDLER_PORT";
-    
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-  
-  public AddHandlerDialog( Shell shell, boolean isClientHandler)
-  {
-    super(shell);
-    isClient_ = isClientHandler;
-  }
-
-  protected Control createContents(Composite parent) {
-    Composite comp = (Composite) super.createContents(parent);
-    parent.getShell().pack();
-    return comp;
-  }
-
-  protected Control createDialogArea(Composite parent) {
-    validateOn_ = false;
-    msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-    
-    Shell thisShell = parent.getShell();
-    if (thisShell == null) {
-      thisShell = createShell();
-    }
-    thisShell.setText(msgUtils_.getMessage("DIALOG_TITLE_WS_ADD_HANDLER"));
-    
-    Composite composite = (Composite) super.createDialogArea(parent);    
-    
-    Composite sourceLocationComp = uiUtils.createComposite(composite, 3);
-    
-    classNameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_CLASS", TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER);
-    classNameText.addListener(SWT.Modify,this);
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-        {
-          public void widgetSelected( SelectionEvent evt )
-          {
-            handleBrowseClasses();  
-          }
-        } );
-    
-    nameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_NAME", TOOLTIP_TEXT_HANDLER_NAME, INFOPOP_TEXT_HANDLER_NAME, SWT.SINGLE | SWT.BORDER );
-    nameText.addListener(SWT.Modify, this);
-    
-    // dummy label for column 3.
-    new Label( sourceLocationComp, SWT.NONE );
-    
-    if (!isClient_){
-      portNameCombo = uiUtils.createCombo(sourceLocationComp, "LABEL_TEXT_HANDLER_PORT", TOOLTIP_TEXT_HANDLER_PORT, INFOPOP_TEXT_HANDLER_PORT, SWT.SINGLE | SWT.BORDER );
-      portNameCombo.addListener(SWT.Modify, this);
-      
-      // dummy label for column 3.
-      new Label( sourceLocationComp, SWT.NONE );
-    }
-    validateOn_ = true;
-   return composite;
-  }
-  
-  private void handleBrowseClasses()
-  {
-    Shell shell = getShell();
-    IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-    
-    if( itype != null )
-    {
-      classNameText.setText(itype.getFullyQualifiedName());      
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
-   */
-  public void handleEvent(Event event) {
-    if (!validateOn_)
-      return;
-    if (classNameText == event.widget) {
-      handleClassNameTextEvent();
-      validateTextFieldEntries();
-      return;
-    }
-    if (nameText == event.widget) {
-      handleNameTextEvent();
-      validateTextFieldEntries();      
-      return;
-    }
-    if (portNameCombo == event.widget) {
-      handlePortNameTextEvent();
-      validateTextFieldEntries();      
-      return;
-    }    
-  }
-
-  private void handleClassNameTextEvent(){
-    className = classNameText.getText();
-    if (className.lastIndexOf(".java") != -1){
-      nameText.setText(className.substring(0, className.lastIndexOf(".java")));
-    }
-    else {
-      nameText.setText(className);
-    }
-    
-    if (className.lastIndexOf(".") != -1){
-      nameText.setText(className.substring(className.lastIndexOf(".")+1, className.length()));
-    }
-    name = nameText.getText();
-  }
-  
-  private void handleNameTextEvent() {
-   name = nameText.getText(); 
-
-  }
-  
-  private void handlePortNameTextEvent(){
-    selectedPortName = portNameCombo.getText();
-  }
-  
-  private void disableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(false);
-  }
-
-  private void enableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(true);
-  }
-  
-  private void validateTextFieldEntries(){
-  	if (classNameText.getText().equals("")){
-  		disableOKButton();
-  		return;
-  	}
-  	if (nameText.getText().equals("")){
-  		disableOKButton();
-  		return;
-  	}
-  	if (!isClient_){
-  		if (portNameCombo.getText()!=null && portNameCombo.getText().equals("")){
-  			disableOKButton();
-  			return;
-  		}
-  		else if (portNameCombo.getText()==null) {
-  			disableOKButton();
-  			return;
-  		}
-  	}
-  	
-  	enableOKButton();
-  	
-	
-  }
-  
-  /**
-   * @return Returns the className.
-   */
-  public String getClassName() {
-    if (className.lastIndexOf(".java") != -1){
-      return className.substring(0, className.lastIndexOf(".java"));
-    }
-    else {
-      return className;
-    }
-  }
-  /**
-   * @param className The className to set.
-   */
-  public void setClassName(String className) {
-    this.className = className;
-  }
-  /**
-   * @return Returns the name.
-   */
-  public String getName() {
-    return name;
-  }
-  /**
-   * @param name The name to set.
-   */
-  public void setName(String name) {
-    this.name = name;
-  }
-  /**
-   * @return Returns the portName.
-   */
-  public String getPortName() {
-    return selectedPortName;
-  }
-  /**
-   * @param portName The portName to set.
-   */
-  public void setPortNames(String[] portNames) {
-    portNameCombo.setItems(portNames);
-    portNameCombo.select(0);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
deleted file mode 100644
index 8aa7f35f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
+++ /dev/null
@@ -1,108 +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.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ValidateWSDLJob;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-
-public class CheckWSDLValidationCommand extends AbstractDataModelOperation
-{	  
-	private static MessageUtils msgUtils_;
-	
-	public CheckWSDLValidationCommand () {
-		String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-	  msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	}
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    IJobManager    jobManager     = Platform.getJobManager();
-	  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
-	  ValidateWSDLJob existingValidateWSDLJob = null;
-	  
-	  if( jobs.length > 0 )
-	  {
-		  for (int i=0; i<jobs.length; i++) {
-			  existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-			  
-			  if (existingValidateWSDLJob.getState() != Job.NONE) { 
-				  if (ignoreWSDLValidation(env)) {
-					  // if don't want to wait for validation, cancel existing validation job
-					  existingValidateWSDLJob.cancel();
-					  return Status.OK_STATUS;
-				  } else {
-					  // wait for WSDL validation
-					  return StatusUtils.errorStatus( msgUtils_.getMessage("WAIT_FOR_WSDL") );
-				  }
-			  }
-		  }
-	  }
-	  
-      return Status.OK_STATUS;
-	  
-  }
-  
-  private boolean ignoreWSDLValidation(Environment env) {
-	  if (!WSPlugin.getInstance().getWaitForWSDLValidationContext().getPersistentWaitForWSDLValidation()) 
-		  return true; // do not want to wait for WSDL validation, i.e. Ignore all
-		  
-		// give a warning message with the options to stop, ignore this one, or
-		// ignore all coming messages
-		IStatus status_ = StatusUtils.warningStatus( msgUtils_.getMessage("STILL_VALIDATING_WSDL") );
-		// adding all messages from WSI Incompliances
-
-		Choice ignoreChoice = new Choice('I', msgUtils_
-				.getMessage("IGNORE_LABEL"), msgUtils_
-				.getMessage("IGNORE_DESCRIPTION"));
-		Choice ignoreAllChoice = new Choice('A', msgUtils_
-				.getMessage("IGNORE_ALL_LABEL"), msgUtils_
-				.getMessage("IGNORE_ALL_DESCRIPTION"));
-		Choice cancelChoice = new Choice('C', msgUtils_
-				.getMessage("CANCEL_LABEL"), msgUtils_
-				.getMessage("CANCEL_DESCRIPTION"));
-
-		Choice result = env.getStatusHandler().report(status_,
-				new Choice[] { ignoreChoice, ignoreAllChoice, cancelChoice });
-
-		// if the user closes the message box or selects ignore continue
-		if (result == null
-				|| (result.getLabel().equals(ignoreChoice.getLabel()))) {
-			return true;
-		// if the user selects ignore all, change the preference
-		} else if (result.getLabel().equals(ignoreAllChoice.getLabel())) {
-			// update ignore WSDL validation preference
-			WSPlugin.getInstance().getWaitForWSDLValidationContext().setWaitForWSDLValidation(false);
-			return true;
-		}
-		// if the user selects to cancel , do not continue with the command
-		else if (result.getLabel().equals(cancelChoice.getLabel())) {
-			return false;
-		}
-		return true;
-	}
-  
-
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index da2558ba3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,270 +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.consumption.ui.widgets;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-
-/**
- * ClientHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private HandlerTableItem[] handlers_;
-
-  private MessageUtils msgUtils_;
-
-  private Hashtable wsRefsToHandlersTable_;
-
-  private Hashtable refNameToServiceRefObj_;
-
-//  private WebServiceEditModel wsEditModel_;
-
-  private WebServicesManager webServicesManager_;
-
-  private IProject project_;
-  
-  private String componentName_;
-  
-  private WebServicesResource wsClientRes_;
-
-  private String serviceRefName_ = null;
-  
-  private Collection wsServiceRefs_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    IStatus status = Status.OK_STATUS;
-
-    webServicesManager_ = new WebServicesManager();
-
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    status = processHandlers();
-    return status;
-
-  }
-
-  public IStatus processHandlers() {
-    try {
-      Vector handlers = new Vector();
-      wsRefsToHandlersTable_ = new Hashtable();
-      refNameToServiceRefObj_ = new Hashtable();
-
-//      wsEditModel_ = getWebServiceEditModel();
-
-      wsServiceRefs_ = getWSServiceRefsFromSelection();
-
-      if (wsServiceRefs_ != null) {
-        Iterator wsRefsIter = wsServiceRefs_.iterator();
-        for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
-          ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
-          List wsHandlers = wsServiceRef.getHandlers();
-          HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];
-          for (int k = 0; k < wsHandlers.size(); k++) {
-
-            Handler wsHandler = (Handler) wsHandlers.get(k);
-
-            HandlerTableItem handlerItem = new HandlerTableItem();
-            handlerItem.setHandler(wsHandler);
-            handlerItem.setHandlerName(wsHandler.getHandlerName());
-            handlerItem.setHandlerClassName(wsHandler.getHandlerClass().getQualifiedName());
-            handlerItem.setWsDescRef(wsServiceRef);
-            handlerItems[k] = handlerItem;
-            handlers.add(handlerItem);
-          }
-          String wsServiceRefName = wsServiceRef.getServiceRefName();
-          wsRefsToHandlersTable_.put(wsServiceRefName, handlerItems);
-          refNameToServiceRefObj_.put(wsServiceRefName, wsServiceRef);
-
-        }
-
-        handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
-      }
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), e);
-    }
-    return Status.OK_STATUS;
-  }
-
-  public HandlerTableItem[] getAllHandlers() {
-    return this.handlers_;
-  }
-
-  public Hashtable getHandlers() {
-    return wsRefsToHandlersTable_;
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean getGenSkeletonEnabled() {
-    return true;
-  }
-
-  /**
-   * @return Returns the sourceOutputLocation_.
-   */
-  public IPath[] getSourceOutputLocation() {
-    IPath[] locations = null;
-    if (project_==null)
-     project_ = getProject();
-    if (project_ != null) {
-      locations = ResourceUtils.getAllJavaSourceLocations(project_);
-    }
-
-    return locations;
-  }
-
-  /**
-   * @return Returns the wsEditModel.
-   */
-//  public WebServiceEditModel getWsEditModel() {
-//    return wsEditModel_;
-//  }
-
-  public String getServiceRefName() {
-    return this.serviceRefName_;
-  }
-
-  public WebServicesResource getWsClientResource() {
-    return wsClientRes_;
-  }
-
-  public IProject getClientProject() {
-    return project_;
-  }
-
-  private Collection getWSServiceRefsFromSelection() {
-
-    IStructuredSelection initSel = getInitialSelection();
-    if (initSel != null && initSel.size() == 1) {
-      Object obj = initSel.getFirstElement();
-      ServiceRef serviceRef = null;
-      if (obj instanceof ServiceRef) {
-        // Client ServiceRef
-        serviceRef = (ServiceRef) obj;
-        serviceRefName_ = serviceRef.getServiceRefName();
-        project_ = ProjectUtilities.getProject(serviceRef);
-      }
-      else if (obj instanceof WebServiceNavigatorGroupType) {
-        WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-        serviceRef = wsngt.getServiceRef();
-        serviceRefName_ = serviceRef.getServiceRefName();
-        project_ = ProjectUtilities.getProject(serviceRef);
-      }
-
-      if (project_==null){
-        project_ = getProject();
-      }
-      if (project_==null){
-        return null;
-      }
-      
-      // get module name
-      componentName_ = getComponentName();
-      
-       
-      List clientWSResourceList = webServicesManager_.get13ServiceRefs(project_);
-      if (!clientWSResourceList.isEmpty())
-        wsClientRes_ = (WebServicesResource)clientWSResourceList.get(0);
-
-      if (J2EEUtils.isWebComponent(project_, componentName_)) {
-        WebArtifactEdit webEdit = null;
-        try {
-          IVirtualComponent vc = ComponentCore.createComponent(project_, componentName_);          
-          webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc);
-          if (webEdit != null)
-          {
-            WebApp webApp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-            if (webApp != null) {
-              return webServicesManager_.getServiceRefs(webApp);
-            }
-          }
-        }
-        finally{
-          if(webEdit!=null)
-            webEdit.dispose();
-        }
-      }
-      //TODO Remove old Nature refs
-//      else if (J2EEUtils.isAppClientComponent(project_, componentName_)){
-//        ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
-//        if (rt!=null) {
-//          ApplicationClient appClient = rt.getApplicationClient();
-//          if (appClient != null){
-//            return webServicesManager_.getServiceRefs(appClient);
-//          }
-//        }
-//      }
-//      else if (J2EEUtils.isEJBComponent(project_, componentName_)){
-//        EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
-//        if(rt!=null){
-//          EJBJar ejbJar = rt.getEJBJar();
-//          if (ejbJar !=null){
-//            return webServicesManager_.getServiceRefs(ejbJar);
-//          }
-//        }
-//      }
-
-    
-    }
-    return null;
-  }
-
-  public Hashtable getRefNameToServiceRef() {
-    return this.refNameToServiceRefObj_;
-  }
-  
-  public Collection getWsServiceRefs(){
-    return this.wsServiceRefs_;
-  }
-
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
deleted file mode 100644
index e13fdc27e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,226 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *  
- */
-public class ClientHandlersWidgetOutputCommand extends AbstractDataModelOperation 
-{
-
-  //private List handlerTableItems_;
-  private Hashtable oldWSServiceRefsToHandlersTable_;
-
-  private Hashtable newWSServiceRefsToHandlersTable_;
-
-//  private WebServiceEditModel wsEditModel_;
-
-  private Hashtable handlersTable_;
-
-  private IProject project_;
-
-  private Collection wsServiceRefs_;
-
-  private EditModel editModel_;
-
-  private Object accessorKey_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    IStatus status = Status.OK_STATUS;
-
-    try {
-
-      JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(project_);
-
-      oldWSServiceRefsToHandlersTable_ = new Hashtable();
-      newWSServiceRefsToHandlersTable_ = new Hashtable();
-
-      if (wsServiceRefs_ != null) {
-        Iterator wsRefsIter = wsServiceRefs_.iterator();
-        for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
-          ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
-          List wsHandlers = wsServiceRef.getHandlers();
-          oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers);
-          newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList());
-        }
-
-        Enumeration e = handlersTable_.keys();
-        while (e.hasMoreElements()) {
-
-          String serviceRefName = (String) e.nextElement();
-          List handlerTableItems_ = (List) handlersTable_.get(serviceRefName);
-          if (handlerTableItems_ != null) {
-            // form Handler tables
-            for (int i = 0; i < handlerTableItems_.size(); i++) {
-
-              HandlerTableItem hti = (HandlerTableItem) handlerTableItems_.get(i);
-              Object wsModelRef = hti.getWsDescRef();
-              if (wsModelRef != null && wsModelRef instanceof ServiceRef) {
-                ServiceRef wsRef = (ServiceRef) wsModelRef;
-
-                Object handler = hti.getHandler();
-                if (handler != null && handler instanceof Handler) {
-                  // clone it
-                  Handler clonedHandler = (Handler) EtoolsCopyUtility.createCopy((Handler) handler);
-                  ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(clonedHandler);
-                }
-                else {
-                  // create it
-                  Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
-                  Handler newHandler = wsClientFactory.createHandler();
-                  newHandler.setHandlerName(hti.getHandlerName());
-
-                  JavaClass javaClass = (JavaClass)JavaRefFactory.eINSTANCE.reflectType(hti.getHandlerClassName(), jMOF.getResourceSet());
-                  if (javaClass != null) {
-                    newHandler.setHandlerClass(javaClass);
-                  }
-
-                  ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler);
-                }
-
-              }
-
-            }
-          }
-        }
-
-        // add handlers to ports
-        addHandlersToServiceRefs();
-        getJ2EEEditModel();
-        
-        // save the resource
-        //TODO Remove old Nature refs
-//        if (J2EEUtils.getJ2EEVersion(project_) == J2EEVersionConstants.J2EE_1_4_ID) {
-//          editModel_.save(accessorKey_);
-//        }
-//        else {
-//          if (wsClientRes_!=null)
-//            wsClientRes_.save(new HashMap());
-//        }
-      }
-    }
-    catch (Exception e) 
-    {
-      return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), e);
-    }
-    finally {
-      if (editModel_ != null) 
-        editModel_.releaseAccess(accessorKey_);
-    }
-    return status;
-  }
-
-  private void addHandlersToServiceRefs() {
-    try {
-      Enumeration refsToHandlers = newWSServiceRefsToHandlersTable_.keys();
-      while (refsToHandlers.hasMoreElements()) {
-        ServiceRef serviceRef = (ServiceRef) refsToHandlers.nextElement();
-        if (serviceRef != null) {
-
-          List handlers = (List) newWSServiceRefsToHandlersTable_.get(serviceRef);
-          List modelHandlers = (List) oldWSServiceRefsToHandlersTable_.get(serviceRef);
-          modelHandlers.clear();
-          modelHandlers.addAll(handlers);
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * @param handlerTableItems
-   *          The handlerTableItems to set.
-   */
-  //  public void setAllHandlersList(List handlerTableItems) {
-  //    this.handlerTableItems_ = handlerTableItems;
-  //  }
-  public void setHandlersTable(Hashtable handlersTable) {
-    this.handlersTable_ = handlersTable;
-  }
-
-  /**
-   * @param wsEditModel
-   *          The wsEditModel to set.
-   */
-//  public void setWsEditModel(WebServiceEditModel wsEditModel) {
-//    this.wsEditModel_ = wsEditModel;
-//  }
-
-  public void setClientProject(IProject project) {
-    this.project_ = project;
-  }
-
-  public void setWsClientResource(WebServicesResource wsRes) {
-  }
-
-  public void setWsServiceRefs(Collection wsRefs) {
-    this.wsServiceRefs_ = wsRefs;
-  }
-
-  public void getJ2EEEditModel() {
-	//TODO Remove old Nature refs
-//  	accessorKey_ = new Object();
-//    if (ResourceUtils.isWebProject(project_)) {
-//      J2EEWebNatureRuntime rt = J2EEWebNatureRuntime.getRuntime(project_);
-//      if (rt != null) {
-//        editModel_ = rt.getWebAppEditModelForWrite(accessorKey_);
-//      }
-//    }
-//    else if (ResourceUtils.isAppClientProject(project_)){
-//      ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
-//      if (rt!=null) {
-//        editModel_ = rt.getAppClientEditModelForWrite(accessorKey_);
-//      }
-//    }
-//    else if (ResourceUtils.isEJBProject(project_)){
-//      EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
-//      if(rt!=null){
-//        editModel_ = rt.getEJBEditModelForWrite(accessorKey_);
-//      }
-//    }
-  }
-
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
deleted file mode 100644
index 82b37bf18..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,111 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor
-{  
-  private WebServiceClientTypeWidget clientWidget_;
-  private PreferencesSelectionWidget preferencesWidget_;
-  
-  /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/  
-  private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
-  private Button testService_;
-  
-  /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the project page*/
-  private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWRPR0014";
-  private Button monitorService;
-  
-  /*CONTEXT_ID PWPR0001 for the Project Page*/
-  private String INFOPOP_PWPR_PAGE = "PWPR0001";
-    
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    UIUtils      utils    = new UIUtils( msgUtils, pluginId );
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PWPR_PAGE );
-  	
-  	Composite clientComposite = utils.createComposite( parent, 1 );
-  	
-    clientWidget_ = new WebServiceClientTypeWidget();
-    clientWidget_.addControls(clientComposite, statusListener );
-    
-    
-    //  Create test service check box.
-    Composite testGroup = utils.createComposite(clientComposite,1);
-    
-    testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
-                                         "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
-                                         INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-    
-    // Create monitor service check box.
-    monitorService = utils.createCheckbox(testGroup, "CHECKBOX_MONITOR_WEBSERVICE", "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE", INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE);
-
-    // Create the preferences controls.
-    preferencesWidget_ = new PreferencesSelectionWidget();
-    preferencesWidget_.addControls( clientComposite, statusListener );
-    
-    return this;
-  }
-  
-  public void setResourceContext( ResourceContext context )
-  {
-    preferencesWidget_.setResourceContext( context );
-  }
-   
-  public ResourceContext getResourceContext()
-  {
-    return preferencesWidget_.getResourceContext(); 
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setTypeRuntimeServer( ids );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getTypeRuntimeServer();  
-  }
-  
-  public Boolean getTestService()
-  {
-    return new Boolean( testService_.getSelection() );
-  }
-  
-  public void setTestService( Boolean value )
-  {
-    testService_.setSelection( value.booleanValue() );  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(monitorService.getSelection());
-  }
-  
-  public void setMonitorService(Boolean value)
-  {
-    monitorService.setSelection(value.booleanValue());
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 06a01bd84..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidgetDefaultingCommand extends AbstractDataModelOperation
-{    
-  public Boolean getTestService()
-  {
-    return new Boolean( getScenarioContext().getTestWebService() );
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean( getScenarioContext().getMonitorWebService());
-  }
-
-  public ResourceContext getResourceContext()
-  { 
-    return WebServicePlugin.getInstance().getResourceContext();
-  }
-  
-  // Current ScenarioContext is used to default the first page of the wizard.  The 
-  // properties in ScenarioContext are mapped individual.  Therefore, ScenarioContext
-  // should not also be mapped.
-  protected ScenarioContext getScenarioContext()
-  {
-    return WebServicePlugin.getInstance().getScenarioContext();
-  }
-  
-  // TODO Set client name defaults here.  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    // rskreg
-		//WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
-    String                       type     = getScenarioContext().getClientWebServiceType();
-    //String                       runtime  = registry.getAllClientRuntimes()[0];
-		String                       runtime  = WebServiceRuntimeExtensionUtils.getAllClientRuntimes()[0];
-    //String                       server   = registry.getAllClientServerFactoryIds()[0];
-		String                       server   = WebServiceRuntimeExtensionUtils.getAllClientServerFactoryIds()[0];
-    TypeRuntimeServer            result   = new TypeRuntimeServer();
-		// rskreg
-    
-    result.setTypeId( type );
-    result.setRuntimeId( runtime );
-    result.setServerId( server ); 
-    
-    return result;  
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
deleted file mode 100644
index 203c4963f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidgetOutputCommand extends AbstractDataModelOperation
-{    
-  private boolean           testService_;
-  private boolean monitorService;
-  private ResourceContext   resourceContext_;
-  private TypeRuntimeServer clientIds_;
-  
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-
-  public void setTestService( boolean testService )
-  {
-    testService_ = testService;  
-  }
-  
-  public boolean getMonitorService()
-  {
-    return monitorService;
-  }
-  
-  public void setMonitorService(boolean monitorService)
-  {
-    this.monitorService = monitorService;
-  }
-  
-  public ResourceContext getResourceContext()
-  {
-    
-    return resourceContext_;
-  }
-  
-  public void setResourceContext( ResourceContext context )
-  {
-    resourceContext_ = context;  
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {    
-    return clientIds_;  
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer clientIds )
-  {
-    clientIds_ = clientIds;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
deleted file mode 100644
index 2dae0b23d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,585 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/**
- * ConfigClientHandlersTreeWidget
- *  
- */
-public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private MessageUtils msgUtils_ = null;
-  private Composite parent_;
-  private boolean isGenSkeletonEnabled_;
-  private String outputLocation_;
-  private Combo webServiceRefCombo_;
-  private Table handlersTable_;
-  private TableViewer tableViewer_;
-  private Button addButton_;
-  private Button removeButton_;
-  private Button genSkeletonRadioButton_;
-  private Combo sourceLocationCombo_;
-
-  private Hashtable pathsTable_ = new Hashtable();
-  private Hashtable wsRefsToHandlers_;
-  private Hashtable refNameToServiceRef_;
-  private Vector orderedHandlers_;
-  //private ServiceRef serviceRef_;
-  private String serviceRefName_;
-  private int DEFAULT_COLUMN_WIDTH = 150;
-
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID HDLR0001 for the Handler Config Page */
-  private final String INFOPOP_HDLR_WS_HANDLERS = "HDLR0001"; //$NON-NLS-1$
-  private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
-  /* CONTEXT_ID HDLR0002 for the Handler Config Page */
-  private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$
-  private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
-  /* CONTEXT_ID HDLR0003 for the Handler Config Page */
-  private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$
-  private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
-  /* CONTEXT_ID HDLR0004 for the Handler Config Page */
-  private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$
-  private final String TOOLTIP_WS_CLIENT_REF = "TOOLTIP_WS_CLIENT_REF";
-
-  // ------------------------
-
-  public ConfigClientHandlersTableWidget() {
-    super();
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
-    parent_ = parent;
-
-    // Web service reference combo
-    Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
-    webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_CLIENT_REF", TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF,
-        SWT.READ_ONLY);
-    webServiceRefCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleWebServiceRefCombo(evt);
-      }
-    });
-
-    Composite displayComp = new Composite(parent_, SWT.NONE);
-    GridLayout gridlayout = new GridLayout(2, false);
-    displayComp.setLayout(gridlayout);
-    displayComp.setLayoutData(uiUtils.createFillAll());
-
-    Composite handlersComp = uiUtils.createComposite(displayComp, 1);
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
-        | GridData.VERTICAL_ALIGN_FILL);
-    handlersComp.setLayoutData(griddata);
-    handlersComp.setSize(130, 600);
-
-    Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    buttonsComp.setLayoutData(griddata);
-
-    Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
-    handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    handlersText.setLayoutData(gd);
-
-    handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
-    handlersTable_.setHeaderVisible(true);
-    handlersTable_.setLinesVisible(true);
-
-    // empty space
-    Label wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveUpButton.setLayoutData(griddata);
-    moveUpButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveUpButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveDownButton.setLayoutData(griddata);
-    moveDownButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveDownButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    // empty space
-    wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    addButton_.setLayoutData(griddata);
-    addButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleAddButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    removeButton_.setLayoutData(griddata);
-    removeButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleRemoveButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-    enableRemove(false);
-
-    // table stuff
-    String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS")};
-
-    for (int i = 0; i < columns_.length; i++) {
-      TableColumn tableColumn = new TableColumn(handlersTable_, i);
-      tableColumn.setText(columns_[i]);
-      tableColumn.setAlignment(SWT.LEFT);
-      tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
-      tableColumn.setResizable(true);
-    }
-
-    tableViewer_ = new TableViewer(handlersTable_);
-    Control control = tableViewer_.getControl();
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessVerticalSpace = true;
-    control.setLayoutData(data);
-
-    tableViewer_.setColumnProperties(columns_);
-    tableViewer_.setContentProvider(new ListContentProvider());
-    tableViewer_.setLabelProvider(new ListLabelProvider());
-    tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
-      public void selectionChanged(SelectionChangedEvent event) {
-        enableRemove(true);
-      }
-    });
-
-    // gen skeleton check box
-    genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
-    genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleGenSkeletonRadioButton();
-      }
-    });
-
-    // source location combo
-    Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
-    sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
-        SWT.READ_ONLY);
-    sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleSourceLocationCombo(evt);
-      }
-    });
-
-    return this;
-  }
-
-  // Called at start
-  private void populateHandlersTable() {
-    try {
-
-      int sizeOfHandlers = wsRefsToHandlers_.size();
-
-      String[] wsRefNames = (String[]) wsRefsToHandlers_.keySet().toArray(new String[0]);
-      webServiceRefCombo_.setItems(wsRefNames);
-      webServiceRefCombo_.select(0);
-
-      if (sizeOfHandlers < 1) {
-        webServiceRefCombo_.select(0);
-        webServiceRefCombo_.setEnabled(false);
-      }
-      else {
-        if (serviceRefName_ != null) {
-          int index = webServiceRefCombo_.indexOf(serviceRefName_);
-          if (index != -1) webServiceRefCombo_.select(index);
-        }
-        else
-          webServiceRefCombo_.select(0);
-      }
-
-      // get webServiceRef hint
-      String wsRef = webServiceRefCombo_.getText();
-
-      if (wsRefsToHandlers_.get(wsRef) != null) {
-        orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRef);
-        tableViewer_.setInput(orderedHandlers_);
-        tableViewer_.refresh();
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  /**
-   * @return Returns the handlers.
-   */
-  public List getAllHandlersList() {
-    // convert to a ArrayList and return as List
-    List list = new ArrayList();
-    if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
-    return list;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() {
-    IStatus finalStatus = Status.OK_STATUS;
-
-    return finalStatus;
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event) {
-
-    AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), true);
-    dialog.create();
-    dialog.getShell().setSize( 500, 200 );
-    
-    int result = dialog.open();
-
-    if (result == Window.OK) {
-      String name = dialog.getName();
-      String className = dialog.getClassName();
-
-      HandlerTableItem hi = new HandlerTableItem();
-      hi.setHandlerName(name);
-      hi.setHandlerClassName(className);
-      String wsRefName = webServiceRefCombo_.getText();
-      ServiceRef serviceRef = (ServiceRef) refNameToServiceRef_.get(wsRefName);
-      hi.setWsDescRef(serviceRef);
-
-      orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
-      orderedHandlers_.add(hi);
-
-    }
-
-    refresh();
-  }
-
-  private void handleRemoveButtonSelected(SelectionEvent event) {
-    handleDeleteKeyPressed();
-  }
-
-  private void handleMoveUpButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (index > 0) {
-        orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index - 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  private void handleMoveDownButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (index < orderedHandlers_.size() - 1) {
-        orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());        
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index + 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  public void handleSourceLocationCombo(SelectionEvent event) {
-    outputLocation_ = sourceLocationCombo_.getText();
-  }
-
-  public void handleGenSkeletonRadioButton() {
-    if (genSkeletonRadioButton_.isEnabled()) {
-      if (genSkeletonRadioButton_.getSelection())
-        this.isGenSkeletonEnabled_ = true;
-      else
-        this.isGenSkeletonEnabled_ = false;
-    }
-  }
-
-  public void handleWebServiceRefCombo(SelectionEvent event) {
-
-    if (webServiceRefCombo_.isEnabled()) {
-      String webServiceRefName = webServiceRefCombo_.getText();
-      Vector hndlers = (Vector) wsRefsToHandlers_.get(webServiceRefName);
-      //HandlerTableItem item = (HandlerTableItem)hndlers.get(0);
-      //serviceRef_ = (ServiceRef)item.getWsDescRef();
-      if (hndlers != null) {
-        tableViewer_.setInput(hndlers);
-        tableViewer_.refresh();
-      }
-    }
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean isGenSkeletonEnabled_() {
-    return isGenSkeletonEnabled_;
-  }
-
-  protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-    public Image getColumnImage(Object element, int columnIndex) {
-      return null;
-    }
-
-    public String getColumnText(Object object, int columnIndex) {
-
-      if (object instanceof HandlerTableItem) {
-        HandlerTableItem hti = (HandlerTableItem) object;
-        if (columnIndex == 0) {
-
-          return hti.getHandlerName() != null ? hti.getHandlerName() : "";
-        }
-        else if (columnIndex == 1) { return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; }
-      }
-      return null;
-    }
-
-  }
-
-  private void enableRemove(boolean enabled) {
-    removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider {
-
-    public Object[] getElements(Object element) {
-      if (element instanceof Vector) { return ((Vector) element).toArray(); }
-      return null;
-    }
-
-    public void dispose() {
-    }
-
-    public void inputChanged(Viewer viewer, Object old, Object newobj) {
-    }
-
-    public boolean isDeleted(Object object) {
-      return false;
-    }
-  }
-
-  private void handleDeleteKeyPressed() {
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-      int selectionIndex = handlersTable_.getSelectionIndex();
-
-      orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
-      orderedHandlers_.remove(selectionIndex);
-      refresh();
-    }
-  }
-
-  public void refresh() {
-    try {
-      tableViewer_.setInput(null);
-      if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
-      tableViewer_.refresh();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
-    this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
-    genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
-  }
-
-  public boolean getGenSkeletonEnabled() {
-    return this.isGenSkeletonEnabled_;
-  }
-
-  public void setSourceOutputLocation(IPath[] locations) {
-    if (locations[0]!=null)
-      this.outputLocation_ = locations[0].toString();
-    else
-      return;
-    
-    String[] paths = new String[locations.length];
-    for (int i = 0; i < locations.length; i++) {
-      paths[i] = locations[i].toString();
-      pathsTable_.put(paths[i], locations[i]);
-    }
-    sourceLocationCombo_.setItems(paths);
-    sourceLocationCombo_.select(0);
-
-  }
-
-  public IPath getSourceOutputLocation() {
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    return outputPath;
-  }
-
-  /**
-   * @return Returns the handlerClassNames.
-   */
-  public String[] getHandlerClassNames() {
-    Vector handlerClasses = new Vector();
-
-    Enumeration e = wsRefsToHandlers_.keys();
-    while (e.hasMoreElements()) {
-
-      String wsRefName = (String) e.nextElement();
-      orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
-
-      if (orderedHandlers_ != null) {
-        for (int i = 0; i < orderedHandlers_.size(); i++) {
-          HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
-          handlerClasses.add(hti.getHandlerClassName());
-        }
-      }
-    }
-    return (String[])handlerClasses.toArray(new String[0]);
-  }
-
-  /**
-   * @return Returns the wsRefsToHandlers_.
-   */
-  public Hashtable getWsRefsToHandlers() {
-    return wsRefsToHandlers_;
-  }
-
-  /**
-   * @param wsRefsToHandlers_
-   *          The wsRefsToHandlers_ to set.
-   */
-  public void setWsRefsToHandlers(Hashtable wsRefsToHandlersArray) {
-
-    wsRefsToHandlers_ = new Hashtable();
-    try {
-
-      if (wsRefsToHandlersArray != null) {
-        // store the wsRefs
-        Enumeration wsRef = wsRefsToHandlersArray.keys();
-        while (wsRef.hasMoreElements()) {
-          String wsRefName = (String) wsRef.nextElement();
-
-          HandlerTableItem[] handlers = (HandlerTableItem[]) wsRefsToHandlersArray.get(wsRefName);
-          // process the handlersTable
-          orderedHandlers_ = new Vector();
-          for (int i = 0; i < handlers.length; i++) {
-            orderedHandlers_.add(handlers[i]);
-          }
-          wsRefsToHandlers_.put(wsRefName, orderedHandlers_);
-
-        }
-      }
-      populateHandlersTable();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  public void setServiceRefName(String wsRefName) {
-    serviceRefName_ = wsRefName;
-  }
-
-  public void setRefNameToServiceRef(Hashtable refName2SF) {
-    this.refNameToServiceRef_ = refName2SF;
-  }
-
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
deleted file mode 100644
index d51b3a4b1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,620 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/**
- * ConfigServiceHandlersTreeWidget
- *  
- */
-public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor {
-
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private MessageUtils msgUtils_ = null;
-  private Composite parent_;
-  private boolean isGenSkeletonEnabled_;
-  private String outputLocation_;
-
-  private Table handlersTable_;
-  private TableViewer tableViewer_;
-  private Combo webServiceDescCombo_;
-  private Button addButton_;
-  private Button removeButton_;
-  private Button genSkeletonRadioButton_;
-  private Combo sourceLocationCombo_;
-  private Hashtable pathsTable_ = new Hashtable();
-  private Hashtable wsDescToHandlers_;
-  private Hashtable wsDescToPorts_;
-  private Hashtable serviceDescNameToDescObj_;
-  private String descriptionName_ = null;
-
-  private Vector orderedHandlers_;
-
-  private int DEFAULT_COLUMN_WIDTH = 90;
-
-  // ----TOOLTIPS Section----
-  /* CONTEXT_ID SHLD0001 for the Handler Config Page */
-  private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$
-  private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
-  /* CONTEXT_ID SHDL0002 for the Handler Config Page */
-  private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$
-  private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
-  /* CONTEXT_ID SHDL0003 for the Handler Config Page */
-  private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$
-  private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
-  /* CONTEXT_ID SHDL0004 for the Handler Config Page */
-  private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$
-  private final String TOOLTIP_WS_SERVICE_DESC = "TOOLTIP_WS_SERVICE_DESC";
-
-  // ------------------------
-
-  public ConfigServiceHandlersTableWidget() {
-    super();
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
-    parent_ = parent;
-
-    // Web service reference combo
-    Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
-    webServiceDescCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_SERVICE_DESC", TOOLTIP_WS_SERVICE_DESC, INFOPOP_WS_SERVICE_DESC,
-        SWT.READ_ONLY);
-    webServiceDescCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleWebServiceDescCombo(evt);
-      }
-    });
-
-    Composite displayComp = new Composite(parent, SWT.NONE);
-
-    GridLayout gridlayout = new GridLayout(2, false);
-    displayComp.setLayout(gridlayout);
-    displayComp.setLayoutData(uiUtils.createFillAll());
-
-    Composite handlersComp = uiUtils.createComposite(displayComp, 1);
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
-        | GridData.VERTICAL_ALIGN_FILL);
-    handlersComp.setLayoutData(griddata);
-    handlersComp.setSize(130, 600);
-
-    Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    buttonsComp.setLayoutData(griddata);
-
-    Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
-    handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    handlersText.setLayoutData(gd);
-
-    handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
-    handlersTable_.setHeaderVisible(true);
-    handlersTable_.setLinesVisible(true);
-
-    // empty space
-    Label wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveUpButton.setLayoutData(griddata);
-    moveUpButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveUpButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    moveDownButton.setLayoutData(griddata);
-    moveDownButton.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleMoveDownButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    // empty space
-    wsLabel = new Label(buttonsComp, SWT.NONE);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-
-    addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    addButton_.setLayoutData(griddata);
-    addButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleAddButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-
-    removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
-    griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
-    removeButton_.setLayoutData(griddata);
-    removeButton_.addSelectionListener(new SelectionListener() {
-
-      public void widgetSelected(SelectionEvent event) {
-        handleRemoveButtonSelected(event);
-      }
-
-      public void widgetDefaultSelected(SelectionEvent event) {
-      }
-    });
-    enableRemove(false);
-
-    // table stuff here
-    String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS"),
-        msgUtils_.getMessage("LABEL_HANDLER_PORT")};
-
-    for (int i = 0; i < columns_.length; i++) {
-      TableColumn tableColumn = new TableColumn(handlersTable_, i);
-      tableColumn.setText(columns_[i]);
-      tableColumn.setAlignment(SWT.LEFT);
-      tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
-      tableColumn.setResizable(true);
-    }
-
-    tableViewer_ = new TableViewer(handlersTable_);
-    Control control = tableViewer_.getControl();
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessVerticalSpace = true;
-    control.setLayoutData(data);
-
-    tableViewer_.setColumnProperties(columns_);
-    tableViewer_.setContentProvider(new ListContentProvider());
-    tableViewer_.setLabelProvider(new ListLabelProvider());
-    tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
-      public void selectionChanged(SelectionChangedEvent event) {
-        enableRemove(true);
-      }
-    });
-
-    genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
-    genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleGenSkeletonRadioButton();
-      }
-    });
-
-    Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
-    sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
-        SWT.READ_ONLY);
-    sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
-      public void widgetSelected(SelectionEvent evt) {
-        handleSourceLocationCombo(evt);
-      }
-    });
-
-    return this;
-  }
-
-  // Called at start
-  private void populateHandlersTable() {
-    try {
-
-      int sizeOfHandlers = wsDescToHandlers_.size();
-
-      String[] wsRefNames = (String[]) wsDescToHandlers_.keySet().toArray(new String[0]);
-      webServiceDescCombo_.setItems(wsRefNames);
-
-      if (sizeOfHandlers < 1) {
-        webServiceDescCombo_.select(0);
-        webServiceDescCombo_.setEnabled(false);
-      }
-      else {
-        if (descriptionName_ != null) {
-          int index = webServiceDescCombo_.indexOf(descriptionName_);
-          if (index != -1) webServiceDescCombo_.select(index);
-        }
-        else
-          webServiceDescCombo_.select(0);
-      }
-      // get webServiceRef hint
-      String wsRef = webServiceDescCombo_.getText();
-
-      if (wsDescToHandlers_.get(wsRef) != null) {
-        orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsRef);
-        tableViewer_.setInput(orderedHandlers_);
-        tableViewer_.refresh();
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  /**
-   * @return Returns the handlers.
-   */
-  public List getHandlersList() {
-    // convert to a ArrayList and return as List
-    List list = new ArrayList();
-    if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
-    return list;
-  }
-
-  public Hashtable getWsDescToHandlers() {
-    return this.wsDescToHandlers_;
-  }
-
-  /**
-   * @param handlers
-   *          The handlers to set.
-   */
-  public void setHandlers(HandlerTableItem[] handlers) {
-    populateHandlersTable();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() {
-    IStatus finalStatus = Status.OK_STATUS;
-
-    return finalStatus;
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event) {
-  	
-  	String descName = webServiceDescCombo_.getText();
-  	WebServiceDescription serviceDesc = (WebServiceDescription) serviceDescNameToDescObj_.get(descName);
-  	
-    AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), false);
-    dialog.create();
-    
-    String[] portNames = getPortComponentNames(serviceDesc);
-    dialog.setPortNames(portNames);
-    dialog.getShell().setSize( 500, 200 );
-    
-    int result = dialog.open();
-
-    if (result == Window.OK) {
-      String name = dialog.getName();
-      String className = dialog.getClassName();
-      String port = dialog.getPortName();
-
-      HandlerTableItem hi = new HandlerTableItem();
-      hi.setHandlerName(name);
-      hi.setHandlerClassName(className);
-      hi.setPortName(port);
-      
-      
-      hi.setWsDescRef(serviceDesc);
-
-      orderedHandlers_ = (Vector) wsDescToHandlers_.get(descName);
-      orderedHandlers_.add(hi);
-
-    }
-
-    refresh();
-  }
-
-  private String[] getPortComponentNames(WebServiceDescription webServiceDesc) {
-  	
-  	List ports = webServiceDesc.getPortComponents();
-  	if (ports!=null){
-  		String[] portNames = new String[ports.size()];
-  		for(int i=0;i<ports.size();i++){
-  			PortComponent pc = (PortComponent)ports.get(i);
-  			String pcName = pc.getPortComponentName();
-  			portNames[i] = pcName;
-  		}
-  		return portNames;
-  	}
-  	return new String[0];
-  }
-  
-  private void handleRemoveButtonSelected(SelectionEvent event) {
-    handleDeleteKeyPressed();
-  }
-
-  private void handleMoveUpButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (index > 0) {
-        orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index - 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  private void handleMoveDownButtonSelected(SelectionEvent event) {
-
-    int index = tableViewer_.getTable().getSelectionIndex();
-    if (index != -1) {
-      if (index < orderedHandlers_.size() - 1) {
-        orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
-        Object object = orderedHandlers_.remove(index);
-        orderedHandlers_.insertElementAt(object, index + 1);
-        tableViewer_.refresh();
-      }
-    }
-
-  }
-
-  public void handleSourceLocationCombo(SelectionEvent event) {
-    outputLocation_ = sourceLocationCombo_.getText();
-  }
-
-  public void handleGenSkeletonRadioButton() {
-    if (genSkeletonRadioButton_.isEnabled()) {
-      if (genSkeletonRadioButton_.getSelection())
-        this.isGenSkeletonEnabled_ = true;
-      else
-        this.isGenSkeletonEnabled_ = false;
-    }
-  }
-
-  public void handleWebServiceDescCombo(SelectionEvent event) {
-
-    if (webServiceDescCombo_.isEnabled()) {
-      String webServiceRefName = webServiceDescCombo_.getText();
-      Vector hndlers = (Vector) wsDescToHandlers_.get(webServiceRefName);
-      if (hndlers != null) {
-        tableViewer_.setInput(hndlers);
-        tableViewer_.refresh();
-      }
-    }
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean isGenSkeletonEnabled_() {
-    return isGenSkeletonEnabled_;
-  }
-
-  protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-    public Image getColumnImage(Object element, int columnIndex) {
-      return null;
-    }
-
-    public String getColumnText(Object object, int columnIndex) {
-
-      if (object instanceof HandlerTableItem) {
-        HandlerTableItem hti = (HandlerTableItem) object;
-        if (columnIndex == 0) {
-          return hti.getHandlerName() != null ? hti.getHandlerName() : "";
-        }
-        else if (columnIndex == 1) {
-          return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : "";
-        }
-        else {
-          return hti.getPortName() != null ? hti.getPortName() : "";
-        }
-      }
-      return null;
-    }
-
-  }
-
-  private void enableRemove(boolean enabled) {
-    removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider {
-
-    public Object[] getElements(Object element) {
-      if (element instanceof Vector) { return ((Vector) element).toArray(); }
-      return null;
-    }
-
-    public void dispose() {
-    }
-
-    public void inputChanged(Viewer viewer, Object old, Object newobj) {
-    }
-
-    public boolean isDeleted(Object object) {
-      return false;
-    }
-  }
-
-  private void handleDeleteKeyPressed() {
-    //internalDispose();
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
-      int selectionIndex = handlersTable_.getSelectionIndex();
-
-      orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
-      orderedHandlers_.remove(selectionIndex);
-      refresh();
-    }
-  }
-
-  public void refresh() {
-    try {
-      tableViewer_.setInput(null);
-      if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
-      tableViewer_.refresh();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
-    this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
-    genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
-  }
-
-  public boolean getGenSkeletonEnabled() {
-    return this.isGenSkeletonEnabled_;
-  }
-
-  public void setSourceOutputLocation(IPath[] locations) {
-    this.outputLocation_ = locations[0].toString();
-
-    String[] paths = new String[locations.length];
-    for (int i = 0; i < locations.length; i++) {
-      paths[i] = locations[i].toString();
-      pathsTable_.put(paths[i], locations[i]);
-    }
-    sourceLocationCombo_.setItems(paths);
-    sourceLocationCombo_.select(0);
-
-  }
-
-  public IPath getSourceOutputLocation() {
-    IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
-    return outputPath;
-  }
-
-  /**
-   * @return Returns the handlerClassNames.
-   */
-  public String[] getHandlerClassNames() {
-    
-    Vector handlerClasses = new Vector();
-    Enumeration e = wsDescToHandlers_.keys();
-    while (e.hasMoreElements()) {
-      
-      String wsDescName = (String)e.nextElement();
-      orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsDescName);
-      
-      if (orderedHandlers_ != null) {
-        
-        for (int i = 0; i < orderedHandlers_.size(); i++) {
-          HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
-          handlerClasses.add(hti.getHandlerClassName());
-        }
-      }
-    }
-    return (String[])handlerClasses.toArray(new String[0]);
-  }
-
-  /**
-   * @param wsDescToHandlersArray_
-   *          The wsDescToHandlersArray_ to set.
-   */
-  public void setWsRefsToHandlers(Hashtable wsDescToHandlersArray) {
-
-    wsDescToHandlers_ = new Hashtable();
-    wsDescToPorts_ = new Hashtable();
-    try {
-
-      if (wsDescToHandlersArray != null) {
-        // store the wsRefs
-        Enumeration wsDesc = wsDescToHandlersArray.keys();
-        while (wsDesc.hasMoreElements()) {
-          String wsDescName = (String) wsDesc.nextElement();
-
-          HandlerTableItem[] handlers = (HandlerTableItem[]) wsDescToHandlersArray.get(wsDescName);
-          // process the handlersTable
-          orderedHandlers_ = new Vector();
-          HashSet portNameVector = new HashSet();
-
-          for (int i = 0; i < handlers.length; i++) {
-            orderedHandlers_.add(handlers[i]);
-            String portName = handlers[i].getPortName();
-            portNameVector.add(new String(portName));
-          }
-          wsDescToHandlers_.put(wsDescName, orderedHandlers_);
-          wsDescToPorts_.put(wsDescName, (String[]) portNameVector.toArray(new String[0]));
-        }
-      }
-      populateHandlersTable();
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-
-  }
-
-  public void setDescriptionName(String wsDescName) {
-    descriptionName_ = wsDescName;
-  }
-
-  public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
-    this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
deleted file mode 100644
index dc8d31992..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
+++ /dev/null
@@ -1,80 +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.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-
-/**
- * HandlersDefaultingCommand
- * 
- * Determine if Handlers belongs to service or client side
- */
-public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd 
-{
-  private boolean isClientHandler_ = false;
-  private boolean isServiceHandler_ = false;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    IStatus status = Status.OK_STATUS;
-
-    IStructuredSelection selection = getInitialSelection();
-    if (selection != null && selection.size() == 1) {
-        Object obj = selection.getFirstElement();
-
-        if (obj instanceof WebServiceNavigatorGroupType) {
-          WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-          if (wsngt.getWsdlService()!=null){
-          	isServiceHandler_ = true;
-          }
-          
-          if (wsngt.getServiceRef()!=null){
-          	isClientHandler_ = true;
-          }
-
-        }
-      }
-    else {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    return status;
-
-  }
-
-  
-/**
- * @return Returns the isClientHandler_.
- */
-public boolean getIsClientHandler() {
-	return isClientHandler_;
-}
-/**
- * @return Returns the isServiceHandler_.
- */
-public boolean getIsServiceHandler() {
-	return isServiceHandler_;
-}
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
deleted file mode 100644
index a2c7612e0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
+++ /dev/null
@@ -1,226 +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.consumption.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
-* Page for importing WSDL references into a WSIL in the workbench.
-*/
-public class ImportWSILWidget extends SimpleWidgetDataContributor
-{
-  /*CONTEXT_ID WSIL0001 for the WSIL Import Page*/
-  private final String INFOPOP_WSIL_IMPORT_PAGE = WebServiceConsumptionUIPlugin.ID + ".WSIL0001";
-
-  /*CONTEXT_ID WSIL0002 for the WSIL text field*/
-  private final String INFOPOP_WSIL_TEXT_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0002";
-
-  /*CONTEXT_ID WSIL0003 for the WSIL browse button*/
-  private final String INFOPOP_WSIL_BUTTON_BROWSE_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0003";
-
-  /*CONTEXT_ID WSIL0004 for the WSDL table*/
-  private final String INFOPOP_WSIL_TABLE_WSDL = WebServiceConsumptionUIPlugin.ID + ".WSIL0004";
-
-  private final String INSPECTION_WSIL = "inspection.wsil";
-
-  private Text wsil_;
-  private Button browse_;
-  private TableViewerEditor wsdls_;
-  
-  private MessageUtils msgUtils;
-
-  /**
-  * Constructs a new page.
-  */
-  public ImportWSILWidget()
-  {
-    msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    //super(msgUtils.getMessage("PAGE_WSIL_IMPORT"), msgUtils.getMessage("TITLE_WSIL_IMPORT"), msgUtils.getMessage("DESC_WSIL_IMPORT"));
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_IMPORT_PAGE"));
-    helpSystem.setHelp(parent, INFOPOP_WSIL_IMPORT_PAGE);
-
-    Composite composite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 3;
-    composite.setLayout(gl);
-    GridData gd = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-
-    Label label = new Label(composite, SWT.WRAP);
-    label.setText(msgUtils.getMessage("LABEL_WSIL_URI"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    wsil_ = new Text(composite, SWT.WRAP | SWT.SINGLE | SWT.BORDER);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    gd.widthHint = 256;
-    wsil_.setLayoutData(gd);
-    wsil_.addListener(SWT.Modify, statusListener);
-    wsil_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TEXT_WSIL"));
-    helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL);
-
-    browse_ = new Button(composite, SWT.PUSH);
-    browse_.setText(msgUtils.getMessage("LABEL_BROWSE"));
-    browse_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    browse_.addListener(SWT.Selection,
-      new Listener()
-      {
-        public void handleEvent(Event event)
-        {
-          handleBrowseEvent(event);
-        }
-      }
-    );
-    browse_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_BUTTON_BROWSE_WSIL"));
-    helpSystem.setHelp(browse_, INFOPOP_WSIL_BUTTON_BROWSE_WSIL);
-
-    Composite wsdlComposite = new Composite(composite, SWT.NONE);
-    wsdlComposite.setLayout(new GridLayout());
-    gd = new GridData(GridData.FILL_BOTH);
-    gd.horizontalSpan = 3;
-    wsdlComposite.setLayoutData(gd);
-    label = new Label(wsdlComposite, SWT.WRAP);
-    label.setText(msgUtils.getMessage("LABEL_WSDL"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    String[] columns = {msgUtils.getMessage("LABEL_WSDL_URI")};
-    wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://");
-    wsdls_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TABLE_WSDL"));
-    wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL);
-    return this;
-  }
-
-  public void handleBrowseEvent(Event event)
-  {
-    DialogResourceBrowser dialog = new DialogResourceBrowser(browse_.getShell(), null, new FileExtensionFilter(new String[] {"wsil"}));
-    dialog.open();
-    IResource res = dialog.getFirstSelection();
-    if (res != null)
-    {
-      if (res instanceof IFile)
-        wsil_.setText(res.getFullPath().toString());
-      else
-        wsil_.setText(res.getFullPath().addTrailingSeparator().append(INSPECTION_WSIL).toString());
-    }
-  }
-
-  public IStatus getStatus()
-  {
-    if (!wsil_.getText().endsWith(".wsil"))
-      return StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_INVALID_WSIL_FILE_NAME") );
-    else
-      return Status.OK_STATUS;
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    ArrayList list = new ArrayList();
-    if (selection != null && !selection.isEmpty())
-    {
-      for (Iterator it = selection.iterator(); it.hasNext();)
-      {
-        Object object = it.next();
-        if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl"))
-          list.add(((IFile)object).getFullPath().toString());
-        if (object instanceof ServiceImpl)
-          list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceImpl)(object))));	
-        if (object instanceof ServiceRef)
-          list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceRef)(object))));		
-        if (object instanceof WSDLResourceImpl)
-          list.add(J2EEActionAdapterFactory.getWSILPath(((WSDLResourceImpl)(object))));	
-      }
-    }
-    wsdls_.setInput(list);
-    wsdls_.refresh();
-    if (list.size() > 0)
-    {
-      StringBuffer path = new StringBuffer(list.get(0).toString());
-      // change extension from .wsdl to .wsil
-      int length = path.length();
-      path = path.replace(length-4, length, "wsil");
-      wsil_.setText(path.toString());
-    }
-  }
-  
-  public Arguments getGenWSILArguments()
-  {
-    Arguments args = new Arguments();
-    String wsilPath = wsil_.getText();
-    if (wsilPath.indexOf(':') < 0)
-      args.add(AddWSDLToWSILCommand.ARG_WSIL, URI.createPlatformResourceURI(wsil_.getText()).toString());
-    else
-      args.add(AddWSDLToWSILCommand.ARG_WSIL, wsilPath);
-    TableItem[] items = wsdls_.getItems();
-    for (int i = 0; i < items.length; i++)
-    {
-      String uri = items[i].getText(0);
-      if (uri.indexOf(':') < 0)
-      {
-        IResource res = ResourceUtils.findResource(uri);
-        if (res != null)
-        {
-          try
-          {
-            uri = res.getLocation().toFile().toURL().toString();
-          }
-          catch (MalformedURLException murle)
-          {
-          	murle.getMessage();
-          }
-        }
-      }
-      args.add(AddWSDLToWSILCommand.ARG_WSDL, uri);
-    }
-    args.add(AddWSDLToWSILCommand.ARG_RESOLVE_WSDL, null);
-    return args;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
deleted file mode 100644
index 1d1f70662..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
+++ /dev/null
@@ -1,83 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class PreferencesSelectionWidget extends SimpleWidgetDataContributor
-{    
-  private ResourceContext context_;
-  
-  /*CONTEXT_ID PWPR0003 for the Overwrite Files check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES = "PWPR0003";
-  private Button overwriteFilesCheckbox_;
-  
-  /*CONTEXT_ID PWPR0004 for the Create Folders check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS = "PWPR0004";
-  private Button createFoldersCheckbox_;
-  
-  /*CONTEXT_ID PWPR0015 for the Check Out Files check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES = "PWPR0015";  
-  private Button checkoutFilesCheckbox_;
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId    = "org.eclipse.jst.ws.ui";
-    String       conPluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils    = new MessageUtils( pluginId + ".plugin", this );
-  	UIUtils      utils       = new UIUtils( msgUtils, conPluginId );
-  	
-    Composite resourcesGroup = utils.createComposite( parent, 1 );
-    
-    overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_OVERWRITE_FILES",
-                                                    "TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES", 
-                                                    INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES );
-                                                 
-    createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CREATE_FOLDERS",
-                                                   "TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS" , 
-                                                   INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS );
-                                                      
-    checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CHECKOUT_FILES",
-                                                   "TOOLTIP_PPRM_CHECKBOX_CHECK_OUT", 
-                                                   INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES );
-    
-    return this;
-  }
-
-  public void setResourceContext( ResourceContext context )
-  { 
-    overwriteFilesCheckbox_.setSelection( context.isOverwriteFilesEnabled() );
-    createFoldersCheckbox_.setSelection( context.isCreateFoldersEnabled() );
-    checkoutFilesCheckbox_.setSelection( context.isCheckoutFilesEnabled() ); 
-    
-    context_ = context;
-  }
-  
-  public ResourceContext getResourceContext() 
-  {    
-    context_.setOverwriteFilesEnabled( overwriteFilesCheckbox_.getSelection() );
-    context_.setCreateFoldersEnabled( createFoldersCheckbox_.getSelection() );
-    context_.setCheckoutFilesEnabled( checkoutFilesCheckbox_.getSelection() );
-    
-    return context_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
deleted file mode 100644
index 7312ef8a2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
+++ /dev/null
@@ -1,101 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PublishToPrivateUDDICommandFragment extends AbstractCommandFragment
-{
-  private DataMappingRegistry dataMappingRegistry;
-  private CanFinishRegistry canFinishRegistry;
-  private WidgetRegistry widgetRegistry;
-  private boolean publishToPrivateUDDI;
-  private CommandWidgetBinding privateUDDIBinding;
-  
-  public PublishToPrivateUDDICommandFragment()
-  {
-    super(null, "");
-    privateUDDIBinding = PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().getBinding();
-  }
-
-  /** 
-   * Gets the first child fragment for this fragment.
-   *
-   * @return returns the first child fragment for this fragment.  Returns
-   * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-    if (privateUDDIBinding != null && publishToPrivateUDDI && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
-    {
-      privateUDDIBinding.registerCanFinish(canFinishRegistry);
-      privateUDDIBinding.registerDataMappings(dataMappingRegistry);
-      privateUDDIBinding.registerWidgetMappings(widgetRegistry);
-      return privateUDDIBinding.create().create();
-    }
-    else
-      return null;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment(CommandFragment fragment)
-  {
-  	return null;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings(DataMappingRegistry registry)
-  {
-  	dataMappingRegistry = registry;
-  }
-
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-  }
-
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-  }
-
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-    PublishToPrivateUDDICommandFragment fragment = new PublishToPrivateUDDICommandFragment();
-  	fragment.registerDataMappings(dataMappingRegistry);
-  	fragment.registerCanFinish(canFinishRegistry);
-  	fragment.registerWidgetMappings(widgetRegistry);
-  	fragment.setPublishToPrivateUDDI(publishToPrivateUDDI);
-  	return fragment;
-  }
-
-  public void setPublishToPrivateUDDI(boolean publish)
-  {
-    publishToPrivateUDDI = publish;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
deleted file mode 100644
index 9a40b1af2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,203 +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.consumption.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PublicUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-
-
-public class PublishWSWidget extends SimpleWidgetDataContributor
-{
-  /* CONTEXT_ID PWPB0001 for the UDDI Publish Page */
-  private String INFOPOP_PWPB_PAGE = WebServiceConsumptionUIPlugin.ID + ".PWPB0001";
-  /* CONTEXT_ID PWPB0002 for the UDDI Launch check box of the UDDI Publish Page */
-  private String INFOPOP_PWPB_CHECKBOX_WS_LAUNCH = WebServiceConsumptionUIPlugin.ID + ".PWPB0002";
-  private Button launchUDDICheckbox_;
-  private Button launchPrivateUDDICheckbox_;
-  private Label pubilcUDDIRegComboLabel_;
-  private Combo publicUDDIRegCombo_;
-  private MessageUtils msgUtils;
-  private Listener statusListener;
-  private Boolean publish;
-
-  public PublishWSWidget(boolean publish)
-  {
-    msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
-    this.publish = new Boolean(publish);
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    this.statusListener = statusListener;
-    Listener selListener = new Listener()
-    {
-      public void handleEvent(Event event)
-      {
-        handleSelectionEvent(event);
-      }
-    };
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_PAGE"));
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    helpSystem.setHelp(parent, INFOPOP_PWPB_PAGE);
-    launchPrivateUDDICheckbox_ = new Button(parent, SWT.CHECK);
-    if (publish.booleanValue())
-      launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH_PRIVATE_UDDI"));
-    else
-      launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND_PRIVATE_UDDI"));
-    launchPrivateUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
-    launchPrivateUDDICheckbox_.addListener(SWT.Selection, selListener);
-    helpSystem.setHelp(launchPrivateUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
-    launchUDDICheckbox_ = new Button(parent, SWT.CHECK);
-    if (publish.booleanValue())
-      launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH"));
-    else
-      launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND"));
-    launchUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
-    launchUDDICheckbox_.addListener(SWT.Selection, selListener);
-    helpSystem.setHelp(launchUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
-    Composite c = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 3;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    c.setLayoutData(gd);
-    new Label(c, SWT.WRAP);
-    pubilcUDDIRegComboLabel_ = new Label(c, SWT.WRAP);
-    pubilcUDDIRegComboLabel_.setText(msgUtils.getMessage("LABEL_PUBLIC_UDDI_REGISTRIES"));
-    publicUDDIRegCombo_ = new Combo(c, SWT.DROP_DOWN | SWT.READ_ONLY);
-    publicUDDIRegCombo_.setEnabled(false);
-    initPublicUDDI();
-    initPrivateUDDI();
-    return this;
-  }
-
-  private void initPublicUDDI()
-  {
-    PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
-    PublicUDDIRegistryType[] types = reg.getAllPublicUDDIRegistryTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (publish.booleanValue())
-      {
-        // Ignore read-only registries.
-        String publishURL = types[i].getPublishURL();
-        if (publishURL == null || publishURL.indexOf("://") == -1)
-          continue;
-      }
-      publicUDDIRegCombo_.add(types[i].getName());
-    }
-    if (types.length > 0)
-      publicUDDIRegCombo_.setText(publicUDDIRegCombo_.getItem(0));
-  }
-
-  private void initPrivateUDDI()
-  {
-    if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
-      launchPrivateUDDICheckbox_.setEnabled(false);
-  }
-
-  private void handleSelectionEvent(Event event)
-  {
-    if (launchUDDICheckbox_ == event.widget)
-      publicUDDIRegCombo_.setEnabled(launchUDDICheckbox_.getSelection());
-    statusListener.handleEvent(event);
-  }
-
-  public void setPublishToPublicUDDI(boolean publish)
-  {
-    launchUDDICheckbox_.setSelection(publish);
-    publicUDDIRegCombo_.setEnabled(publish);
-  }
-
-  public void setPublishToPublicUDDI(Boolean publish)
-  {
-    setPublishToPublicUDDI(publish.booleanValue());
-  }
-
-  public void setPublishToPrivateUDDI(boolean publish)
-  {
-    launchPrivateUDDICheckbox_.setSelection(publish);
-  }
-
-  public void setPublishToPrivateUDDI(Boolean publish)
-  {
-    setPublishToPrivateUDDI(publish.booleanValue());
-  }
-
-  public boolean getPublishToPublicUDDI()
-  {
-    return launchUDDICheckbox_.getSelection();
-  }
-
-  public boolean getPublishToPrivateUDDI()
-  {
-    return launchPrivateUDDICheckbox_.getSelection();
-  }
-
-  public boolean getForceLaunchOutsideIDE()
-  {
-    return false;
-  }
-
-  public LaunchOption[] getLaunchOptions()
-  {
-    Vector launchOptionVector = new Vector();
-    if (launchUDDICheckbox_.getSelection())
-    {
-      PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
-      int UDDIRegSelectionIndex = publicUDDIRegCombo_.getSelectionIndex();
-      if (UDDIRegSelectionIndex != -1)
-      {
-        String name = publicUDDIRegCombo_.getItem(UDDIRegSelectionIndex);
-        String id = reg.getPublicUDDIRegistryTypeIDByName(name);
-        PublicUDDIRegistryType type = reg.getPublicUDDIRegistryTypeByID(id);
-        launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, type.getInquiryURL()));
-        launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, type.getPublishURL()));
-      }
-    }
-    if (launchPrivateUDDICheckbox_.getSelection())
-    {
-      PrivateUDDIRegistryTypeRegistry privateReg = PrivateUDDIRegistryTypeRegistry.getInstance();
-      PrivateUDDIRegistryType privateType = privateReg.getPrivateUDDIRegistryType();
-      String[] privateInquiryURL = privateType.getPrivateUDDIRegistryInquiryAPI();
-      String[] privatePublishURL = privateType.getPrivateUDDIRegistryPublishAPI();
-      for (int i = 0; i < privateInquiryURL.length; i++)
-      {
-        launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, privateInquiryURL[i]));
-        launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, privatePublishURL[i]));
-      }
-    }
-    return (LaunchOption[]) launchOptionVector.toArray(new LaunchOption[0]);
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index f27949441..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,227 +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.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * ServiceHandlersWidgetDefaultingCommand
- * 
- * Initialize and load the handlers data
- */
-public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
-  private HandlerTableItem[] handlers_;
-  private MessageUtils msgUtils_;
-  private WebServiceDescription wsDescription_;
-  private WsddResource wsddResource_;
-  private WebServicesManager webServicesManager_;
-  private IProject project_;
-  private Hashtable wsDescToHandlers_;
-  private Hashtable serviceDescNameToDescObj_;
-  private String descriptionName_ = null;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-    String pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    IStatus status = Status.OK_STATUS;
-
-    webServicesManager_ = new WebServicesManager();
-    IStructuredSelection selection = getInitialSelection();
-    if (selection == null) {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    status = processHandlers(env);
-    return status;
-
-  }
-
-  public IStatus processHandlers(Environment env) {
-    try {
-      Vector handlers = new Vector();
-      wsDescToHandlers_ = new Hashtable();
-      serviceDescNameToDescObj_ = new Hashtable();
-      
-//      WebServiceEditModel wsed = getWebServiceEditModel();
-  //    if (wsed == null)
-        wsddResource_ = getWsddResourceFromSelection();
-  //    else
-  //      wsddResource_ = wsed.getWebServicesXmlResource();
-
-      if (wsddResource_ == null) {
-        IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED") );
-        env.getStatusHandler().reportError(status);
-        return status;
-      }
-
-      WebServices webServices = wsddResource_.getWebServices();
-      if (webServices != null) {
-        List wsDescriptions = wsddResource_.getWebServices().getWebServiceDescriptions();
-        for (int i = 0; i < wsDescriptions.size(); i++) {
-
-          wsDescription_ = (WebServiceDescription) wsDescriptions.get(i);
-          
-          List wsPortComponents = wsDescription_.getPortComponents();
-          for (int j = 0; j < wsPortComponents.size(); j++) {
-            PortComponent wsPort = (PortComponent) wsPortComponents.get(j);
-            String portName = wsPort.getPortComponentName();
-            List wsHandlers = wsPort.getHandlers();
-            HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];            
-            for (int k = 0; k < wsHandlers.size(); k++) {
-
-              Handler wsHandler = (Handler) wsHandlers.get(k);
-
-              HandlerTableItem handlerItem = new HandlerTableItem();
-              handlerItem.setHandler(wsHandler);
-              handlerItem.setHandlerName(wsHandler.getHandlerName());
-              handlerItem.setHandlerClassName(wsHandler.getHandlerClass());
-              handlerItem.setPort(wsPort);
-              handlerItem.setPortName(portName);
-              handlerItem.setWsDescRef(wsDescription_);
-              handlerItems[k] = handlerItem;
-              
-              handlers.add(handlerItem);
-            }
-            String wsDescName = wsDescription_.getWebServiceDescriptionName();
-            wsDescToHandlers_.put(wsDescName, handlerItems);
-            serviceDescNameToDescObj_.put(wsDescName, wsDescription_);
-            
-          }
-
-        }
-
-        handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
-      }
-    }
-    catch (Exception e) 
-    {
-      e.printStackTrace();
-      return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), e);
-    }
-    return Status.OK_STATUS;
-  }
-
-  public HandlerTableItem[] getHandlers() {
-    return this.handlers_;
-  }
-
-  /**
-   * @return Returns the isGenSkeletonEnabled_.
-   */
-  public boolean getGenSkeletonEnabled() {
-    return true;
-  }
-
-  /**
-   * @return Returns the sourceOutputLocation_.
-   */
-  public IPath[] getSourceOutputLocation() {
-    IPath[] locations = null;
-    IProject project = getProject();
-
-    if (project != null) {
-      locations = ResourceUtils.getAllJavaSourceLocations(project);
-    }
-    else {
-      project = project_;
-      if (project != null) {
-        locations = ResourceUtils.getAllJavaSourceLocations(project);
-      }
-    }
-    return locations;
-  }
-
-  public WsddResource getWsddResource() {
-    return wsddResource_;
-  }
-
-  private WsddResource getWsddResourceFromSelection() {
-    IStructuredSelection initSel = getInitialSelection();
-    if (initSel != null && initSel.size() == 1) {
-      Object obj = initSel.getFirstElement();
-      if (obj instanceof ServiceImpl) {
-        // Service object
-        Service service = (Service) obj;
-        descriptionName_ = service.getQName().getLocalPart();
-        project_ = ProjectUtilities.getProject(service);
-        return webServicesManager_.getWsddResource(service);
-      }
-      else if (obj instanceof WSDLResourceImpl) {
-        // WSDL resource
-        WSDLResourceImpl res = (WSDLResourceImpl) obj;
-        project_ = ProjectUtilities.getProject(res);
-        List wsdlResources = webServicesManager_.getWSDLServices(res);
-        return webServicesManager_.getWsddResource((Service) wsdlResources.get(0));
-      }
-      else if (obj instanceof WebServiceNavigatorGroupType) {
-        WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
-        Service service = (Service)wsngt.getWsdlService();
-        descriptionName_ = service.getQName().getLocalPart();        
-        project_ = ProjectUtilities.getProject(service);
-        return webServicesManager_.getWsddResource(service);
-      }
-    }
-    
-    return null;
-
-  }
-
-  /**
-   * @deprecated
-   */
-  public WebServiceDescription getWsDescription() {
-    return wsDescription_;
-  }
-  
-  public String getDescriptionName(){
-    return descriptionName_;
-  }
-  
-  public Hashtable getWsRefsToHandlers(){
-    return wsDescToHandlers_;
-  }
-  
-  public Hashtable getServiceDescNameToDescObj(){
-    return this.serviceDescNameToDescObj_;
-  }
-  
-  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
deleted file mode 100644
index 15214d600..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,221 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.WsddFactoryImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *  
- */
-public class ServiceHandlersWidgetOutputCommand extends AbstractDataModelOperation
-{
-
-  private WsddResource wsddResource_;
-  private Hashtable wsDescToHandlers_;
-  private Hashtable serviceDescNameToDescObj_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-    try {
-      Enumeration e = wsDescToHandlers_.keys();
-      while (e.hasMoreElements()) {
-
-        Hashtable wsPortsTable = new Hashtable();
-        Hashtable wsPortToHandlerTable = new Hashtable();
-
-        String serviceDescName = (String) e.nextElement();
-        // load PortName -> PortComponent table
-        WebServiceDescription wsDescription_ = (WebServiceDescription) serviceDescNameToDescObj_.get(serviceDescName);
-        if (wsDescription_ != null) {
-
-          List wsPorts = wsDescription_.getPortComponents();
-          for (int k = 0; k < wsPorts.size(); k++) {
-            PortComponent port = (PortComponent) wsPorts.get(k);
-            wsPortsTable.put(port.getPortComponentName(), port);
-            wsPortToHandlerTable.put(port.getPortComponentName(), new ArrayList());
-          }
-        }
-
-        List handlerTableItems = (List) wsDescToHandlers_.get(serviceDescName);
-        if (handlerTableItems != null) {
-
-          WsddFactory wsddFactory = new WsddFactoryImpl();
-
-          //form port components tables first
-          for (int i = 0; i < handlerTableItems.size(); i++) {
-
-            HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
-            PortComponent wsPort = (PortComponent) hti.getPort();
-            if (wsPort == null) {
-              //find it
-              if (wsPortsTable.get(hti.getPortName()) != null)
-                wsPort = (PortComponent) wsPortsTable.get(hti.getPortName());
-              else {
-                // create it; should not get into here
-                wsPort = wsddFactory.createPortComponent();
-                wsPort.setPortComponentName(hti.getPortName());
-                wsPortsTable.put(wsPort.getPortComponentName(), wsPort);
-              }
-            }
-            wsPortToHandlerTable.put(wsPort.getPortComponentName(), new ArrayList());
-          }
-
-          // form Handler and ports table
-          for (int i = 0; i < handlerTableItems.size(); i++) {
-
-            HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
-            String portName = hti.getPortName();
-
-            PortComponent port = (PortComponent) wsPortsTable.get(portName);
-            if (port == null) return status;
-
-            List existingHandlers = port.getHandlers();
-
-            Object handler = hti.getHandler();
-            if (!existingHandlers.contains(handler)) {
-              // create it
-              Handler newHandler = wsddFactory.createHandler();
-              newHandler.setHandlerName(hti.getHandlerName());
-              newHandler.setHandlerClass(hti.getHandlerClassName());
-              ((List) wsPortToHandlerTable.get(portName)).add(newHandler);
-
-            }
-            else if (handler instanceof Handler) {
-              // clone it
-              EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
-              copyUtil.setCopyAdapters(true);
-              Handler clonedHandler = (Handler) copyUtil.copy((Handler) handler);
-              ((List) wsPortToHandlerTable.get(portName)).add(clonedHandler);
-            }
-          }
-
-        }
-
-        // remove existing handlers from ports
-        removeExistingHandlers(wsPortsTable, wsPortToHandlerTable);
-
-        // add ports to wsDescription
-        addPortsToDescriptions(wsPortsTable, wsDescription_);
-
-        // add handlers to ports
-        addHandlersToPorts(wsPortsTable, wsPortToHandlerTable);
-      }
-      if (wsddResource_ != null) {
-        wsddResource_.save(new HashMap());
-      }
-
-    }
-    catch (Exception e) {
-      //status = new
-      e.printStackTrace();
-    }
-    return status;
-  }
-
-  private void removeExistingHandlers(Hashtable portsTable, Hashtable portsToHandlersTable) {
-    try {
-      Enumeration ports = portsToHandlersTable.keys();
-      while (ports.hasMoreElements()) {
-        String portName = (String) ports.nextElement();
-        Object port = portsTable.get(portName);
-        if (port != null && port instanceof PortComponent) {
-          List handlers = ((PortComponent) port).getHandlers();
-          handlers.clear();
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  private void addPortsToDescriptions(Hashtable portsTable, WebServiceDescription wsDescription_) {
-    try {
-      Enumeration ports = portsTable.keys();
-      while (ports.hasMoreElements()) {
-        String portName = (String) ports.nextElement();
-        // newly edited port
-        Object port = portsTable.get(portName);
-        
-        // existing port
-        List emfPorts = wsDescription_.getPortComponents();
-        if (!emfPorts.contains(port) && port != null && port instanceof PortComponent) {
-          emfPorts.add((PortComponent) port);
-        }
-      }
-    }
-
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  private void addHandlersToPorts(Hashtable portsTable, Hashtable portsToHandlersTable) {
-    try {
-      Enumeration ports = portsToHandlersTable.keys();
-      while (ports.hasMoreElements()) {
-        String portName = (String) ports.nextElement();
-        Object port = portsTable.get(portName);
-        if (port != null && port instanceof PortComponent) {
-          List handlers = (List) portsToHandlersTable.get(portName);
-
-          List modelHandlers = ((PortComponent) port).getHandlers();
-          modelHandlers.addAll(handlers);
-        }
-      }
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-  }
-
-  /**
-   * @param handlerTableItems
-   *          The handlerTableItems to set.
-   */
-  public void setHandlersList(List handlerTableItems) {
-  }
-
-  public void setWsDescToHandlers(Hashtable wsDescToHandlers) {
-    this.wsDescToHandlers_ = wsDescToHandlers;
-  }
-
-//  public void setWsDescription(WebServiceDescription wsDesc) {
-//    this.wsDescription_ = wsDesc;
-//  }
-
-  public void setWsddResource(WsddResource wsddRes) {
-    this.wsddResource_ = wsddRes;
-  }
-
-  public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
-    this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
deleted file mode 100644
index 9064efc8d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,619 +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.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.PropertiesResourceFilter;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-
-
-public class TableViewerWidget extends SimpleWidgetDataContributor
-{
-  private int DEFAULT_TABLE_HEIGHT_HINT = 100;
-  private int DEFAULT_COLUMN_WIDTH = 80;
-
-  public static byte MAP_ONE_TO_ONE = 3;
-  public static byte MAP_MANY_TO_ONE = 1;
-  public static byte MAP_MANY_TO_MANY = 0;
-
-  private String[] columns_;
-  private TableViewer tableViewer_;
-  private Table table_;
-  private TableEditor editor_;
-  private TableEditorListener tableEditorListener_;
-  private Text text_;
-  private Button import_;
-  private Button add_;
-  private Button remove_;
-  
-  private Composite parent_;
-  private Listener  statusListener_;
-
-  private String message = null;
-  private byte rescriction = MAP_MANY_TO_MANY;
-
-  private List values_;
-  private Object defaultValue_;
-
-  private PropertiesResourceFilter filter_ = new PropertiesResourceFilter();
-
-  public TableViewerWidget(String[] columns, List initValues, Object defaultValue, byte rescriction)
-  {
-	columns_ = columns;
-	values_ = new ArrayList();
-	if (initValues != null && initValues.size() > 0)
-	  values_.addAll(initValues);
-	defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
-	this.rescriction = rescriction;
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  { 
-    parent_         = parent;
-    statusListener_ = statusListener;
-    
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    
-	Composite  composite = new Composite(parent, SWT.NONE);
-	GridLayout gl        = new GridLayout();
-	
-	gl.marginHeight = 0;
-	gl.marginWidth = 0;
-	composite.setLayout(gl);
-	composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-	table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
-	GridData gd = new GridData(GridData.FILL_BOTH);
-	gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
-	table_.setLayoutData(gd);
-	table_.setHeaderVisible(true);
-	table_.setLinesVisible(true);
-	TableLayout tableLayout = new TableLayout();
-	int maxWidth = DEFAULT_COLUMN_WIDTH;
-	for (int i = 0; i < columns_.length; i++)
-	{
-	  TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
-	  tableColumn.setText(columns_[i]);
-	  tableColumn.pack();
-	  int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
-	  maxWidth = Math.max(maxWidth, tableColumnWidth);
-	  ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
-	  tableLayout.addColumnData(columnData);
-	}
-	table_.setLayout(tableLayout);
-	// initialize the table editor
-	editor_ = new TableEditor(table_);
-	// The editor must have the same size as the cell and must
-	// not be any smaller than 50 pixels.
-	editor_.horizontalAlignment = SWT.LEFT;
-	editor_.grabHorizontal = true;
-	editor_.minimumWidth = maxWidth;
-	tableEditorListener_ = new TableEditorListener();
-	table_.addMouseListener(tableEditorListener_);
-	tableViewer_ = new TableViewer(table_);
-	tableViewer_.getControl().addKeyListener(
-	  new KeyListener()
-	  {
-		public void keyPressed(KeyEvent e)
-		{
-		  int asciiDel = (int)e.character;
-		  // Del
-		  if (asciiDel == 127) 
-			handleDeleteKeyPressed();
-                // Enter or space
-                if (((int)e.character) == 13 || ((int)e.character) == 32)
-                  tableEditorListener_.editSelection();
-		}
-		public void keyReleased(KeyEvent e)
-		{
-		}
-	  }
-	);
-	tableViewer_.setContentProvider(new ListContentProvider());
-	tableViewer_.setLabelProvider(new ListLabelProvider());
-	tableViewer_.setInput(values_);
-	tableViewer_.addSelectionChangedListener(
-	  new ISelectionChangedListener()
-	  {
-		public void selectionChanged(SelectionChangedEvent event)
-		{
-		  enableRemove(true);
-		}
-	  }
-	);
-
-	Composite buttonComposite = new Composite(composite, SWT.NONE);
-	gl = new GridLayout();
-	gl.numColumns = 3;
-	gl.makeColumnsEqualWidth = true;
-	buttonComposite.setLayout(gl);
-	buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-	import_ = new Button(buttonComposite, SWT.PUSH);
-	import_.setText(msgUtils.getMessage("LABEL_IMPORT"));
-	import_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	import_.addSelectionListener(
-	  new SelectionListener()
-	  {
-		public void widgetSelected(SelectionEvent event)
-		{
-		  handleImportButtonSelected(event);
-		}
-		public void widgetDefaultSelected(SelectionEvent event)
-		{
-		}
-	  }
-	);
-	
-	add_ = new Button(buttonComposite, SWT.PUSH);
-	add_.setText(msgUtils.getMessage("LABEL_ADD"));
-	add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	add_.addSelectionListener(
-	  new SelectionListener()
-	  {
-		public void widgetSelected(SelectionEvent event)
-		{
-		  handleAddButtonSelected(event);
-		}
-		public void widgetDefaultSelected(SelectionEvent event)
-		{
-		}
-	  }
-	);
-
-	
-	remove_ = new Button(buttonComposite, SWT.PUSH);
-	remove_.setText(msgUtils.getMessage("LABEL_REMOVE"));
-	remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-	remove_.addSelectionListener(
-	  new SelectionListener()
-	  {
-		public void widgetSelected(SelectionEvent event)
-		{
-		  handleRemoveButtonSelected(event);
-		}
-		public void widgetDefaultSelected(SelectionEvent event)
-		{
-		}
-	  }
-	);
-	enableRemove(false);
-	
-	return this;
-  }
-
-  private void enableRemove(boolean enabled)
-  {
-	remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  private void handleImportButtonSelected(SelectionEvent event)
-  {
-	IResource resource = DialogUtils.browseResources(
-	  parent_.getShell(),
-	  ResourceUtils.getWorkspaceRoot(),
-	  null,
-	  filter_
-	);
-	if (resource != null && resource instanceof IFile)
-	{
-	  try
-	  {
-		Properties props = new Properties();
-		props.load(((IFile)resource).getContents());
-		Set set = props.entrySet();
-		java.util.List list = new LinkedList();
-		Iterator i = set.iterator();
-		while (i.hasNext())
-		{
-		  Map.Entry me = (Map.Entry)i.next();
-		  String key = (String)me.getKey();
-		  String val = (String)me.getValue();
-		  list.add(new String[] {key,val});
-		}
-		values_.addAll(list);
-	  }
-	  catch (Exception e)
-	  {
-	    // TODO Report some error here.
-	  }
-	}
-	refresh();
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event)
-  {
-	values_.add(defaultValue_);
-	refresh();
-	setSelectionAsObject(values_.get(table_.getItemCount()-1));
-	tableEditorListener_.editSelection();
-  }
-
-  private void handleRemoveButtonSelected(SelectionEvent event)
-  {
-	handleDeleteKeyPressed();
-  }
-
-  private void handleDeleteKeyPressed()
-  {
-	internalDispose();
-	ISelection selection = tableViewer_.getSelection();
-	if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
-	{
-	  int selectionIndex = table_.getSelectionIndex();
-	  int selectionCount = table_.getItemCount();
-	  values_.remove(selectionIndex);
-	  if (selectionIndex < selectionCount-1)
-		setSelectionAsObject(values_.get(selectionIndex));
-	  else if (selectionCount -2 >= 0)
-		setSelectionAsObject(values_.get(selectionCount-2));
-	  refresh();
-	}
-  }
-
-  private void internalRefresh()
-  {
-	// synchronize text field, previously selected table cell and model (inputObject)
-	if (text_ != null)
-	{
-	  TableItem oldTableItem = editor_.getItem();
-	  int oldColumnIndex = editor_.getColumn();
-	  if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
-	  {
-		String oldText = text_.getText();
-		oldTableItem.setText(oldColumnIndex, oldText);
-		int oldRowIndex = table_.indexOf(oldTableItem);
-		values_.set(oldRowIndex, new String[] {oldTableItem.getText(0), oldTableItem.getText(1)});
-	  }
-	}
-	checkMappingConstraints();
-	statusListener_.handleEvent( null );
-  }
-
-  private void checkMappingConstraints() {
-
-	HashMap map = new HashMap();
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    
-	for(int cnt=0; cnt<values_.size(); cnt++){
-		String[] value = (String[])values_.get(cnt);
-		if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){
-			message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[0],columns_[1]});
-			return;
-		}
-		if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){
-			message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[1],columns_[0]});
-			return;
-		}
-		map.put(value[0],value[1]);
-
-	}
-	message = null;
-
-  }
-
-  public IStatus getStatus()
-  {
-    return message == null ? Status.OK_STATUS : 
-                             StatusUtils.errorStatus( message );
-  }
-
-  private void setSelectionAsObject(Object object)
-  {
-	tableViewer_.setSelection(new StructuredSelection(object), true);
-  }
-
-  public void refresh()
-  {
-	internalRefresh();
-	tableViewer_.refresh();
-  }
-
-  public TableItem[] getItems()
-  {
-	//internalRefresh();
-	return table_.getItems();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-	add_.setEnabled(enabled);
-	enableRemove(enabled);
-  }
-
-  public void dispose()
-  {
-	internalDispose();
-	if (editor_ != null)
-	  editor_.dispose();
-	if (table_ != null)
-	  table_.dispose();
-	if (add_ != null)
-	  add_.dispose();
-	if (remove_ != null)
-	  remove_.dispose();
-  }
-
-  private void internalDispose()
-  {
-	if (text_ != null)
-	  text_.dispose();
-	text_ = null;
-  }
-
-  protected class TableEditorListener implements MouseListener
-  {
-	private int currSelectionIndex_;
-    private int editRow_;
-    private int editColumn_;
-
-	public TableEditorListener()
-	{
-	  super();
-	  currSelectionIndex_ = -1;
-         editRow_ = -1;
-         editColumn_ = -1;
-	}
-
-	public void mouseDoubleClick(MouseEvent e)
-	{
-	  mouseDown(e);
-	}
-
-	public void mouseDown(MouseEvent e)
-	{
-	  // refresh table
-	  internalRefresh();
-	  // Clean up previous text editor control
-	  internalDispose();
-	  // update table
-	  if (table_.isFocusControl())
-	  {
-		int selectedRowIndex = getSelectedRow(table_, e.y);
-		if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
-		{
-		  TableItem tableItem = table_.getItem(selectedRowIndex);
-		  int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
-		  if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
-			editSelection(selectedRowIndex, selectedColumnIndex);
-		}
-		currSelectionIndex_ = selectedRowIndex;
-	  }
-	}
-
-	public void mouseUp(MouseEvent e)
-	{
-	}
-
-	private int getSelectedRow(Table table, int y)
-	{
-	  TableItem[] tableItems = table.getItems();
-	  for (int i = 0; i < tableItems.length; i++)
-	  {
-		Rectangle rectangle = tableItems[i].getBounds(0);
-		if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
-		  return i;
-	  }
-	  return -1;
-	}
-
-	private int getSelectedColumn(TableItem tableItem, int x, int y)
-	{
-	  for (int i = 0; i < columns_.length; i++)
-	  {
-		if (tableItem.getBounds(i).contains(x, y))
-		  return i;
-	  }
-	  return -1;
-	}
-
-	private void editSelection(int row, int column)
-	{
-         editRow_ = row;
-         editColumn_ = column;
-	  TableItem tableItem = table_.getItem(row);
-	  // Setup adapter for the new selection
-	  text_ = new Text(table_, SWT.NONE);
-	  String text = tableItem.getText(column);
-	  text_.setText((text != null) ? text : "");
-         text_.addKeyListener(new KeyListener()
-           {
-             public void keyPressed(KeyEvent e)
-             {
-               // Esc
-               if (((int)e.character) == 27)
-                 cancelSelection();
-             }
-             public void keyReleased(KeyEvent e)
-             {
-             }
-           }
-         );
-         text_.addTraverseListener(new TraverseListener()
-           {
-             public void keyTraversed(TraverseEvent e)
-             {
-               if (e.detail == SWT.TRAVERSE_TAB_NEXT)
-                 traverseTabNext();
-               else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
-                 traverseTabPrevious();
-             }
-           }
-         );
-	  editor_.setEditor(text_, tableItem, column);
-	  text_.setFocus();
-	  text_.selectAll();
-	}
-
-    protected void traverseTabNext()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
-      {
-        if (editColumn_ < columns_.length-1)
-          editColumn_++;
-        else
-        {
-          editColumn_ = 0;
-          editRow_++;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    protected void traverseTabPrevious()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == 0 && editColumn_ == 0))
-      {
-        if (editColumn_ > 0)
-          editColumn_--;
-        else
-        {
-          editColumn_ = columns_.length-1;
-          editRow_--;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    public void cancelSelection()
-    {
-      internalDispose();
-      internalRefresh();
-    }
-
-	public void editSelection()
-	{
-	  int selectedRowIndex = table_.getSelectionIndex();
-	  if (selectedRowIndex != -1 && columns_.length > 0)
-	  {
-		// refresh table
-		internalRefresh();
-		// Clean up any previous editor control
-		internalDispose();
-		editSelection(selectedRowIndex, 0);
-	  }
-	  currSelectionIndex_ = selectedRowIndex;
-	}
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider
-  {
-	public void dispose()
-	{
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-	  tableViewer_.add(getElements(newInput));
-	}
-
-	public Object[] getElements(Object inputElement)
-	{
-	  if (inputElement instanceof List)
-	  {
-		List list = (List)inputElement;
-		Object[] objects = new Object[list.size()];
-		for (int i = 0; i < objects.length; i++)
-		  objects[i] = list.get(i);
-		return objects;
-	  }
-	  else
-		return new Object[0];
-	}
-  }
-
-  protected class ListLabelProvider implements ITableLabelProvider
-  {
-	public Image getColumnImage(Object element, int columnIndex)
-	{
-	  return null;
-	}
-
-	public String getColumnText(Object element, int columnIndex)
-	{
-		return ((String[])element)[columnIndex];	  	
-	}
-
-	public void addListener(ILabelProviderListener listener)
-	{
-	}
-
-	public void removeListener(ILabelProviderListener listener)
-	{
-	}
-
-	public boolean isLabelProperty(Object element, String property)
-	{
-	  return true;
-	}
-
-	public void dispose()
-	{
-	}
-  }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
deleted file mode 100644
index d4de766dd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-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 WSDLSelectionConditionCommand extends AbstractDataModelOperation implements Condition
-{
-  private String pluginId_;
-  private MessageUtils msgUtils_;
-  private WebServicesParser webServicesParser;
-  private String webServiceURI;
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  private boolean needWSDLSelectionTreeWidget;
-  
-  public WSDLSelectionConditionCommand()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public WebServicesParser getWebServicesParser()
-  {
-  	if (webServicesParser == null)
-  	  webServicesParser = new WebServicesParserExt();
-  	return webServicesParser;
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  	needWSDLSelectionTreeWidget = false;
-  	WebServicesParser parser = getWebServicesParser();
-  	parser.setURI(webServiceURI);
-    try
-    {
-      parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
-    }
-    catch (WWWAuthenticationException wwwae)
-    {
-      DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-      dialog.handleWWWAuthentication(wwwae);
-      String username = dialog.getUsername();
-      String password = dialog.getPassword();
-      httpBasicAuthUsername = username;
-      httpBasicAuthPassword = password;
-      if (username != null && password != null)
-      {
-        parser.setHTTPBasicAuthUsername(username);
-        parser.setHTTPBasicAuthPassword(password);
-        try
-        {
-          parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
-        }
-        catch (Throwable t)
-        {
-          return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), t);
-        }
-        finally
-        {
-          parser.setHTTPBasicAuthUsername(null);
-          parser.setHTTPBasicAuthPassword(null);
-        }
-      }
-    }
-    catch (Throwable t)
-    {
-      return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), t);
-    }
-    WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
-    if (wsEntity != null)
-    {
-      int type = wsEntity.getType();
-      if (type != WebServiceEntity.TYPE_WSDL)
-      	needWSDLSelectionTreeWidget = true;
-    }
-    return Status.OK_STATUS;
-  }
-  
-  public boolean evaluate()
-  {
-    return needWSDLSelectionTreeWidget;
-  }
-
-  public String getWebServiceURI()
-  {
-    return webServiceURI;
-  }
-
-  public void setWebServiceURI(String webServiceURI)
-  {
-    this.webServiceURI = webServiceURI;
-  }
-  
-  public String getWsdlURI()
-  {
-    return getWebServiceURI();
-  }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
-	return httpBasicAuthPassword;
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
-	return httpBasicAuthUsername;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
deleted file mode 100644
index 9273f6d15..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
+++ /dev/null
@@ -1,132 +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.consumption.ui.widgets;
-
-import java.util.Map;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionOutputCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private IProject project;
-  private String componentName;
-  
-  private boolean testService;
-  
-  
-  public boolean getTestService() {
-    return testService;
-  }
-
-  
-  public void setTestService(boolean testService) {
-    this.testService = testService;
-  }
-
-  /**
-   * @return Returns the project.
-   */
-  public IProject getProject()
-  {
-    return project;
-  }
-
-  /**
-   * @param project
-   *          The project to set.
-   */
-  public void setProject(IProject project)
-  {
-    this.project = project;
-  }
-  
-  
-  
-  public String getComponentName()
-  {
-    return componentName;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName = componentName;
-  }
-
-  public String getWsdlURI()
-  {
-    return wsdlURI;
-  }
-
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser != null)
-      return webServicesParser;
-    else
-      return new WebServicesParserExt();
-  }
-
-  /**
-   * @param webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    MessageUtils msgUtils = new MessageUtils("org.eclipse.jst.ws.consumption.ui.plugin", this);    
-    if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null) {
-      IStatus status = Status.OK_STATUS;     
-      Map services = getWebServicesParser().getWSDLDefinition(wsdlURI).getServices();
-      if (services.isEmpty()){
-        if (testService==true){
-            testService = false;
-            status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_WARNING_NO_SERVICE_ELEMENT") );
-            try{
-              env.getStatusHandler().report(status);
-            }catch(Exception e){
-              status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_WARNING_NO_SERVICE_ELEMENT") );
-            }
-        }
-      }    
-    return status;
-  }
-    else
-    {
-      IStatus status = StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
deleted file mode 100644
index f7b9d2b7a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,287 +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.consumption.ui.widgets;
-
-import java.util.List;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
-* This wizard page allows the user to select the WSDL URI for consumption
-*/
-public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_;
-  private MessageUtils msgUtils_;
-
-  /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/
-  private final String INFOPOP_PWWS_PAGE = ".PWWS0001";
-
-  private WebServicesParser webServicesParser;
-  private String webServiceURI;
-  
-  private Listener statusListener;
-  private TreeViewer treeViewer_;
-  private TreeContentProvider treeContentProvider;
-  private Tree tree_;
-  private int pageWidth_;
-
-  /**
-  * Default constructor.
-  */
-  public WSDLSelectionTreeWidget()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-  	this.statusListener = statusListener;
-    parent.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWWS_PAGE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE);
-
-    Label wsdlLabel = new Label(parent, SWT.WRAP);
-    wsdlLabel.setText(msgUtils_.getMessage("LABEL_SELECT_WSDL"));
-    wsdlLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    tree_ = new Tree(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    gd.heightHint = 200;
-    tree_.setLayoutData(gd);
-    pageWidth_ = tree_.getShell().getSize().x;
-    treeViewer_ = new TreeViewer(tree_);
-    treeContentProvider = new TreeContentProvider();
-    treeViewer_.setContentProvider(treeContentProvider);
-    treeViewer_.setLabelProvider(new TreeLabelProvider());
-    treeViewer_.addSelectionChangedListener(
-      new ISelectionChangedListener()
-      {
-        public void selectionChanged(SelectionChangedEvent event)
-        {
-        	handleTreeSelectionChangedEvent(event);
-        }
-      }
-    );
-    return this;
-  }
-  
-  private void handleTreeSelectionChangedEvent(SelectionChangedEvent event)
-  {
-  	statusListener.handleEvent(new Event());
-  }
-  
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-  	return webServicesParser;
-  }
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-  	this.webServicesParser = webServicesParser;
-  	treeViewer_.setInput(this.webServicesParser);
-  	refreshTreeViewer();
-  }
-
-  public void setWebServiceURI(String wsURI)
-  {
-  	webServiceURI = wsURI;
-  	treeContentProvider.setWebServiceURI(webServiceURI);
-    refreshTreeViewer();
-  }
-
-  public void refreshTreeViewer()
-  {
-  	if (webServicesParser != null && webServiceURI != null)
-  	{
-  	  treeViewer_.refresh();
-  	  Control shell = tree_.getShell();
-  	  if (tree_.getSize().x > pageWidth_ || shell.getSize().x > pageWidth_)
-  	  {
-  	    tree_.setSize(pageWidth_, tree_.getSize().y);
-  	    shell.setSize(pageWidth_, shell.getSize().y);
-  	    shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-  	    shell.redraw();
-  	  }
-  	}
-  }
-  
-  public void setEnabled(boolean enabled)
-  {
-    tree_.setEnabled(enabled);
-  }
-  
-  public boolean isEnabled()
-  {
-    return tree_.isEnabled();
-  }
-  
-  public String getWsdlURI()
-  {
-  	WebServiceEntity entity = getSelectionAsWebServiceEntity();
-  	if (entity != null)
-  	  return entity.getURI();
-  	else
-  	  return webServiceURI;
-  }
-  
-  private WebServiceEntity getSelectionAsWebServiceEntity()
-  {
-  	if (treeViewer_ != null)
-  	{
-      ISelection sel = treeViewer_.getSelection();
-      if (!sel.isEmpty() && (sel instanceof IStructuredSelection))
-      {
-        IStructuredSelection ssel = (IStructuredSelection)sel;
-        Object object = ssel.getFirstElement();
-        if (object instanceof WebServiceEntity)
-          return (WebServiceEntity)object;
-      }
-  	}
-    return null;
-  }
-
-  public IStatus getStatus()
-  {
-    WebServiceEntity wsEntity = getSelectionAsWebServiceEntity();
-    if (wsEntity == null || wsEntity.getType() != WebServiceEntity.TYPE_WSDL)
-      return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL") );
-    else
-      return Status.OK_STATUS;
-  }
-
-  private class TreeContentProvider implements ITreeContentProvider
-  {
-  	private String webServiceURI;
-
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      if (inputElement instanceof WebServicesParser)
-      {
-      	WebServicesParser parser = (WebServicesParser)inputElement;
-        Object wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
-        if (wsEntity != null)
-          return new Object[] {wsEntity};
-      }
-      return new Object[0];
-    }
-
-    public Object[] getChildren(Object parentElement)
-    {
-      if (parentElement instanceof WebServiceEntity)
-      {
-        List list = ((WebServiceEntity)parentElement).getChildren();
-        Object[] objects = new Object[list.size()];
-        for (int i = 0; i < objects.length; i++)
-          objects[i] = list.get(i);
-        return objects;
-      }
-      return new Object[0];
-    }
-
-    public Object getParent(Object element)
-    {
-      if (element instanceof WebServiceEntity)
-        return ((WebServiceEntity)element).getParent();
-      return new Object[0];
-    }
-
-    public boolean hasChildren(Object element)
-    {
-      return (getChildren(element).length > 0);
-    }
-    
-    public void setWebServiceURI(String wsURI)
-    {
-      webServiceURI = wsURI;
-    }
-  }
-
-  private class TreeLabelProvider implements ILabelProvider
-  {
-    public Image getImage(Object element)
-    {
-      switch (((WebServiceEntity)element).getType())
-      {
-        case WebServiceEntity.TYPE_HTML:
-          return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/html.gif").createImage();
-        case WebServiceEntity.TYPE_WSIL:
-          return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsil.gif").createImage();
-        case WebServiceEntity.TYPE_WSDL:
-          return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsdl.gif").createImage();
-        default:
-          return null;
-      }
-    }
-
-    public String getText(Object element)
-    {
-      return ((WebServiceEntity)element).getURI();
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return true;
-    }
-
-    public void dispose()
-    {
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 029e4451b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,148 +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.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection selection_;
-  
-  public String getWebServiceURI()
-  {
-  	if (selection_ != null && !selection_.isEmpty())
-  	{
-  	  Object firstSel = selection_.getFirstElement();
-  	  if (firstSel instanceof IFile)
-  	  {
-  	    IFile ifile = (IFile)firstSel;
-  	    String ext = ifile.getFileExtension();
-  	    if (ext != null && (ext.equals("wsdl") || ext.equals("wsil") || ext.equals("html")))
-  	    {
-  	      return ifile.getFullPath().toString();
-  	    }
-  	  }
-  	  if (firstSel instanceof ServiceImpl)
-      {
-        ServiceImpl serviceImpl = (ServiceImpl)firstSel;
-        return J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-      }
-  	  if (firstSel instanceof ServiceRef)
-      {
-  	    ServiceRef serviceRef = (ServiceRef)firstSel;
-        return J2EEActionAdapterFactory.getWSDLURI(serviceRef);
-      }
-  	  if (firstSel instanceof WSDLResourceImpl)
-  	  {
-  	    WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel;
-  	    return J2EEActionAdapterFactory.getWSDLURI(wsdlRI);
-  	  }
-  	  if (firstSel instanceof String)
-  	    return (String)firstSel;
-  	}
-    return "";
-  }
- 
-  public void setInitialSelection( IStructuredSelection selection )
-  {
-    selection_ = selection;   
-  }
-  
-  public boolean getGenWSIL()
-  {
-    return false;
-  }
-  
-  public String getWsilURI()
-  {
-  	String wsURI = getWebServiceURI();
-  	if (wsURI != null && wsURI.length() > 0 && wsURI.endsWith("wsdl"))
-  	{
-      StringBuffer sb = new StringBuffer(wsURI.substring(0, wsURI.length()-4));
-      sb.append("wsil");
-      return sb.toString();
-  	}
-    return "";
-  }
-  
-  public IProject getProject()
-  {
-  	IProject p = getProjectFromInitialSelection(selection_);
-  	return p;
-  }
-  
-  public String getComponentName()
-  {
-    String cname = getComponentNameFromInitialSelection(selection_);
-    return cname;
-  }
-  
-  private IProject getProjectFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-          if (comp!=null)
-          {
-            return comp.getName();
-          }
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
deleted file mode 100644
index e05e8fd19..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWrapper;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor
-{
-  private WSDLSelectionWidget wsdlSelectionWidget;
-  private IProject project;
-  private String componentName;
-  
-  public WSDLSelectionWidgetWrapper()
-  {
-  }
-  
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    wsdlSelectionWidget = new WSDLSelectionWidget();
-    wsdlSelectionWidget.addControls(parent, statusListener);
-    return this;
-  }
-  
-  public IStatus getStatus()
-  {
-    return wsdlSelectionWidget.getStatus();
-  }
-  
-  public void setWebServiceURI(String wsUri)
-  {
-    IStructuredSelection sel;
-    if (wsUri != null)
-      sel = new StructuredSelection(wsUri);
-    else
-      sel = new StructuredSelection();
-    wsdlSelectionWidget.setInitialSelection(sel);
-  }
-  
-  public String getWebServiceURI()
-  {
-    IStructuredSelection sel    = wsdlSelectionWidget.getObjectSelection();
-    Object               object = sel.getFirstElement();
-    String               result = null;
-    
-    if (object != null )
-    {
-      if( object instanceof WSDLSelectionWrapper )
-      {    
-        // Get at the inner structured selection object.
-        WSDLSelectionWrapper wrapper        = (WSDLSelectionWrapper)object;
-        IStructuredSelection innerSelection = wrapper.wsdlSelection;
-        Object               innerObject    = innerSelection.getFirstElement();
-        
-        result = innerObject == null ? null : innerObject.toString();
-      }
-      else
-      {
-        result = object.toString();
-      }
-    }
-    
-    return result;
-  }
-  
-  public String getWsdlURI()
-  {
-  	return getWebServiceURI();
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    return wsdlSelectionWidget.getWebServicesParser();
-  }
-  
-  public void setProject(IProject project)
-  {
-  	this.project = project;
-  }
-  
-  public IProject getProject()
-  {
-  	IProject p = wsdlSelectionWidget.getProject();
-  	if (p==null)
-  	{
-  	  return project;
-  	}
-  	else
-  	  return p;
-  }
-
-  public String getComponentName()
-  {
-    String cname = wsdlSelectionWidget.getComponentName();
-    if (cname==null)
-    {
-      return componentName;
-    }
-    else
-      return cname;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName = componentName;
-  }
-  
-    
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
deleted file mode 100644
index d0e1d20fb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
+++ /dev/null
@@ -1,110 +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.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor
-{     
-  /*CONTEXT_ID PWPR0013 for the Wizard Scenario Client group of the Project Page*/
-  private String INFOPOP_PWPR_GROUP_SCENARIO_CLIENT = "PWPR0013";
-  
-  /*CONTEXT_ID PWPR0014 for the Web Service Client Type combo box of the Project Page*/
-  private String INFOPOP_PWPR_COMBO_CLIENTTYPE = "PWPR0014";
-  private Combo  clientTypeCombo_;
-      
-  private TypeRuntimeServer ids_;
-  private LabelsAndIds      labelIds_;
-    
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    UIUtils      utils    = new UIUtils( msgUtils, pluginId );
-  	
-    Group clientGroup = utils.createGroup( parent, 
-                                           "GROUP_SCENARIO_CLIENT",
-                                           "TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT", 
-                                           INFOPOP_PWPR_GROUP_SCENARIO_CLIENT,
-										   2, 10, 10 );
-                                             
-    
-    int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY;
-    clientTypeCombo_ = utils.createCombo( clientGroup, 
-                                          "LABEL_WEBSERVICECLIENTTYPE",
-                                          "TOOLTIP_PWPR_COMBO_CLIENTTYPE", 
-                                          INFOPOP_PWPR_COMBO_CLIENTTYPE, 
-                                          comboStyle );
-                                            
-    
-    
-    return this;
-  }
-  
-  public void enableWidget( boolean enable )
-  {
-    clientTypeCombo_.setEnabled( enable );
-  }
-
-  public void setTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-		// rskreg
-    //WebServiceClientTypeRegistry registry   = WebServiceClientTypeRegistry.getInstance();
-    //LabelsAndIds                 labelIds   = registry.getClientTypeLabels();
-		LabelsAndIds                 labelIds   = WebServiceRuntimeExtensionUtils.getClientTypeLabels();
-    int                          selection  = 0;
-    String[]                     clientIds  = labelIds.getIds_();
-    String                       selectedId = ids.getTypeId();
-    
-		// rskreg
-    clientTypeCombo_.setItems( labelIds.getLabels_() );
-    
-    // Now find the selected one.
-    for( int index = 0; index < clientIds.length; index++ )
-    {
-      if( selectedId.equals( clientIds[index ]) )
-      {
-        selection = index;
-        break;
-      }
-    }
-    
-    clientTypeCombo_.select( selection );
-    ids_      = ids;  
-    labelIds_ = labelIds;
-  }
-  
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    int selectionIndex = clientTypeCombo_.getSelectionIndex();
-    
-    ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-    
-    return ids_;  
-  }
-      
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
deleted file mode 100644
index 83941f9ce..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,404 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetWrapper;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-
-public class ClientWidgetBinding implements CommandWidgetBinding
-{  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new ClientRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {    
-    // Before ClientWizardWidget
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidget.class );
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidget.class);
-    dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class );
-    
-    // After ClientWizardWidget
-    dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-            
-    // Before ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientRuntimeSelectionWidget.class, "J2EEVersion", null);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientRuntimeSelectionWidget.class,"NeedEAR",null);
-    
-    // After ClientRuntimeSelectionWidget
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "J2EEVersion", ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", null);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class); 
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-    
-    // The ClientRuntimeSelectionWidget can control what client extension comes up.
-    dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-    
-    // Before WSDLSelectionWidgetWrapper
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionWidgetWrapper.class );
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionWidgetWrapper.class );
-    dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionWidgetWrapper.class );
-    
-    // After WSDLSelectionWidgetWrapper
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WsdlURI", WSDLSelectionOutputCommand.class);
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WebServicesParser", WSDLSelectionOutputCommand.class);
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "Project", WSDLSelectionOutputCommand.class);
-    dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "ComponentName", WSDLSelectionOutputCommand.class);
-        
-    // Before Client Test widget.
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
-    dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
-    // After the client test widget   
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class);
-    
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-        
-    widgetRegistry.add( "ClientWizardWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
-                        msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ClientWizardWidget();
-				          }
-				        } );
-    
-    widgetRegistry.add( "ClientRuntimeSelectionWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION"),
-						new WidgetContributorFactory()
-                        {
-						  public WidgetContributor create()
-						  {
-						    return new ClientRuntimeSelectionWidget();
-						  }
-						} );
-    
-    widgetRegistry.add( "WSDLSelectionWidgetWrapper", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
-		                new WidgetContributorFactory()
-                        {
-		                  public WidgetContributor create()
-		                  {
-		                    return new WSDLSelectionWidgetWrapper();
-		                  }
-		                } );
-    
-    widgetRegistry.add( "ClientTestWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ClientTestWidget(); 
-                          }
-                        });
-  }
-  
-  private class ClientRootCommandFragment extends SequenceFragment
-  {
-    public ClientRootCommandFragment()
-    {
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-      
-      //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
-      add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-      add( new SimpleFragment( "ClientWizardWidget" ) );
-	  //add( new TestCommandFactoryFragment() );
-      add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "WSDLSelectionWidgetWrapper" ) );
-      add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
-      add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
-      add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
-	  //add( new TestCommandFactoryFragment2() );
-      add( new SimpleFragment( "ClientRuntimeSelectionWidget" ) );
-      //add( new SimpleFragment( new CheckForServiceProjectCommand(), ""));
-      add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
-      //add(new SimpleFragment(new ClientServerDeployableConfigCommand(false), "")); //Note: added here for client      
-      //add( new ClientExtensionFragment() );
-	  add( new ClientRootFragment() );
-      add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
-      add( new SimpleFragment(new GetMonitorCommand(), ""));
-      add( new SimpleFragment(new TestDefaultingFragment(),""));
-      add( new ClientTestFragment( "ClientTestWidget") ); 
-      add(new FinishFragment());
-      
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      //Map SelectionCommand
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "InitialInitialSelection", null);
-      
-      // Map ClientWizardWidgetDefaultingCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", WSDLSelectionOutputCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);   
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);           
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);      
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "MonitorService", GetMonitorCommand.class);
-      
-      // Map ClientRuntimeSelectionWidgetDefaultingCommand command
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); 
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", CheckForServiceProjectCommand.class);
-      
-      // Map WSDLSelectionWidgetDefaultingCommand command.
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionOutputCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionOutputCommand.class);
-      
-      // WSDLSelectionOutputCommand
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", GetMonitorCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", GetMonitorCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
-      dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);      
-	  
-	  // Setup the PreClientDevelopCommand.
-			//
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);           
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);						
-			//
-	    dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
-	    dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class );
-      
-			dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
-			
-      // Map ClientExtensionDefaultingCommand command.
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-           
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-            
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );     
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);      
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
-	  
-      // GetMonitorCommand
-      dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class);
-
-      // MAP post server config call      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-      
-      // Map WebServiceClientTestArrivalCommand command.
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-      
-            
-      //Mappings to enable peek-ahead for Page 3 of the client wizard
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DevelopClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DevelopClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", AssembleClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", AssembleClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DeployClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DeployClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", InstallClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", InstallClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", InstallClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", InstallClientFragment.class );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", InstallClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", InstallClientFragment.class, "Ear", null );
-    
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", RunClientFragment.class );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Project", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", RunClientFragment.class, "Module", null );  
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "EarProject", null );
-      dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", RunClientFragment.class, "Ear", null );      
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
deleted file mode 100644
index 6e4b80779..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
+++ /dev/null
@@ -1,139 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- * 
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding 
-{
-  
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
-
-    String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-    
-    widgetRegistry.add("ConfigClientHandlersTableWidget", 
-        msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"), 
-        msgUtils.getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"), 
-        new WidgetContributorFactory() {
-
-      	public WidgetContributor create() {
-      	  return new ConfigClientHandlersTableWidget();
-      	}
-    });
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-    
-    
-//    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"AllHandlers", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"Handlers", ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", null);
-    
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-    
-    //dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"AllHandlersList", ClientHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class,"HandlersTable",null);
-    
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-    
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() {
-    return new CommandFragmentFactory() {
-
-      public CommandFragment create() {
-
-        return new ClientHandlersConfigCommandFragment();
-      }
-    };
-  }
-
-  private class ClientHandlersConfigCommandFragment extends SequenceFragment{
-   
-    public ClientHandlersConfigCommandFragment()
-    {
-      add( new SimpleFragment( new ClientHandlersWidgetDefaultingCommand(), "" ));
-      add( new SimpleFragment( "ConfigClientHandlersTableWidget" ) );
-      add( new SimpleFragment( new ClientHandlersWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
-      add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-    }
- 
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
deleted file mode 100644
index ecbbc351c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
+++ /dev/null
@@ -1,139 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- * 
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding {
-  
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
-
-    String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-    
-    widgetRegistry.add("ConfigServiceHandlersTableWidget", 
-        msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"), 
-        msgUtils.getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"), 
-        new WidgetContributorFactory() {
-
-      	public WidgetContributor create() {
-      	  return new ConfigServiceHandlersTableWidget();
-      	}
-    });
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-    
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-    
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-    
-    
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlersList", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-    
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
- 
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
-    dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-   
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() {
-    return new CommandFragmentFactory() {
-
-      public CommandFragment create() {
-
-        return new ServiceHandlersConfigCommandFragment();
-      }
-    };
-  }
-
-  private class ServiceHandlersConfigCommandFragment extends SequenceFragment{
-   
-    public ServiceHandlersConfigCommandFragment()
-    {
-      add( new SimpleFragment( new ServiceHandlersWidgetDefaultingCommand(), "" ));
-      add( new SimpleFragment( "ConfigServiceHandlersTableWidget" ) );
-      add( new SimpleFragment( new ServiceHandlersWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
-      add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-      
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-      
-      
-    }
- 
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
deleted file mode 100644
index ef14da7a8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,245 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding {
-
-
-  public ConfigureHandlersWidgetBinding() {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create() {
-    return new CommandFragmentFactory() {
-
-      public CommandFragment create() {
-        return new HandlersCommandFragment();
-      }
-    };
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
-  }
-
-  /*
-   * (non-Javadoc),
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
-    // Map client-side widgets to commands
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "Handlers", ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", null);
-
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ServiceRefName", ConfigClientHandlersTableWidget.class);
-    dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class, "HandlersTable", null);
-
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
-    dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-    // Map service-side widgets to commands
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "DescriptionName", ConfigServiceHandlersTableWidget.class);
-
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlersList", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
-    dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
-    String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-
-    widgetRegistry.add("ConfigServiceHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"), msgUtils
-        .getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"), new WidgetContributorFactory() {
-
-      public WidgetContributor create() {
-        return new ConfigServiceHandlersTableWidget();
-      }
-    });
-
-    widgetRegistry.add("ConfigClientHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"), msgUtils
-        .getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"), new WidgetContributorFactory() {
-
-      public WidgetContributor create() {
-        return new ConfigClientHandlersTableWidget();
-      }
-    });
-
-  }
-
-  private class HandlersCommandFragment extends SequenceFragment {
-
-    public HandlersCommandFragment() {
-
-      add(new SimpleFragment(new HandlersDefaultingCommand(), ""));
-
-      add(new ServiceHandlersFragment());
-      add(new ClientHandlersFragment());
-    }
-
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", HandlersDefaultingCommand.class);
-
-      dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsClientHandler", ClientHandlersFragment.class, "ClientHandlersEnabled", null);
-      dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsServiceHandler", ServiceHandlersFragment.class, "ServiceHandlersEnabled", null);
-
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);      
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-     
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-    }
-
-    public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
-    }
-  }
-
-  private class ClientHandlersFragment extends BooleanFragment {
-
-    boolean isClient_ = false;
-
-    public ClientHandlersFragment() {
-      setCondition(new Condition() {
-
-        public boolean evaluate() {
-          return isClient_;
-        }
-      });
-
-      SequenceFragment clientHandlersRootFragment = new SequenceFragment();
-
-      clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetDefaultingCommand(), ""));
-
-      clientHandlersRootFragment.add(new SimpleFragment("ConfigClientHandlersTableWidget"));
-      clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetOutputCommand(), ""));
-      clientHandlersRootFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
-      setTrueFragment(clientHandlersRootFragment);
-    }
-
-    public void setClientHandlersEnabled(boolean isClient) {
-      isClient_ = isClient;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "WsClientResource", ClientHandlersWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ClientProject", ClientHandlersWidgetOutputCommand.class);
-
-    }
-
-  }
-
-  private class ServiceHandlersFragment extends BooleanFragment {
-
-    boolean isService_ = false;
-
-    public ServiceHandlersFragment() {
-      setCondition(new Condition() {
-
-        public boolean evaluate() {
-          return isService_;
-        }
-      });
-
-      SequenceFragment serviceHandlersRootFragment = new SequenceFragment();
-      serviceHandlersRootFragment.add(new SimpleFragment(new ServiceHandlersWidgetDefaultingCommand(), ""));
-
-      SequenceFragment serviceHandlersFragment = new SequenceFragment();
-      serviceHandlersFragment.add(new SimpleFragment("ConfigServiceHandlersTableWidget"));
-      serviceHandlersFragment.add(new SimpleFragment(new ServiceHandlersWidgetOutputCommand(), ""));
-      serviceHandlersFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
-      serviceHandlersRootFragment.add(serviceHandlersFragment);
-
-      setTrueFragment(serviceHandlersRootFragment);
-    }
-
-    public void setServiceHandlersEnabled(boolean isService) {
-      isService_ = isService;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry) {
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
-      dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-    }
-
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
deleted file mode 100644
index 6ee84f190..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,403 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-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.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestWebServiceClient;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-
-
-public class GenSampleWidgetBinding implements CommandWidgetBinding
-{  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new GenSampleRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {                    
-    // Before Client Test widget.
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
-    dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
-    // After the client test widget   
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class);
-    
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-            
-    widgetRegistry.add( "ClientTestWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
-                        msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ClientTestWidget(); 
-                          }
-                        });
-  }
-  
-  private class InitializeProxyCommand extends AbstractDataModelOperation
-  {
-    private IStructuredSelection selection_;
-	private TypeRuntimeServer typeRuntimeServer_;
-	private String            project_;
-	private String            module_;
-	private String            earProject_;
-	private String            ear_;
-	private IWebServiceClient webServiceClient_;
-	private String            j2eeLevel_;
-	private String            wsdlURI_;
-    
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-      Environment env = getEnvironment();
-	    IStatus status = Status.OK_STATUS;	
-	  
-      // Split up the project and module
-      int index = module_.indexOf("/");
-      if (index!=-1){
-        project_ = module_.substring(0,index);
-        module_ = module_.substring(index+1);
-      }
-
-      if (ear_!=null && ear_.length()>0)
-      {
-        int earIndex = ear_.indexOf("/");
-        if (earIndex!=-1) {
-          earProject_ = ear_.substring(0,earIndex);
-          ear_ = ear_.substring(earIndex+1);
-        }
-      }    
-	  
-	  WebServiceClientInfo clientInfo = new WebServiceClientInfo();
-	  clientInfo.setImplURL(getProxyBean());
-	  clientInfo.setJ2eeLevel(j2eeLevel_);
-	  clientInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
-	  clientInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-	  clientInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-	  clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
-	  clientInfo.setWsdlURL(wsdlURI_);
-	  if (clientInfo.getServerInstanceId()==null)
-	  {
-	    CreateServerCommand createServerCommand = new CreateServerCommand();
-	    createServerCommand.setServerFactoryid(clientInfo.getServerFactoryId());
-      createServerCommand.setEnvironment( env );
-	    IStatus createServerStatus = createServerCommand.execute( null, null );
-	    if (createServerStatus.getSeverity()==Status.OK){
-	      clientInfo.setServerInstanceId(createServerCommand.getServerInstanceId());
-	    }
-	    else if (createServerStatus.getSeverity()==Status.ERROR){
-	      env.getStatusHandler().reportError(  createServerStatus );
-	    }               
-	    
-	  }
-	  
-	  AddModuleToServerCommand command = new AddModuleToServerCommand();
-      command.setServerInstanceId(clientInfo.getServerInstanceId());
-      if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
-      {
-        command.setProject(earProject_);
-        command.setModule(ear_);
-      }
-      else
-      {
-        command.setProject(project_);
-        command.setModule(module_);       
-      }
-
-      command.setEnvironment( env );
-      status = command.execute( monitor, null );
-      if (status.getSeverity()==Status.ERROR)
-      {
-        env.getStatusHandler().reportError(status);
-      }     
-
-	  webServiceClient_ = new TestWebServiceClient(clientInfo);
-	  return status;
-	}
-	
-	public String getProxyBean()
-    {
-      String proxyBean = "";
-      
-      try
-      {
-        IResource resource    = ResourceUtils.getResourceFromSelection( selection_.getFirstElement() );
-        String    beanPackage = ResourceUtils.getJavaResourcePackageName( resource.getFullPath() );
-        
-        if( beanPackage==null )
-          beanPackage = "";
-        else
-          beanPackage = beanPackage + ".";
-
-        proxyBean = beanPackage + resource.getName();
-
-        if( proxyBean.toLowerCase().endsWith(".java") || proxyBean.toLowerCase().endsWith(".class")) 
-        {
-          proxyBean = proxyBean.substring(0,proxyBean.lastIndexOf('.'));
-        }
-      }
-      catch( CoreException exc )
-      {        
-      }
-      
-      return proxyBean;
-    }
-    
-	public IWebServiceClient getWebServiceClient()
-	{
-	  return webServiceClient_;
-	}
-	
-    public boolean getGenerateProxy()
-    {
-      return true;
-    }
-    
-	public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-	{
-      typeRuntimeServer_ = typeRuntimeServer;  
-	}
-	  
-	public void setClientJ2EEVersion( String j2eeLevel )
-	{
-	  j2eeLevel_ = j2eeLevel;  
-	}
-	
-	public void setModule( String module )
-	{
-	  module_ = module;
-	}
-	  
-	public void setModuleType( String moduleType)
-	{
-	}
-	
-	public void setResourceContext( ResourceContext resourceContext )
-	{
-	}
-	
-	public void setInitialSelection( IStructuredSelection selection )
-    {
-      selection_ = selection;  
-    }
-  }
-  
-  private class GenSampleRootCommandFragment extends SequenceFragment
-  {
-    public GenSampleRootCommandFragment()
-    {
-      add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
-      add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
-      add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
-      add( new SimpleFragment( new InitializeProxyCommand(), "" ));
-      add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
-      add( new SimpleFragment( new TestDefaultingFragment(),""));
-      add( new ClientTestFragment( "ClientTestWidget") ); 
-      add( new FinishFragment() );
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      //Map SelectionCommand
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", InitializeProxyCommand.class );
-      
-      // Map ClientWizardWidgetDefaultingCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class, "TestService", new ForceTrue() );
-      dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-      
-      // Map ClientWizardWidgetOutputCommand command.
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      // Map ClientRuntimeSelectionWidgetDefaultingCommand command
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class); 
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);   
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      
-      // Map WSDLSelectionWidgetDefaultingCommand command.
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientExtensionDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-             
-      // Map ClientExtensionDefaultingCommand command.
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-           
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-      
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );     
-
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ServiceServerInstanceId", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-      
-	  dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", InitializeProxyCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", InitializeProxyCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", InitializeProxyCommand.class, "Module", null );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", InitializeProxyCommand.class, "ModuleType", null);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", InitializeProxyCommand.class, "Ear", null );
-      dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", InitializeProxyCommand.class);
-	  dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", InitializeProxyCommand.class );
-	  
-	  
-	  
-	  
-      // Map InitializeProxyCommand command.
-      dataRegistry.addMapping(InitializeProxyCommand.class, "WebServiceClient", ClientExtensionOutputCommand.class);      
-      dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-      
-      // Map ClientExtensionOutputCommand command.
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);      
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-	  
-      // MAP post server config call      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EARProjectName", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-            
-      
-      // Map WebServiceClientTestArrivalCommand command.
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-      
-      
-    }
-  }
-  
-  private class ForceTrue implements Transformer
-  {
-    public Object transform(Object value) 
-    {
-      return new Boolean(true);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
deleted file mode 100644
index 5cf4625c7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
+++ /dev/null
@@ -1,90 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class ImportWSILWidgetBinding implements CommandWidgetBinding
-{
-  public ImportWSILWidgetBinding()
-  {
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               SequenceFragment root = new SequenceFragment();
-               root.add(new SimpleFragment("ImportWSILWidget"));
-               root.add(new SimpleFragment(new AddWSDLToWSILWrapperCommand(), ""));
-               return root;  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {    
-    // ImportWSILWidget
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ImportWSILWidget.class);
-    
-    // AddWSDLToWSILWrapperCommand
-    dataRegistry.addMapping(ImportWSILWidget.class, "GenWSILArguments", AddWSDLToWSILWrapperCommand.class, "Args", null);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
-    widgetRegistry.add("ImportWSILWidget", 
-      msgUtils.getMessage("TITLE_WSIL_IMPORT"),
-      msgUtils.getMessage("DESC_WSIL_IMPORT"),
-      new WidgetContributorFactory()
-      {
-        public WidgetContributor create()
-        {
-          return new ImportWSILWidget();
-        }
-      }
-    );
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
deleted file mode 100644
index eeaf6294e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
+++ /dev/null
@@ -1,105 +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.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ImportWSWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ImportWSWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               SequenceFragment root = new SequenceFragment();
-               root.add(new SimpleFragment("WSImport"));
-               root.add(publishToPrivateUDDICmdFrag);
-               root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
-               return root;  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    this.dataMappingRegistry = dataRegistry;
-    publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    this.widgetRegistry = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("WSImport", 
-      msgUtils.getMessage("PAGE_TITLE_WS_FIND"),
-      msgUtils.getMessage("PAGE_DESC_WS_FIND"),
-      new WidgetContributorFactory()
-      {
-        public WidgetContributor create()
-        {
-          return new PublishWSWidget(false);
-        }
-      }
-    );
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
deleted file mode 100644
index 676e74f46..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,413 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ClientExtensionDefaultingCommand extends AbstractDataModelOperation
-{
-  // ClientWizardWidget
-  private TypeRuntimeServer    clientIds_;
-  private Boolean              testService;
-  private ResourceContext      resourceContext;
-  
-  // ClientRuntimeSelectionWidget
-  private SelectionListChoices clientChoices_;
-  private String clientProjectName_;
-  private String clientEarProjectName_;
-  private String clientComponentName_;
-  private String clientEarComponentName_;
-  private String clientComponentType_;
-  private String j2eeVersion;
-  private boolean clientNeedEAR_;
-  
-  private String serviceServerFactoryId_;
-  private String serviceServerInstanceId_;
-  
-  // WSDLSelectionWidget
-  private boolean           genWSIL;
-  private String            wsilURI;
-  
-  // WSDLSelectionConditionCommand
-  private WebServicesParser webServicesParser;
-  
-  // WSDLSelectionTreeWidget
-  private String            wsdlURI;
-  
-  private boolean           isClientScenario_;
-  private boolean           genProxy_ = true;
-  private String launchedServiceTestName;
-  
-  //ServerDeployableConfigurationCommand
-  private String serverInstId_;
-  
-  public ClientExtensionDefaultingCommand( boolean isClientScenario )
-  {
-    isClientScenario_ = isClientScenario;
-  }
-
-  /**
-   * 
-   * @return returns true if this command is running in the client wizard and
-   * false if this command is running in the create web service wizard.
-   */
-  public boolean getIsClientScenario()
-  {
-    return isClientScenario_; 
-  }
-  
-  
-  public void setRuntime2ClientTypes( SelectionListChoices choices )
-  {
-    clientChoices_ = choices;  
-  }
-  
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    return clientChoices_;  
-  }
-  
-  
-  public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    clientIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-	if (clientIds_.getServerInstanceId()==null || clientIds_.getServerInstanceId().length()==0)
-	{
-		//Set the instance id from the service side if the factory ids match
-		if (serviceServerInstanceId_!=null && serviceServerInstanceId_.length()>0)
-		{
-			if (serviceServerFactoryId_!=null && serviceServerFactoryId_.length()>0)
-			{
-				if (serviceServerFactoryId_.equals(clientIds_.getServerId()))
-				{
-					clientIds_.setServerInstanceId(serviceServerInstanceId_);
-				}
-			}
-		}
-	}
-    return clientIds_;
-  }
-  
-  public void setServiceExistingServerInstId(String serverInstId) {
-  	this.serverInstId_ = serverInstId;
-  }
-  
-  public String getServiceExistingServerInstId(){
-  	return this.serverInstId_;
-  }
-  
-  /**
-   * @return Returns the clientIsExistingServer.
-   */
-  public boolean isClientIsExistingServer()
-  {
-    return clientIds_.getServerInstanceId() != null;
-  }
-
-  /**
-   * @return Returns the clientProject.
-   */
-  public String getClientProject()
-  {
-	  return clientProjectName_ + "/" + clientComponentName_;
-  }
-
-  /**
-   * @return Returns the clientProjectEAR.
-   */
-  public String getClientProjectEAR()
-  {
-    if (clientEarProjectName_!=null && clientEarProjectName_.length()>0 
-        && clientEarComponentName_!=null && clientEarComponentName_.length()>0)
-    {
-	    return clientEarProjectName_ + "/" + clientEarComponentName_;
-    }
-    else
-    {
-      return "";
-    }
-  }
-  
-  /*
-  private String getModuleProjectName( String projectName )
-  {
-	String result = "";
-	
-	if( projectName != null && !projectName.equals("") )
-	{
-	  IPath    projectPath = new Path( projectName );
-	  IProject project     = (IProject)ResourceUtils.findResource( projectPath );
-	  String   moduleName  = J2EEUtils.getFirstWebModuleName( project );
-	  
-	  result = projectName + "/" + moduleName;
-	}
-	
-	return result;
-  }
-  */
-  /**
-   * @return Returns the clientProjectType.
-   */
-  
-  public String getClientProjectType()
-  {
-    //return clientChoices_.getChoice().getList().getSelection();
-    return clientComponentType_;
-  }
-  
-  /**
-   * @return Returns the clientRuntime.
-   */
-  public String getClientRuntime()
-  {
-    return clientIds_.getRuntimeId();
-  }
-
-  /**
-   * @return Returns the clientServer.
-   */
-  public String getClientServer()
-  {
-    return clientIds_.getServerId();
-  }
-  
-  public String getClientServerInstance()
-  {
-    return clientIds_.getServerInstanceId();    
-  }
-
-  public void setClientExistingServerInstanceId(String serverInstId){
-    
-    if (clientIds_.getServerInstanceId()==null)
-      clientIds_.setServerInstanceId(serverInstId);
-  }
-  
-  /**
-   * @return Returns the genWSIL.
-   */
-  public boolean isGenWSIL()
-  {
-    return genWSIL;
-  }
-
-  /**
-   * @param genWSIL
-   *            The genWSIL to set.
-   */
-  public void setGenWSIL(boolean genWSIL)
-  {
-    this.genWSIL = genWSIL;
-  }
-
-  /**
-   * @return Returns the resourceContext.
-   */
-  public ResourceContext getResourceContext()
-  {
-    return resourceContext;
-  }
-
-  /**
-   * @param resourceContext
-   *            The resourceContext to set.
-   */
-  public void setResourceContext(ResourceContext resourceContext)
-  {
-    this.resourceContext = resourceContext;
-  }
-
-  /**
-   * @return Returns the testProxySelected.
-   */
-  public Boolean getTestService()
-  {
-    return testService;
-  }
-
-  /**
-   * @param testProxySelected
-   *            The testProxySelected to set.
-   */
-  public void setTestService(Boolean testService)
-  {
-    this.testService = testService;
-  }
-
-  /**
-   * @return Returns the wsdlURI.
-   */
-  public String getWsdlURI()
-  {
-    return wsdlURI;
-  }
-
-  /**
-   * @param wsdlURI
-   *            The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  /**
-   * @return Returns the wsilURI.
-   */
-  public String getWsilURI()
-  {
-    return wsilURI;
-  }
-
-  /**
-   * @param wsilURI
-   *            The wsilURI to set.
-   */
-  public void setWsilURI(String wsilURI)
-  {
-    this.wsilURI = wsilURI;
-  }
-
-  /**
-   * @return Returns the webServicesParser.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if (webServicesParser != null)
-      return webServicesParser;
-    else
-      return new WebServicesParserExt();
-  }
-
-  /**
-   * @param webServicesParser
-   *            The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  /**
-   * @return Returns the j2eeVersion.
-   */
-  public String getClientJ2EEVersion()
-  {
-	  return j2eeVersion;
-  }
-
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setClientJ2EEVersion(String version)
-  {
-	  j2eeVersion = version;
-  }
-  
-  /**
-   * 
-   * @return returns true if a proxy should be generated and false otherwise.
-   */
-  public boolean getGenerateProxy()
-  {
-    return genProxy_;
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    genProxy_ = genProxy;
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-
-  /**
-   * 
-   * @return returns the name of the test facility to launch.
-   */
-  public String getLaunchedServiceTestName()
-  {
-  	return launchedServiceTestName;
-  }
-  
-  /**
-   * 
-   * @return returns true if the client project needs an EAR project.
-   */
-  public boolean getClientNeedEAR()
-  {
-    return clientNeedEAR_;
-  }
-  
-  public void setClientNeedEAR(boolean clientNeedEAR)
-  {
-    clientNeedEAR_ = clientNeedEAR;
-  }
-
-  
-  public void setClientComponentType(String clientComponentType)
-  {
-    this.clientComponentType_ = clientComponentType;
-  }
-
-  public void setClientProjectName(String clientProjectName)
-  {
-    this.clientProjectName_ = clientProjectName;
-  }
-
-  public void setClientComponentName(String clientComponentName)
-  {
-    this.clientComponentName_ = clientComponentName;
-  }
-
-  public void setClientEarProjectName(String clientEarProjectName)
-  {
-    this.clientEarProjectName_ = clientEarProjectName;
-  }
-  
-  public void setClientEarComponentName(String clientEarComponentName)
-  {
-    this.clientEarComponentName_ = clientEarComponentName;
-  }
-  
-  public String getClientEarProjectName()
-  {
-    return clientEarProjectName_;
-  }
-  
-  public String getClientEarComponentName()
-  {
-    return clientEarComponentName_;
-  }
-  
-  public void setServiceServerFactoryId(String id)
-  {
-  	serviceServerFactoryId_ = id;
-  }
-
-  public void setServiceServerInstanceId(String id)
-  {
-  	serviceServerInstanceId_ = id;
-  }
-  
-  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
deleted file mode 100644
index 7fcd8b265..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
+++ /dev/null
@@ -1,40 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ClientExtensionFragment extends ExtensionFragment
-{  
-  public ClientExtensionFragment()
-  {
-  }
-  
-  protected ClientExtensionFragment( ClientExtensionFragment fragment )
-  {
-    super( fragment );  
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ClientExtensionFragment( this );
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
deleted file mode 100644
index 4068f1dd1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class ClientExtensionOutputCommand extends AbstractDataModelOperation
-{
-  private IWebServiceClient webServiceClient_;
-  
-  /**
-   * @return Returns the proxyBean.
-   */
-  
-  public String getProxyBean()
-  {
-    return webServiceClient_.getWebServiceClientInfo().getImplURL();
-  }
-    
-  public boolean getGenerateProxy()
-  {
-	return true;
-  }
-  
-  /**
-   * @return Returns the setEndpointMethod.
-   */
-  public String getSetEndpointMethod()
-  {
-	return "setEndpoint";
-  }
-  	
-  public void setWebServiceClient(IWebServiceClient wsc)
-  {
-	webServiceClient_ = wsc;
-  }
-	
-  public String getServerInstanceId()
-  {
-	return webServiceClient_.getWebServiceClientInfo().getServerInstanceId();
-  }
-	
-  public String getServerFactoryId()
-  {
-	return webServiceClient_.getWebServiceClientInfo().getServerFactoryId();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
deleted file mode 100644
index 9440444b4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,282 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ServerExtensionDefaultingCommand extends AbstractDataModelOperation
-{
-  private Boolean              startService;
-  private Boolean              testService;
-  private Boolean              publishService;
-  private TypeRuntimeServer    serviceIds_;
-  //private SelectionListChoices serviceChoices_;
-  private String               serviceProjectName_;
-  private String               serviceEarProjectName_;
-  private String               serviceComponentName_;
-  private String               serviceEarComponentName_;
-  private String j2eeVersion;
-  private boolean serviceNeedEAR_;
-  private WebServicesParser wsdlParser_;
-  
-
-  
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    serviceIds_ = ids;
-  }
-
-  public void setServiceExistingServerInstanceId(String serverInstId){
-    
-    if (serviceIds_.getServerInstanceId()==null)
-      serviceIds_.setServerInstanceId(serverInstId);
-  }
-  
-  /**
-   * 
-   * @return returns the TypeRuntimeService object that the user has selected on
-   * page 3 of the wizard.
-   */
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return serviceIds_;
-  }
-
-  /*
-  public void setServiceProject2EARProject(SelectionListChoices choices)
-  {
-    serviceChoices_ = choices;
-  }
-  */
-
-  /**
-   * @return Returns the publishService.
-   */
-  public Boolean getPublishService()
-  {
-    return publishService;
-  }
-
-  /**
-   * @param publishService
-   *            The publishService to set.
-   */
-  public void setPublishService(Boolean publishService)
-  {
-    this.publishService = publishService;
-  }
-
-  /**
-   * @return Returns the serverIsExistingServer.
-   */
-  public boolean getServerIsExistingServer()
-  {
-    return serviceIds_.getServerInstanceId() != null;
-  }
-
-  /**
-
-   * @return Returns the serverInstanceId
-   */
-  public String getServiceServerInstanceId()
-  {
-    return serviceIds_.getServerInstanceId();
-  }
-  
-  /**
-   * @return Returns the serverProject.
-   */
-  public String getServerProject()
-  {
-    return serviceProjectName_ + "/" + serviceComponentName_; 
-  }
-  
-  /**
-   * @return Returns the serverProjectEAR.
-   */
-  public String getServerProjectEAR()
-  {
-    if (serviceEarProjectName_!=null && serviceEarProjectName_.length()>0 && 
-        serviceEarComponentName_!=null && serviceEarComponentName_.length()>0)
-    {
-      return serviceEarProjectName_ + "/" + serviceEarComponentName_;
-    }
-    else
-    {
-      return "";
-    }
-  }
-
-  /**
-   * @return Returns the serverRuntime.
-   */
-  public String getServerRuntime()
-  {
-    return serviceIds_.getRuntimeId();
-  }
-
-  /**
-   * @return Returns the serverServer.
-   */
-  public String getServerServer()
-  {
-    return serviceIds_.getServerId();
-  }
-
-  /**
-   * @return Returns the serviceScenarioId.
-   */
-  public String getServiceScenarioId()
-  {
-    return serviceIds_.getTypeId();
-  }
-
-  /**
-   * @return Returns the startService.
-   */
-  public Boolean getStartService()
-  {
-    return startService;
-  }
-
-  /**
-   * @param startService
-   *            The startService to set.
-   */
-  public void setStartService(Boolean startService)
-  {
-    this.startService = startService;
-  }
-
-  /**
-   * @return Returns the testService.
-   */
-  public Boolean getTestService()
-  {
-    return testService;
-  }
-
-  /**
-   * @param testService
-   *            The testService to set.
-   */
-  public void setTestService(Boolean testService)
-  {
-    this.testService = testService;
-  }
-
-  public Boolean getPublish()
-  {
-    return new Boolean(true);
-  }
-
-  /**
-   * @return Returns the j2eeVersion.
-   */
-  public String getServiceJ2EEVersion()
-  {
-  	return j2eeVersion;
-  }
-  
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setServiceJ2EEVersion(String version)
-  {
-  	j2eeVersion = version;
-  }
-  
-  /**
-   * 
-   * @return returns true if the web service project needs to be in an EAR project.
-   */
-  public boolean getServiceNeedEAR()
-  {
-    return serviceNeedEAR_;
-  }
-  
-  public void setServiceNeedEAR(boolean serviceNeedEAR)
-  {
-    serviceNeedEAR_ = serviceNeedEAR;
-  }  
-  
-  /**
-   * 
-   * @return returns true if the web service project is an EJB project.
-   */
-  public boolean getIsServiceProjectEJB()
-  {
-    //If the type/server/runtime suggests that an EJB project
-    //is required, return true.
-    boolean ejbRequired = false;
-    boolean ejbRequired2 = false;
-	// rskreg
-    //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-    if (serviceIds_ != null)
-    {      
-      //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceIds_.getServerId()).getId();
-	  //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceIds_.getServerId()).getId();
-      //ejbRequired = wssrtRegistry.requiresEJBModuleFor(serverTypeId, serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-	  ejbRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceIds_.getServerId(), serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-      //ejbRequired2 = wssrtRegistry.requiresEJBProject(serviceIds_.getTypeId()); 
-	  ejbRequired2 = WebServiceRuntimeExtensionUtils.requiresEJBProject(serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-    }
-
-	// rskreg
-    return (ejbRequired || ejbRequired2);    
-  }
-  
-  /**
-   * @return Returns the wsdlParser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if( wsdlParser_ == null )
-    {
-      wsdlParser_ = new WebServicesParserExt();  
-    }
-    
-    return wsdlParser_;
-  }
-  /**
-   * @param wsdlParser_ The wsdlParser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser wsdlParser )
-  {
-    wsdlParser_ = wsdlParser;
-  }
-  
-  
-  public void setServiceProjectName(String serviceProjectName)
-  {
-    this.serviceProjectName_ = serviceProjectName;
-  }
-
-  public void setServiceComponentName(String s)
-  {
-    serviceComponentName_ = s;
-  }
-
-  public void setServiceEarProjectName(String serviceEarProjectName)
-  {
-    this.serviceEarProjectName_ = serviceEarProjectName;
-  }
-  
-  public void setServiceEarComponentName(String s)
-  {
-    serviceEarComponentName_ = s;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
deleted file mode 100644
index 101cddece..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
+++ /dev/null
@@ -1,41 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ServerExtensionFragment extends ExtensionFragment
-{  
-  public ServerExtensionFragment()
-  {
-
-  }
-  
-  protected ServerExtensionFragment( ServerExtensionFragment fragment )
-  {
-    super( fragment );  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ServerExtensionFragment( this );
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
deleted file mode 100644
index 4f8f2a01f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
+++ /dev/null
@@ -1,105 +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.consumption.ui.widgets.extensions;
-
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class ServerExtensionOutputCommand extends AbstractDataModelOperation
-{
-  //private String            wsdlURI_;
-  private WebServicesParser wsdlParser_;
-	private IWebService 			webService_;
-  
-  private boolean isWebProjectStartupRequested_ = false;
-    
-  
-  /**
-   * @return Returns the wsdlURI.
-   */
-  public String getWsdlURI()
-  {
-    return webService_.getWebServiceInfo().getWsdlURL();
-  }
-
-  /**
-   * @param wsdlURI
-   *            The wsdlURI to set.
-   */
-	/*
-  public void setWsdlURI(String wsdlURI)
-  {
-    wsdlURI_ = wsdlURI;
-  }
-  */
-	
-	public void setWebService(IWebService ws)
-	{
-		webService_ = ws;
-	}
-	
-  /**
-   * @return Returns the wsdlParser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    if( wsdlParser_ == null )
-    {
-      wsdlParser_ = new WebServicesParserExt();  
-    }
-    
-    return wsdlParser_;
-  }
-  /**
-   * @param wsdlParser_ The wsdlParser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser wsdlParser_)
-  {
-    this.wsdlParser_ = wsdlParser_;
-  }
-/**
- * @param earProjectName The earProjectName to set.
- */
-public void setEarProjectName(String earProjectName) {
-}
-/**
- * @param existingServerId The existingServerId to set.
- */
-public void setExistingServerId(String existingServerId) {
-}
-
-/**
- * @return Returns the isRestartProjectNeeded.
- */
-public boolean getIsWebProjectStartupRequested() {
-	return isWebProjectStartupRequested_;
-}
-/**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
-public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
-	this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-}
-
-public String getServiceServerFactoryId()
-{
-	return webService_.getWebServiceInfo().getServerFactoryId();
-}
-
-public String getServiceServerInstanceId()
-{
-	return webService_.getWebServiceInfo().getServerInstanceId();
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
deleted file mode 100644
index cdb6e3b1f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
+++ /dev/null
@@ -1,45 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-
-
-public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataContributor implements IObjectSelectionWidget
-{
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    // subclass should override this method
-  }
-
-  public IStructuredSelection getObjectSelection()
-  {
-    // subclass should override this method
-    return new StructuredSelection();
-  }
-
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    //  subclass should override this method
-    return Status.OK_STATUS;
-  }
-
-  public IProject getProject()
-  {
-    //  subclass should override this method
-    return null;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
deleted file mode 100644
index 61f6e3a66..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class EJBSelectionTransformer implements Transformer
-{
-
-  public Object transform(Object value)
-  {
-    if (value instanceof IStructuredSelection)
-    {
-      Object sel = ((IStructuredSelection)value).getFirstElement();
-      if (sel instanceof EnterpriseBean)
-      {
-        return new StructuredSelection(((EnterpriseBean)sel).getName());
-      }
-    }
-    return value;
-  }
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
deleted file mode 100644
index 2caee32e8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,394 +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.consumption.ui.widgets.object;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Combo earList;
-  private EJBTableViewer beanList;
-  private IVirtualComponent[] earComponents;
-  //rskejb private EARNatureRuntime[] earProjects;
-  private Integer selectedBeanIndex = null;
-  private Vector ejbBeanNames;
-  private Vector ejbComponentNames;
-  private Vector ejbComponentProjectNames;
-  //rskejb private Vector ejbProjectNames;
-  private Listener  statusListener_;
-  /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */
-  private String INFOPOP_PEBD_EAR_PROJECTS = "org.eclipse.jst.ws.consumption.ui.PEBD0001";
-  /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */
-  private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "org.eclipse.jst.ws.consumption.ui.PEBD0002";
-
-  public EJBSelectionWidget()
-  {
-	earComponents = J2EEUtils.getAllEARComponents();
-    /* rskejb 
-    IProject[] projects = J2EEUtils.getEARProjects();
-	
-	
-    Vector earVector = new Vector();
-    for (int i = 0; i < projects.length; i++)
-    {
-      try
-      {
-        earVector.add(projects[i].getNature(IEARNatureConstants.NATURE_ID));
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-    earProjects = (EARNatureRuntime[]) earVector.toArray(new EARNatureRuntime[0]);
-	rskejb */
-  }
-
-  public String getSelectedBean()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }
-
-  public String getSelectedProject()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-    MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-    statusListener_  = statusListener;
-    Composite composite = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginHeight = 0;
-    layout.marginWidth = 0;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    composite.setLayout(layout);
-    composite.setLayoutData(gd);
-    Composite projectComposite = new Composite(composite, SWT.NONE);
-    layout = new GridLayout();
-    layout.numColumns = 2;
-    projectComposite.setLayout(layout);
-    projectComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-    new Label(projectComposite, SWT.NULL).setText(msgUtils.getMessage("LABEL_EAR_PROJECTS"));
-    earList = new Combo(projectComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    earList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    earList.addSelectionListener(new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent evt)
-      {
-        Combo widget = (Combo) (evt.widget);
-        setBeanList(earComponents[widget.getSelectionIndex()]);
-        selectedBeanIndex = null;
-        statusListener_.handleEvent(null);
-      }
-    });
-    addEARNamesToList();
-    earList.setToolTipText(msgUtils.getMessage("TOOLTIP_EAR_PROJECTS"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS);
-    Group beanComposite = new Group(composite, SWT.NONE);
-    layout = new GridLayout();
-    beanComposite.setLayout(layout);
-    beanComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-    beanComposite.setText(msgUtils.getMessage("LABEL_EJB_BEAN_NAME"));
-    beanList = new EJBTableViewer(beanComposite);
-    Table beanTable = beanList.getTable();
-    gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.heightHint = 100;
-    beanTable.setLayoutData(gd);
-    beanTable.addSelectionListener(new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent evt)
-      {
-        Table table = (Table) (evt.widget);
-        selectedBeanIndex = new Integer(table.getSelectionIndex());
-        statusListener_.handleEvent(null);
-      }
-    });
-    beanTable.setToolTipText(msgUtils.getMessage("TOOLTIP_TABLE_BEAN_NAMES"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES);
-    if (earComponents != null && earComponents.length > 0)
-    {
-      setBeanList(earComponents[0]);
-    }
-    beanTable.getColumn(0).pack();
-    beanTable.getColumn(1).pack();
-    // This is a dummy label that forces the status label into the second
-    // column.
-    new Label(composite, SWT.NULL).setText("");
-    return this;
-  }
-
-  private void addEARNamesToList()
-  {
-    if (earComponents != null && earComponents.length > 0)
-    {
-      for (int index = 0; index < earComponents.length; index++)
-      {
-        earList.add(earComponents[index].getName());
-      }
-      earList.setText(earList.getItem(0));
-    }
-  }
-
-  private void setBeanList(IVirtualComponent earComponent)
-  {
-    IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject(), earComponent.getName());
-    Table beanTable = beanList.getTable();
-    beanTable.removeAll();
-    ejbBeanNames = new Vector();
-    ejbComponentNames = new Vector();
-    ejbComponentProjectNames = new Vector();
-    for (int index = 0; index < ejbComponentsArray.length; index++)
-    {
-      EJBArtifactEdit  ejbEdit = null;
-      try {
-        ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponentsArray[index]);
-        EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-        EJBJar jar = ejbRes.getEJBJar();
-        Vector beans = J2EEUtils.getBeanNames(jar);
-        String componentName = ejbComponentsArray[index].getName();
-        String projectName = ejbComponentsArray[index].getProject().getName();
-        ejbBeanNames.addAll(beans);
-        ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName));
-        ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName));                
-      }
-      finally {
-        if (ejbEdit!=null)
-          ejbEdit.dispose();
-      }      
-    }
-    beanList.setData(ejbBeanNames, ejbComponentNames);
-    beanList.setInput(ejbBeanNames);    
-    
-  }
-  
-  /*
-   * @deprecated
-   */
-  /*
-  private void setBeanList(EARNatureRuntime earProject)
-  {
-    Vector ejbProjects = J2EEUtils.getEJBProjects(earProject);
-    Table beanTable = beanList.getTable();
-    beanTable.removeAll();
-    ejbBeanNames = new Vector();
-    //rskejb ejbProjectNames = new Vector();
-    ejbComponentNames = new Vector();
-    ejbComponents = new Vector();
-    for (int index = 0; index < ejbProjects.size(); index++)
-    {
-      EJBNatureRuntime ejbNature = (EJBNatureRuntime) (ejbProjects.elementAt(index));
-      EJBProjectResources ejbResource = new EJBProjectResources(ejbNature.getProject());
-      EJBJar jar = ejbResource.getEJBJar();
-      Vector beans = J2EEUtils.getBeanNames(jar);
-      String projectName = ejbNature.getProject().getName();
-      ejbBeanNames.addAll(beans);
-      ejbProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
-      ejbResource.cleanup();
-    }
-    beanList.setData(ejbBeanNames, ejbProjectNames);
-    beanList.setInput(ejbBeanNames);
-  }
-  */
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      if (object instanceof Session)
-      {
-        Session session = (Session) object;
-        EJBJar jar = session.getEjbJar();
-        if (jar != null)
-        {
-          for (int i = 0; i < earComponents.length; i++)
-          {
-			      IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject(), earComponents[i].getName());
-			      for (int j=0; j <ejbComponents.length; j++)
-			      {
-              EJBArtifactEdit  ejbEdit = null;
-              try {
-                ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]);
-                EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-                if (ejbRes.getEJBJar() == jar)
-                {
-                  earList.setText(earComponents[i].getName());
-                  setBeanList(earComponents[i]);
-                  beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
-                  selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
-                  return;
-                }                
-
-              }
-              finally {
-                if (ejbEdit!=null)
-                  ejbEdit.dispose();
-              }
-				
-			      }
-			      /* rskejb
-            Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[i]);
-            for (Iterator it = ejbProjects.iterator(); it.hasNext();)
-            {
-              EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
-              if (ejbResource.getEJBJar() == jar)
-              {
-                earList.setText(earProjects[i].getProject().getName());
-                setBeanList(earProjects[i]);
-                beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
-                selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
-                ejbResource.cleanup();
-                return;
-              }
-              ejbResource.cleanup();
-            }
-			      rskejb */
-          }
-        }
-      }
-    }
-  }
-
-  public IStructuredSelection getObjectSelection()
-  {
-    IStructuredSelection sel = (IStructuredSelection) beanList.getSelection();
-    if (sel != null && !sel.isEmpty())
-    {
-      Object object = sel.getFirstElement();
-      if (object instanceof Integer)
-      {
-        String selEJBName = (String) ejbBeanNames.get(((Integer) object).intValue());
-        if (selEJBName != null)
-        {
-          IProject project = earComponents[earList.getSelectionIndex()].getProject();
-          String name = earComponents[earList.getSelectionIndex()].getName();
-          IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project, name);
-          for (int i=0; i<ejbComponents.length; i++)
-          {
-            EJBArtifactEdit  ejbEdit = null;
-            try 
-            {
-              ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[i]);
-              EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-              EJBJar jar = ejbRes.getEJBJar();
-              java.util.List sessions = jar.getSessionBeans();
-              for (Iterator it2 = sessions.iterator(); it2.hasNext();)
-              {
-                Session session = (Session) it2.next();
-                if (selEJBName.equals(session.getName()))
-                {
-                  return new StructuredSelection(new Session[]{session});
-                }
-              }
-            }
-            finally {
-              if (ejbEdit!=null)
-                ejbEdit.dispose();
-            }            
-          }
-          /* rskejb
-          Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[earList.getSelectionIndex()]);
-          for (Iterator it = ejbProjects.iterator(); it.hasNext();)
-          {
-            EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
-            EJBJar jar = ejbResource.getEJBJar();
-            java.util.List sessions = jar.getSessionBeans();
-            for (Iterator it2 = sessions.iterator(); it2.hasNext();)
-            {
-              Session session = (Session) it2.next();
-              if (selEJBName.equals(session.getName()))
-              {
-                ejbResource.cleanup();
-                return new StructuredSelection(new Session[]{session});
-              }
-            }
-            ejbResource.cleanup();
-          }
-          rskejb */
-        }
-      }
-    }
-    return new StructuredSelection(new Object[0]);
-  }
-  
-  public IProject getProject()
-  {
-    String projectName = getSelectedProject();
-    if (projectName != null && projectName.length() > 0)
-      return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-    else
-      return null;
-  }
-  
-  public String getComponentName()
-  {
-    if (selectedBeanIndex != null)
-    {
-      return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue()));
-    }
-    return null;
-  }    
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus getStatus()
-  {  	
-    if (selectedBeanIndex == null)
-    {
-    	return StatusUtils.errorStatus( "" );
-    }
-    
-  	return Status.OK_STATUS;
-  }
-  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
deleted file mode 100644
index 98afd649a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
+++ /dev/null
@@ -1,117 +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.consumption.ui.widgets.object;
-
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-public class EJBTableViewer extends TableViewer
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Vector beanNames;
-  private Vector projectNames;
-
-  public EJBTableViewer(Composite parent)
-  {
-    super(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    String columnProperties[] = {msgUtils.getMessage("TABLE_TITLE_EJB_BEAN_NAMES"), msgUtils.getMessage("TABLE_TITLE_EJB_PROJECT_NAME")};
-    Table table = getTable();
-    table.setHeaderVisible(true);
-    table.setLinesVisible(true);
-    TableLayout layout = new TableLayout();
-    for (int i = 0; i < columnProperties.length; i++)
-    {
-      TableColumn column = new TableColumn(table, i);
-      column.setText(columnProperties[i]);
-      column.setAlignment(SWT.LEFT);
-      layout.addColumnData(new ColumnWeightData(50, 80, true));
-    }
-    table.setLayout(layout);
-    setColumnProperties(columnProperties);
-    setContentProvider(new EJBContentProvider());
-    setLabelProvider(new EJBLabelProvider());
-  }
-
-  public void setData(Vector beanNames, Vector projectNames)
-  {
-    this.beanNames = beanNames;
-    this.projectNames = projectNames;
-  }
-  private class EJBLabelProvider extends LabelProvider implements ITableLabelProvider
-  {
-    public String getColumnText(Object object, int columnIndex)
-    {
-      String result = null;
-      if (object instanceof Integer)
-      {
-        int index = ((Integer) object).intValue();
-        if (columnIndex == 0)
-        {
-          return (String) (beanNames.elementAt(index));
-        }
-        else if (columnIndex == 1)
-        {
-          return (String) (projectNames.elementAt(index));
-        }
-      }
-      return result;
-    }
-
-    public Image getColumnImage(Object object, int columnIndex)
-    {
-      return null;
-    }
-  }
-  public class EJBContentProvider implements IStructuredContentProvider
-  {
-    public Object[] getElements(Object element)
-    {
-      if (beanNames != null)
-      {
-        int size = beanNames.size();
-        Object[] result = new Object[size];
-        for (int index = 0; index < size; index++)
-        {
-          result[index] = new Integer(index);
-        }
-        return result;
-      }
-      return null;
-    }
-
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object old, Object newobj)
-    {
-    }
-
-    public boolean isDeleted(Object object)
-    {
-      return false;
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
deleted file mode 100644
index a7be6f437..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
+++ /dev/null
@@ -1,114 +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.consumption.ui.widgets.object;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-
-
-
-public class HandlerTableItem {
-  
-  private String handlerClassName;
-  private String handlerName;
-  private String portName;
-  private int index;
-  
-  private PortComponent port;
-  private Object handler;
-  private Object wsDescRef;
-
-  /**
-   * @return Returns the handlerClassName.
-   */
-  public String getHandlerClassName() {
-    return handlerClassName;
-  }
-  /**
-   * @param handlerClassName The handlerClassName to set.
-   */
-  public void setHandlerClassName(String handlerClassName) {
-    this.handlerClassName = handlerClassName;
-  }
-  /**
-   * @return Returns the handlerName.
-   */
-  public String getHandlerName() {
-    return handlerName;
-  }
-  /**
-   * @param handlerName The handlerName to set.
-   */
-  public void setHandlerName(String handlerName) {
-    this.handlerName = handlerName;
-  }
-  /**
-   * @return Returns the port.
-   */
-  public PortComponent getPort() {
-    return port;
-  }
-  /**
-   * @param port The port to set.
-   */
-  public void setPort(PortComponent port) {
-    this.port = port;
-  }
-  /**
-   * @return Returns the handler.
-   */
-  public Object getHandler() {
-    return handler;
-  }
-  /**
-   * @param handler The handler to set.
-   */
-  public void setHandler(Object handler) {
-    this.handler = handler;
-  }
-  /**
-   * @return Returns the portName.
-   */
-  public String getPortName() {
-    return portName;
-  }
-  /**
-   * @param portName The portName to set.
-   */
-  public void setPortName(String portName) {
-    this.portName = portName;
-  }
-
-  /**
-   * @return Returns the index.
-   */
-  public int getIndex() {
-    return index;
-  }
-  /**
-   * @param index The index to set.
-   */
-  public void setIndex(int index) {
-    this.index = index;
-  }
-  /**
-   * @return Returns the wsDescRef.
-   */
-  public Object getWsDescRef() {
-    return wsDescRef;
-  }
-  /**
-   * @param wsDescRef The wsDescRef to set.
-   */
-  public void setWsDescRef(Object wsDescRef) {
-    this.wsDescRef = wsDescRef;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
deleted file mode 100644
index 1383a1781..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
+++ /dev/null
@@ -1,70 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
-
-/**
- * This interface defines extra methods that Object Selection Widgets
- * need to implement.  Object Selection Widgets are displayed on page 2
- * of the Web services wizard.
- */
-public interface IObjectSelectionWidget extends WidgetDataContributor
-{
-  /**
-   * The framework will call this method to set the initial selection
-   * value that the user has specified.
-   * 
-   * @param initialSelection the initial selection the user specified.
-   */
-  public void setInitialSelection(IStructuredSelection initialSelection);
-  
-  /**
-   * The intent of the Object Selection Widget is that the user has
-   * the opportunity change/find the object that they want to turn into
-   * a Web service.
-   * 
-   * @return returns the an IStructuredSelection object that the user
-   * want to turn into a Web service.  This object may be different than
-   * the initialSelection passed in by the setInitialSelection method.
-   */
-  public IStructuredSelection getObjectSelection();
-  
-  /**
-   * Validates whether the objectSelection parameter is valid for
-   * this Object selection widget.  An error status should be returned
-   * if this object is not value.  Otherwise, and ok status should be
-   * returned
-   * 
-   * @param objectSelection the object to be validated.
-   * @return the status of the validation.
-   */
-  public IStatus validateSelection(IStructuredSelection objectSelection);
-  
-  /**
-   * 
-   * @return returns the IProject that contains the selection
-   * object that the user has chosen with this widget.  The value can be 
-   * null if there is no IProject for this object.
-   */
-  public IProject getProject();
-  
-  /**
-   * 
-   * @return returns the name of the IVirtualComponent that contains the selection
-   * object that the user has chosen with this widget.  The value can be 
-   * null if there is no IVirtualComponent for this object
-   */
-  public String getComponentName();  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
deleted file mode 100644
index eef2d28c1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
+++ /dev/null
@@ -1,56 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class JavaBeanSelectionTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    if (value instanceof IStructuredSelection)
-    {
-      Object sel = ((IStructuredSelection)value).getFirstElement();
-      if (sel instanceof IFile)
-      {
-        return new StructuredSelection(computeFullyQualifiedJavaName((IFile)sel));
-      }
-      else if (sel instanceof ICompilationUnit)
-      {
-        IResource res = ((ICompilationUnit)sel).getResource();
-        if (res instanceof IFile)
-          return new StructuredSelection(computeFullyQualifiedJavaName((IFile)res));
-      }
-    }
-    return value;
-  }
-
-  private String computeFullyQualifiedJavaName(IFile resource)
-  {
-    IPath path = resource.getFullPath();
-    String basename = path.lastSegment();
-    String beanClass = "";
-    if (basename != null && basename.length() > 0)
-    {
-      String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-      beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-      if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class"))
-        beanClass = beanClass.substring(0, beanClass.lastIndexOf('.'));
-    }
-    return beanClass;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
deleted file mode 100644
index d0d2ede1f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,278 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.internal.impl.ServiceImplBeanImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private String             pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private IProject           serverProject_ = null;
-  private String             serverComponentName_ = null;
-  private Composite          parent_ = null;
-  private JavaResourceFilter filter_ = new JavaResourceFilter();
-  private IResource          initialResource_ = null;
-  private Listener statusListener;
-  
-  /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
-  private String INFOPOP_PBCL_PAGE = "PBCL0001";
-  
-  private Text beanClassText_;
-  /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
-  private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
-  private Button beanClassBrowseButton_;
-  /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
-  private Button beanResourceBrowseButton_;
-  /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
-  private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-   
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    this.statusListener = statusListener;
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ ); 
-    
-    parent_ = parent;
-    
-    Composite group = uiUtils.createComposite( parent, 4 );
-    
-    group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-    
-    beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
-                                         "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
-                                         INFOPOP_PBCL_TEXT_BEAN_CLASS,
-                                         SWT.SINGLE | SWT.BORDER);
-    beanClassText_.addModifyListener(
-      new ModifyListener()
-      {
-        public void modifyText(ModifyEvent e)
-        {
-          handleModifyBeanClassText();
-        }
-      }
-    );
-    
-    beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
-                                                       "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
-                                                       INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
-    beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                 {
-                                                   public void widgetSelected( SelectionEvent evt )
-                                                   {
-                                                     handleBrowseClasses();  
-                                                   }
-                                                 } );
-    
-    beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
-                                                          "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
-                                                          INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
-    beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleBrowseFiles();  
-                                                      }
-                                                    } );
-    return this;
-  }
-  
-  private void handleModifyBeanClassText()
-  {
-    statusListener.handleEvent(null);
-    serverProject_ = null;
-    serverComponentName_ = null;
-  }
-
-  private void handleBrowseClasses()
-  {
-    Shell shell = parent_.getShell();
-    IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-    if (itype != null)
-    {
-      beanClassText_.setText(itype.getFullyQualifiedName());
-      try
-      {
-        IResource res = itype.getCorrespondingResource();
-        if (res != null)
-        {
-          serverProject_ = res.getProject();
-          IVirtualComponent comp = ResourceUtils.getComponentOf(res);
-          if (comp!=null)
-          {
-            serverComponentName_ = comp.getName();
-          }
-        }
-        else
-        {
-          serverProject_ = null;
-          serverComponentName_ = null;
-        }
-      }
-      catch (JavaModelException jme)
-      {
-        serverProject_ = null;
-        serverComponentName_ = null;
-      }
-    }
-  }
-  
-  private void handleBrowseFiles()
-  {
-    IResource topResource = ResourceUtils.getWorkspaceRoot();
-    IResource resource = DialogUtils.browseResources( parent_.getShell(), topResource, initialResource_, filter_ );
-    setBeanClass(resource);
-  }
-  
-  private void setBeanClass(IResource resource)
-  {
-    if( resource != null && resource instanceof IFile )
-    {
-      IPath  path     = resource.getFullPath();
-      String basename = path.lastSegment();
-      
-      if( basename != null && basename.length() > 0 )
-      {
-        String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
-        String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-        
-        if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
-        {
-          beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
-        }
-        
-        beanClassText_.setText(beanClass);
-        serverProject_ =  ResourceUtils.getProjectOf(path);
-        IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-        
-        if (comp!=null)
-        {	
-          serverComponentName_ = comp.getName();
-        }        
-        
-      }
-    }
-  }
-
-  private void setBeanClass(ServiceImplBeanImpl serviceImpl)
-  {
-    if( serviceImpl != null )
-    {
-      EObject eObject = serviceImpl.eContainer();
-      if(eObject instanceof PortComponentImpl){
-      	PortComponentImpl pci = (PortComponentImpl)eObject;
-      	String beanClass = pci.getServiceEndpointInterface();
-      	beanClassText_.setText(beanClass);
-      }
-    }
-  }
-  
-  private void setBeanClass(BeanLink serviceImpl)
-  {
-    if( serviceImpl != null )
-    {
-      EObject eObject = serviceImpl.eContainer();
-      if(eObject instanceof ServiceImplBeanImpl){
-      	setBeanClass((ServiceImplBeanImpl)eObject);
-      }
-    }
-  }
-  
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      if (object instanceof IFile)
-      {
-      	IFile iFile = (IFile)object;
-      	String fileExt = iFile.getFileExtension().toLowerCase();
-      	if (fileExt.equals("java") || fileExt.equals("class"))
-          setBeanClass(iFile);
-      }
-      else if (object instanceof ICompilationUnit)
-      	setBeanClass(((ICompilationUnit)object).getResource());
-      else if (object instanceof ServiceImplBeanImpl)
-      	setBeanClass((ServiceImplBeanImpl)object);
-      else if(object instanceof BeanLink)
-      	setBeanClass((BeanLink)object);
-    }
-  }
-  
-  public IStructuredSelection getObjectSelection()
-  {
-    return new StructuredSelection(beanClassText_.getText());
-  }
-  
-  public IProject getProject()
-  {
-    return serverProject_;
-  }
-
-  public String getComponentName()
-  {
-    return serverComponentName_;
-  }
-  
-  public IStatus getStatus()
-  {
-    String beanClassName = beanClassText_.getText().trim();
-    if (beanClassName == null || beanClassName.length() <= 0)
-    {
-      MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-      return StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_BEAN_CANNOT_BE_EMPTY") );
-    }
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
deleted file mode 100644
index 87b31d70f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
+++ /dev/null
@@ -1,92 +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.consumption.ui.widgets.object;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionFragment extends SequenceFragment implements Condition
-{
-  private TypeRuntimeServer typeRuntimeServer;
-  private boolean hasObjectSelectionWidget;
-
-  public ObjectSelectionFragment()
-  {
-    super();
-    BooleanFragment boolFragment = new BooleanFragment(new SimpleFragment("ObjectSelectionWidget"), new SimpleFragment(""), this);
-    add(boolFragment);
-    add(new SimpleFragment(new ObjectSelectionOutputCommand(), ""));
-    hasObjectSelectionWidget = false;
-  }
-
-  /**
-   *  This method is called retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionWidget.class );
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
-    dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionWidget.class);
-    dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionOutputCommand.class);
-    
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", ObjectSelectionOutputCommand.class);
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "Project", ObjectSelectionOutputCommand.class);
-    dataRegistry.addMapping(ObjectSelectionWidget.class, "ComponentName", ObjectSelectionOutputCommand.class);
-  }
-
-  public boolean evaluate()
-  {
-    return hasObjectSelectionWidget;
-  }
-
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    return typeRuntimeServer;
-  }
-
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    this.typeRuntimeServer = typeRuntimeServer;
-    if (typeRuntimeServer != null)
-    {
-      String wst = typeRuntimeServer.getTypeId();
-
-      int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(wst);
-      String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(wst);
-      if (scenario == WebServiceScenario.TOPDOWN)
-      {
-        //Must have WSDL object selection. No choice.
-        hasObjectSelectionWidget=true;        
-      }
-      else
-      {
-        WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-        if (wsimpl!=null)
-        {  
-          String objectSelectionWidgetId = wsimpl.getObjectSelectionWidget(); 
-          hasObjectSelectionWidget = objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0;
-        }
-      }
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
deleted file mode 100644
index 2314e8738..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,270 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionOutputCommand extends AbstractDataModelOperation
-{
-  private String                 objectSelectionWidgetId_;
-  private IStructuredSelection   objectSelection_;
-  private IObjectSelectionWidget objectSelectionWidget_;
-  private IProject               project_;
-  private String                 componentName_;
-  private WebServicesParser      parser_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    // Transformation
-    if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
-    {
-      IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
-        {
-          String transformerId = elements[i].getAttribute("transformer");
-          if (transformerId != null && transformerId.length() > 0)
-          {
-            try
-            {
-              Object transformer = elements[i].createExecutableExtension("transformer");
-              if (transformer instanceof Transformer)
-              {
-                Object transformedSelection = ((Transformer)transformer).transform(objectSelection_);
-                if (transformedSelection instanceof IStructuredSelection)
-                  objectSelection_ = (IStructuredSelection)transformedSelection;
-              }
-            }
-            catch (CoreException ce)
-            {
-            }
-          }
-        }
-      }
-    }
-	
-    // Validation
-    IStatus status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : Status.OK_STATUS;
-    if (status.getSeverity() != Status.OK)
-    {
-      try
-      {
-        env.getStatusHandler().report(status);
-      }
-      catch (StatusException se)
-      {
-      }
-    }
-	
-    return status;
-  }
-
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    if (typeRuntimeServer != null)
-    {
-      String wst = typeRuntimeServer.getTypeId();
-
-      int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(wst);
-      String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(wst);
-
-      WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-	    //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-
-      if (wsimpl != null)
-      {
-        String objectSelectionWidgetId = null;
-        if (scenario == WebServiceScenario.TOPDOWN)
-        {
-          objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
-        }
-        else
-        {
-          objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
-        }        
-        
-		objectSelectionWidgetId_ = objectSelectionWidgetId;
-		
-        if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
-        {
-          IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-          for (int i = 0; i < elements.length; i++)
-          {
-            if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
-            {
-              try
-              {
-                Object object = elements[i].createExecutableExtension("class");
-                if (object instanceof IObjectSelectionWidget)
-                {
-                  objectSelectionWidget_ = (IObjectSelectionWidget)object;
-                  return;
-                }
-              }
-              catch (CoreException ce)
-              {
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * @return Returns the selection.
-   */
-  public IStructuredSelection getObjectSelection()
-  {
-    return objectSelection_;
-  }
-  /**
-   * @param selection The selection to set.
-   */
-  public void setObjectSelection(IStructuredSelection objectSelection)
-  {
-    objectSelection_ = objectSelection;
-    
-    //Set the project if you can
-    if (project_==null)
-    {
-      project_ = getProjectFromObjectSelection(objectSelection);
-    }
-    
-    //Set the componentName if you can
-    if (componentName_ == null)
-    {
-      componentName_ = getComponentNameFromObjectSelection(objectSelection);
-    }
-    
-    // Check if this is a WSDL selection object.  If it is we need
-    // to unwrap it.
-    if( objectSelection != null && !objectSelection.isEmpty() )
-    {
-      Object object = objectSelection.getFirstElement();
-      
-      if( object instanceof WSDLSelectionWrapper )
-      {
-        WSDLSelectionWrapper wsdlWrapper = (WSDLSelectionWrapper)object;
-        
-        objectSelection_ = wsdlWrapper.wsdlSelection;
-        parser_          = wsdlWrapper.parser;
-      }
-    }
-  }
-  
-  public IProject getProject()
-  {
-    return project_;
-  }
-  
-  public void setProject(IProject project)
-  {
-    this.project_ = project;
-  }  
-  
-  public String getComponentName()
-  {
-    return componentName_;
-  }
-
-  public void setComponentName(String componentName)
-  {
-    this.componentName_ = componentName;
-  }
-
-  /**
-   * @return Returns the parser_.
-   */
-  public WebServicesParser getWebServicesParser()
-  {
-    return parser_;
-  }
-  
-  private IProject getProjectFromObjectSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-			e.printStackTrace();
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromObjectSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-     
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-     
-          if (comp!=null)
-          {
-            return comp.getName();
-          }
-        } catch(CoreException e)
-        {
-      e.printStackTrace();
-          return null;
-        }        
-      }
-    }
-    return null;
-  }  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
deleted file mode 100644
index 8cdbd641b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
+++ /dev/null
@@ -1,37 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-
-public class ObjectSelectionRegistry
-{
-  private static ObjectSelectionRegistry instance;
-  private static IConfigurationElement[] elements;
-  
-  private ObjectSelectionRegistry()
-  {
-    elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget");
-  }
-  
-  public static ObjectSelectionRegistry getInstance()
-  {
-    if (instance == null)
-      instance = new ObjectSelectionRegistry();
-    return instance;
-  }
-
-  public IConfigurationElement[] getConfigurationElements()
-  {
-    return elements;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
deleted file mode 100644
index 779de1ee1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,233 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
-  private IConfigurationElement[] elements;
-  private Composite parent;
-  private Listener statusListener;
-  private Composite composite;
-  private IStructuredSelection initialSelection;
-  private IProject project;
-  private String componentName;
-  private IObjectSelectionWidget child;
-  
-  public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
-  {
-    elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
-    this.parent = parentComposite;
-    this.statusListener = statListener;
-    composite = null;
-    return this;
-  }
-  
-  /**
-   * @param typeRuntimeServer The typeRuntimeServer to set.
-   */
-  public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
-  {
-    if (composite != null)
-    {
-      composite.dispose();
-      child = null;
-    }
-    if (typeRuntimeServer != null)
-    {
-      String wst = typeRuntimeServer.getTypeId();
-      int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(wst);
-      String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(wst);
-      WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-      
-	    //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-      if (wsimpl != null)
-      {
-        String objectSelectionWidgetId = null;
-        if (scenario == WebServiceScenario.TOPDOWN)
-        {
-          objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
-        }
-        else
-        {
-          objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
-        }
-
-        if (objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0)
-        {
-          for (int i = 0; i < elements.length; i++)
-          {
-            if (objectSelectionWidgetId.equals(elements[i].getAttribute("id")))
-            {
-              try
-              {
-                Object object = elements[i].createExecutableExtension("class");
-                if (object instanceof IObjectSelectionWidget)
-                {
-                  Control shell = parent.getShell();
-                  int x = shell.getSize().x;
-                  composite = new Composite(parent, SWT.NONE);
-                  GridLayout gl = new GridLayout();
-                  gl.marginHeight = 0;
-                  gl.marginWidth = 0;
-                  GridData gd = new GridData(GridData.FILL_BOTH);
-                  composite.setLayout(gl);
-                  composite.setLayoutData(gd);
-                  child = (IObjectSelectionWidget)object;
-                  child.addControls(composite, statusListener);
-                  child.setInitialSelection(initialSelection);
-                  composite.setSize(x-20, composite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-                  parent.setSize(x-10, parent.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-                  shell.setSize(x, shell.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-                  shell.setRedraw(true);
-                  shell.redraw();
-                  shell.update();
-                  return;
-                }
-              }
-              catch (CoreException ce)
-              {
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  
-  public IStatus getStatus()
-  {
-    return (child != null) ? child.getStatus() : Status.OK_STATUS;
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    this.initialSelection = initialSelection;
-    project = getProjectFromInitialSelection(initialSelection);
-    componentName = getComponentNameFromInitialSelection(initialSelection);
-    if (child != null)
-      child.setInitialSelection(initialSelection);
-  }
-    
-  public IStructuredSelection getObjectSelection()
-  {
-    return (child != null) ? child.getObjectSelection() : null;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return (child != null) ? child.validateSelection(objectSelection) : Status.OK_STATUS;
-  }
-  
-  public IProject getProject()
-  {
-    if (child != null)
-    {
-      IProject p = child.getProject();
-      if (p != null)
-        return p;
-      else
-        return project;
-    }
-    else
-    {
-      return null;
-    }
-  }
-  
-  public String getComponentName()
-  {
-    if (child != null)
-    {
-      String cname = child.getComponentName();
-      if (cname != null && cname.length()>0)
-        return cname;
-      else
-        return componentName;
-    }
-    else
-    {
-      return null;
-    }    
-	 
-  }
-  
-  private IProject getProjectFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-          if (comp != null)
-          {
-            return comp.getName();  
-          }          
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;    
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
deleted file mode 100644
index 546120c40..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Calendar;
-
-import org.eclipse.swt.widgets.Display;
-
-public class Timer extends Thread
-{
-  private static Timer instance = null;
-  private final long ONE_SECOND = 1000;
-  private long refreshTime;
-  private Display display;
-  private Runnable runnable;
-
-  private Timer(Display display, Runnable runnable)
-  {
-    this.display = display;
-    this.runnable = runnable;
-  }
-
-  public synchronized static Timer newInstance(Display display, Runnable runnable)
-  {
-    if (instance == null)
-      instance = new Timer(display, runnable);
-    return instance;
-  }
-  
-  public synchronized static boolean isRunning()
-  {
-    return instance != null;
-  }
-
-  public synchronized void startTimer()
-  {
-    refreshTime = getCurrentTime() + ONE_SECOND;
-    if (!isAlive())
-      this.start();
-  }
-
-  private long getCurrentTime()
-  {
-    return Calendar.getInstance().getTime().getTime();
-  }
-
-  public void run()
-  {
-    long currTime = getCurrentTime();
-    while (currTime < refreshTime)
-    {
-      try
-      {
-        sleep(refreshTime - currTime);
-      }
-      catch (InterruptedException ie)
-      {
-      }
-      currTime = getCurrentTime();
-    }
-    instance = null;
-    display.syncExec(runnable);
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
deleted file mode 100644
index 8463a028a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidateWSDLJob.java
+++ /dev/null
@@ -1,55 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-import org.eclipse.wst.wsdl.validation.internal.IValidationReport;
-import org.eclipse.wst.wsdl.validation.internal.ui.eclipse.WSDLValidator;
-
-
-
-public class ValidateWSDLJob extends Job {
-	
-	final public static String VALIDATE_WSDL_JOB_FAMILY = "ValidateWSDLJobJamily";
-	
-	private String wsdlURI_ = null;
-	private IValidationMessage[] validationMessages_ = null;
-
-	public ValidateWSDLJob(String wsdlURI) {
-		super("ValidateWSDLJob");
-		wsdlURI_ = wsdlURI;
-	}
-
-	protected IStatus run(IProgressMonitor monitor) {
-		WSDLValidator wsdlValidator = WSDLValidator.getInstance();
-	    IValidationReport valReport = wsdlValidator.validate(wsdlURI_);
-	    validationMessages_ = valReport.getValidationMessages();
-		return Status.OK_STATUS;
-	}
-	
-	public boolean belongsTo(Object family)
-	{
-		return family == VALIDATE_WSDL_JOB_FAMILY;
-	}
-	
-	public IValidationMessage[] getValidationMessages() {
-		return validationMessages_;
-	}
-
-	public String getWsdlURI() {
-		return wsdlURI_;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
deleted file mode 100644
index 7c55b0114..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ValidationMessageViewerWidget.java
+++ /dev/null
@@ -1,245 +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.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.wsdl.validation.internal.IValidationMessage;
-
-
-public class ValidationMessageViewerWidget extends SimpleWidgetDataContributor
-{
-  private int DEFAULT_TABLE_HEIGHT_HINT = 100;
-  private TableViewer tableViewer_;
-  private Table table_;
-  private String message = null;
-  static final String columns_[] = {"severity", "line", "column", "message"};
-  static final int columnsWidth_[] = {10, 10, 10, 60};
-
-  
-
-  public ValidationMessageViewerWidget()
-  {
-  }
-
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  { 
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    
-	Composite  composite = new Composite(parent, SWT.NONE);
-	GridLayout gl        = new GridLayout();
-	
-	gl.marginHeight = 0;
-	gl.marginWidth = 0;
-	composite.setLayout(gl);
-	composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-	
-    Label messageLabel = new Label( composite, SWT.WRAP);
-    messageLabel.setText( msgUtils.getMessage("LABEL_VALIDATE_MESSAGES"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    messageLabel.setLayoutData(gd);
-    messageLabel.setToolTipText( msgUtils.getMessage("TOOLTIP_VALIDATE_TEXT_MESSAGE") );
-
-	table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
-	gd = new GridData(GridData.FILL_BOTH);
-	gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
-	table_.setLayoutData(gd);
-	table_.setHeaderVisible(true);
-	table_.setLinesVisible(true);
-	table_.setToolTipText(msgUtils.getMessage("TOOLTIP_TABLE_VALIDATE_MESSAGE") );
-	TableLayout tableLayout = new TableLayout();
-	for (int i = 0; i < columns_.length; i++)
-	{
-	  TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
-	  tableColumn.setText(columns_[i]);
-	  tableColumn.pack();
-	  ColumnWeightData columnData = new ColumnWeightData(columnsWidth_[i], columnsWidth_[i], true);
-	  tableLayout.addColumnData(columnData);
-	}
-	table_.setLayout(tableLayout);
-
-	tableViewer_ = new TableViewer(table_);
-
-	tableViewer_.setContentProvider(new ListContentProvider());
-	tableViewer_.setLabelProvider(new ListLabelProvider());
-
-	Composite buttonComposite = new Composite(composite, SWT.NONE);
-	gl = new GridLayout();
-	gl.numColumns = 3;
-	gl.makeColumnsEqualWidth = true;
-	buttonComposite.setLayout(gl);
-	buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-	
-	return this;
-  }
-
-  public void setInput(IValidationMessage[] messages)
-  {
-  	tableViewer_.setInput(messages);
-  	tableViewer_.refresh();
-  }
-  
-  public void clearInput()
-  {
-	  IValidationMessage emptyMessages[] = {};
-	  this.setInput(emptyMessages);
-  }
-  
-  public IContentProvider getContentProvider()
-  {
-	  return tableViewer_.getContentProvider();
-  }
-
-  public IStatus getStatus()
-  {
-    return message == null ? Status.OK_STATUS : 
-                             StatusUtils.errorStatus(message );
-  }
-
-  public void refresh()
-  {
-	tableViewer_.refresh();
-  }
-
-  public TableItem[] getItems()
-  {
-	//internalRefresh();
-	return table_.getItems();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-  }
-
-  public void dispose()
-  {	
-	if (table_ != null)
-	  table_.dispose();
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider
-  {
-	public void dispose()
-	{
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-	{
-	  tableViewer_.add(getElements(newInput));
-	}
-
-	public Object[] getElements(Object inputElement)
-	{
-		if (inputElement instanceof IValidationMessage[])
-	  {
-			IValidationMessage[] valMessages = (IValidationMessage[]) inputElement;
-		  return valMessages;
-	  }
-	  else
-		return new Object[0];
-	}
-  }
-
-  protected class ListLabelProvider implements ITableLabelProvider
-  {
-	public Image getColumnImage(Object element, int columnIndex)
-	{
-		if (element instanceof IValidationMessage)
-		{
-			IValidationMessage msg = (IValidationMessage) element;
-			
-			if (columnIndex == 0)
-			{	
-				int severity = msg.getSeverity();
-				if (severity == 0) {
-					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-				} else if (severity == 1) {
-					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
-				} else if (severity == 2) {
-					return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_INFO_TSK);
-				}
-			}
-		}	
-	  return null;
-	}
-
-	public String getColumnText(Object element, int columnIndex)
-	{
-		String text = "";
-		if (element instanceof IValidationMessage)
-		{
-			IValidationMessage msg = (IValidationMessage) element;
-			
-			switch (columnIndex) {
-			case 0:		
-				// no text to display, only display severity as image
-				break;
-			case 1:
-				text = (new Integer(msg.getLine())).toString();
-				break;
-			case 2:
-				text = (new Integer(msg.getColumn())).toString();
-				break;
-			case 3:
-				text = msg.getMessage();
-				break;		
-				
-			default:
-				break;
-			} 
-		}
-		return text;
-	}
-
-	public void addListener(ILabelProviderListener listener)
-	{
-	}
-
-	public void removeListener(ILabelProviderListener listener)
-	{
-	}
-
-	public boolean isLabelProperty(Object element, String property)
-	{
-	  return true;
-	}
-
-	public void dispose()
-	{
-	}
-  }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
deleted file mode 100644
index 79672c379..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
+++ /dev/null
@@ -1,56 +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.consumption.ui.widgets.object;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.ServiceRefImpl;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionTransformer implements Transformer
-{
-  public Object transform(Object value)
-  {
-    if (value instanceof IStructuredSelection)
-    {
-      Object sel = ((IStructuredSelection)value).getFirstElement();
-      if (sel instanceof IResource)
-      {
-        try
-        {
-          return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString());
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-      else if (sel instanceof ServiceImpl)
-      {
-        return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel));
-      }
-      else if (sel instanceof ServiceRefImpl)
-      {
-        return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceRefImpl)sel));
-      }
-      else if (sel instanceof WSDLResourceImpl)
-      {
-        return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)sel));
-      }
-    }
-    return value;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
deleted file mode 100644
index 707c9f279..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,494 +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.consumption.ui.widgets.object;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionConditionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionTreeWidget;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable
-{
-  private String              pluginId_;
-  private MessageUtils        msgUtils_;
-  private FileExtensionFilter wsFilter_;
-  private WebServicesParser webServicesParser;
-
-  private Composite parent_;
-  private Listener  statusListener_;
-  private WSDLSelectionTreeWidget tree;
-  private ValidationMessageViewerWidget msgViewer_;
-  
-  /*CONTEXT_ID PCON0001 for the WSDL Selection Page*/
-  private final String INFOPOP_PCON_PAGE = "PCON0001";
-
-  /*CONTEXT_ID PCON0002 for the WSDL Document text field of the WSDL Selection Page*/
-  private final String INFOPOP_PCON_TEXT_WSDL = "PCON0002";
-  private Text webServiceURI;
-
-  /*CONTEXT_ID PCON0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
-  private final String INFOPOP_PCON_BUTTON_BROWSE_WSDL = "PCON0003";
-  private Button wsBrowseButton_;
-  
-  private ValidateWSDLJob validateWSDLJob_;
-  private JobChangeAdapter    jobChangeAdapter_;
-
-  
-  public WSDLSelectionWidget()
-  {
-    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"});
-    webServicesParser = WSDLParserFactory.getWSDLParser();
-    
-    final Runnable handleValidationMessages = new Runnable()
-    {
-	  public void run() 
-      {
-		  msgViewer_.setInput(validateWSDLJob_.getValidationMessages());
-      }
-    };
-    
-    jobChangeAdapter_ = new JobChangeAdapter()
-    {
-      public void done(IJobChangeEvent event) 
-      {   	
-    	  if (msgViewer_!= null && msgViewer_.getContentProvider() != null) {
-    		  Display.getDefault().asyncExec( handleValidationMessages );
-		  }
-      }
-    };
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    UIUtils uiUtils  = new UIUtils( msgUtils_, pluginId_ );
-    parent_          = parent;
-    statusListener_  = statusListener;
-
-	  parent.setToolTipText( msgUtils_.getMessage( "TOOLTIP_PCON_PAGE" ) );
-	  PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PCON_PAGE );
-    
-    Composite wsdlGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-    
-    Label wsLabel = new Label( wsdlGroup, SWT.WRAP);
-    wsLabel.setText( msgUtils_.getMessage("LABEL_WS_SELECTION"));
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
-    gd.horizontalSpan = 2;
-    wsLabel.setLayoutData(gd);
-    wsLabel.setToolTipText( msgUtils_.getMessage("TOOLTIP_PCON_TEXT_WS") );
-    
-    webServiceURI = uiUtils.createText( wsdlGroup, null, "TOOLTIP_PCON_TEXT_WS", INFOPOP_PCON_TEXT_WSDL, SWT.SINGLE | SWT.BORDER );
-    webServiceURI.addModifyListener(
-      new ModifyListener()
-      {
-        public void modifyText(ModifyEvent event)
-        {
-          handleWebServiceURIModifyEvent();
-        }
-      });
-//    webServiceURI.addListener( SWT.Modify, statusListener );
-
-    wsBrowseButton_ = uiUtils.createPushButton( wsdlGroup, "BUTTON_BROWSE", "TOOLTIP_PCON_BUTTON_BROWSE_WS", INFOPOP_PCON_BUTTON_BROWSE_WSDL );
-    wsBrowseButton_.addSelectionListener(
-      new SelectionListener()
-      {
-        public void widgetDefaultSelected(SelectionEvent event)
-        {
-          handleWSDLButton();
-        }
-        
-        public void widgetSelected(SelectionEvent event)
-        {
-          handleWSDLButton();
-        } 
-      });
-
-    tree = new WSDLSelectionTreeWidget();
-    tree.addControls(parent, statusListener);
-    tree.setWebServicesParser(webServicesParser);
-    
-    msgViewer_ = new ValidationMessageViewerWidget();
-    msgViewer_.addControls(parent, statusListener);
-    
-    return this;
-  }
-  
-  private void handleWebServiceURIModifyEvent()
-  {
-    if (webServiceURI.getText().indexOf(':') > 0)
-      Timer.newInstance(Display.getCurrent(), this).startTimer();
-    else
-      handleWebServiceURI();
-    statusListener_.handleEvent(null);
-  }
-  
-  private void handleWebServiceURI()
-  {
-    String wsURI = webServiceURI.getText();
-    if (wsURI.indexOf(':') < 0)
-    {
-      IFile file = uri2IFile(wsURI);
-      if (file != null)
-        wsURI = iFile2URI(file);
-    }
-    if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
-    {
-      WSDLSelectionConditionCommand cmd = new WSDLSelectionConditionCommand();
-      cmd.setWebServicesParser(webServicesParser);
-      cmd.setWebServiceURI(wsURI);
-      cmd.execute(null, null);
-    }
-    WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
-    if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
-      tree.setEnabled(false);
-    else
-      tree.setEnabled(true);
-    tree.setWebServiceURI(wsURI);
-    tree.refreshTreeViewer();
-  }
-  
-  public void run()
-  {
-    handleWebServiceURI();
-    statusListener_.handleEvent(null);
-  }
-
-  private void handleWSDLButton()
-  {
-    DialogResourceBrowser dialog = new DialogResourceBrowser( parent_.getShell(), null, wsFilter_);
-    dialog.open();
-    IResource res = dialog.getFirstSelection();
-    if( res != null ) webServiceURI.setText( res.getFullPath().toString() );
-    statusListener_.handleEvent(null);
-  }
-  
-  public IStatus getStatus()
-  {
-    // Timer validation
-    /*
-     * Commenting out because we don't want to block fast typers from hitting Next/Finish 
-    if (Timer.isRunning())
-      return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_LOADING_WEB_SERVICE_URI"), Status.ERROR);
-    */
-	
-    // Validate the String representation of the Web service URI
-    // For example, is it pointing to an existing resource in the workspace?
-    String wsPath  = webServiceURI.getText();
-    if( wsPath == null || wsPath.length() <= 0 )
-      return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI") );
-    else if( wsPath.indexOf(':') < 0 )
-    {
-      IResource res = ResourceUtils.findResource(wsPath);
-      if( res == null ) {
-    	  msgViewer_.clearInput();
-        return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_NO_SUCH_FILE", new Object[] {wsPath}) );
-      }
-      else if( res.getType() != IResource.FILE ) {
-    	  msgViewer_.clearInput();
-        return StatusUtils.errorStatus( msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI") );
-      }
-    }
-
-    
-    // Validate the content of the Web service URI
-    // For example, is selection a WSDL URI?
-    if (!Timer.isRunning() && tree.isEnabled())
-    {
-      IStatus status = tree.getStatus();
-      if (status != null)
-      {
-        int severity = status.getSeverity();
-        if (severity == Status.ERROR || severity == Status.WARNING) {
-        	msgViewer_.clearInput();
-          return status;
-        }
-      }
-    }
-    else
-    {
-    	if( wsPath.indexOf(':') < 0 )
-        {
-          String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-          if (webServicesParser.getWSDLDefinition(wsdlURI) == null) {
-        	  msgViewer_.clearInput();
-            return StatusUtils.errorStatus(msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL") );
-          }
-        }
-    }
-    
-    
-    if (!Timer.isRunning()) {
-    	String wsdlURI1 = wsPath;
-    	 boolean isRemote = true;
-    	if (tree.isEnabled()) { // is wsil
-    		wsdlURI1 = tree.getWsdlURI();
-    		if (wsdlURI1.startsWith("file:")) {
-    			isRemote = false;
-    		}
-    	} else { // is wsil
-    	
-    		if( wsPath.indexOf(':') < 0 )
-    		{      	// not remote
-    			isRemote = false;
-    			wsdlURI1 = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
-    		}
-    	}
-  	  
-  	  validateWSDL(wsdlURI1, isRemote);
-    }
-    
-
-    // OK status
-    return Status.OK_STATUS;
-  }
-  
-  private void validateWSDL (String wsdlURI, boolean isRemote) {
-
-	  String validationSelection = WSPlugin.getInstance().getWSDLValidationContext().getPersistentWSDLValidation();;
-	  if ((PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) ||
-			  (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection) && isRemote)) {
-
-		  IJobManager    jobManager     = Platform.getJobManager();
-		  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
-		  ValidateWSDLJob existingValidateWSDLJob = null;
-		  
-		  boolean startWSDLValidation = true;
-		  if( jobs.length > 0 )
-		  {
-			  for (int i=0; i<jobs.length; i++) {
-				  existingValidateWSDLJob = (ValidateWSDLJob)jobs[i];
-				  
-				  if (existingValidateWSDLJob.getState() != Job.NONE) { 
-					  // Job running or to be run
-					  // If the job is validating the same wsdlURI, let it finish running and ignore this one.
-					  // It is not for the same wsdlURI, cancel the job and schedule this one.
-
-					  if (!wsdlURI.equals(existingValidateWSDLJob.getWsdlURI())) {
-						  existingValidateWSDLJob.cancel();
-					  } else {						  
-						  startWSDLValidation = false;
-					  }
-				  } 
-			  }
-		  } 
-		  
-		  if (startWSDLValidation) {
-			  startWSDLValidationJob(wsdlURI);
-		  }
-	  }
-	  return;
-  }
-  
-  private void startWSDLValidationJob (String wsdlURI) {
-	  validateWSDLJob_ = new ValidateWSDLJob(wsdlURI);
-	  validateWSDLJob_.addJobChangeListener( jobChangeAdapter_ );
-	  validateWSDLJob_.schedule();
-  }
-  
-  private IFile uri2IFile(String uri)
-  {
-    IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(uri);
-    if (res instanceof IFile)
-      return (IFile)res;
-    else
-      return null;
-  }
-  
-  private String iFile2URI(IFile file)
-  {
-  	File f = file.getLocation().toFile();
-    try
-    {
-      return f.toURL().toString();
-    }
-    catch (MalformedURLException murle)
-    {
-    }
-    return f.toString();
-  }
-
-  public void setInitialSelection(IStructuredSelection initialSelection)
-  {
-    if (initialSelection != null && !initialSelection.isEmpty())
-    {
-      Object object = initialSelection.getFirstElement();
-      String wsdlURI = toWsdlURI(object);
-      if (wsdlURI != null)
-      {
-        webServiceURI.setText(wsdlURI);
-        handleWebServiceURI();
-      }
-    }
-  }
-  
-  private String toWsdlURI(Object object)
-  {
-    if (object instanceof ServiceImpl)
-      return J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)object);
-    else if (object instanceof WSDLResourceImpl)
-      return J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)object);
-    else if (object instanceof ServiceRef)
-      return J2EEActionAdapterFactory.getWSDLURI((ServiceRef)object);
-    else if (object instanceof IFile)
-      return ((IFile)object).getFullPath().toString();
-    else if (object instanceof String)
-      return (String)object;
-    else
-      return null;
-  }
-  
-  public IStructuredSelection getObjectSelection()
-  {
-    return new StructuredSelection( 
-               new WSDLSelectionWrapper( webServicesParser,
-                                         new StructuredSelection(tree.getWsdlURI()) ) );
-  }
-  
-  public WebServicesParser getWebServicesParser()
-  {
-    return webServicesParser;
-  }
-  
-  public IStatus validateSelection(IStructuredSelection objectSelection)
-  {
-    return Status.OK_STATUS;
-  }
-  
-  public IProject getProject()
-  {
-    String wsdlURI = tree.getWsdlURI();
-    if (wsdlURI != null)
-    {
-      IProject p = getProjectFromURI(wsdlURI);
-      if (p!=null && p.exists())
-        return p;
-      
-      String wsRelPath = webServiceURI.getText();
-      IResource wsRes = ResourceUtils.findResource(wsRelPath);
-      if (wsRes!=null && wsRes instanceof IFile)
-      {
-        IProject p2 = ((IFile)wsRes).getProject();
-        return p2;
-      }
-      
-    }
-    return null;
-  }
-  
-  public String getComponentName()
-  {
-    String wsdlURI = tree.getWsdlURI();
-    if (wsdlURI != null)
-    {
-      String cname = getComponentNameFromURI(wsdlURI);
-      if (cname!=null && cname.length()>0)
-        return cname;
-      
-      String wsRelPath = webServiceURI.getText();
-      IResource wsRes = ResourceUtils.findResource(wsRelPath);
-      if (wsRes!=null && wsRes instanceof IFile)
-      {
-        IVirtualComponent comp = ResourceUtils.getComponentOf(wsRes);
-        if (comp!=null)
-        {
-          return comp.getName();
-        }
-      }
-      
-    }
-    return null;
-  }
-  
-  private IProject getProjectFromURI(String uri)
-  {
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    String wkspcRootLoc = root.getLocation().toString();
-    int idx = uri.indexOf(wkspcRootLoc);
-    if (idx != -1) 
-    {
-      String relPath = uri.substring(wkspcRootLoc.length()+idx);
-      IResource res = root.findMember(new Path(relPath));
-      if (res instanceof IFile)
-      {
-        IProject p = ((IFile)res).getProject();
-        return p;
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromURI(String uri)
-  {
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    String wkspcRootLoc = root.getLocation().toString();
-    int idx = uri.indexOf(wkspcRootLoc);
-    if (idx != -1) 
-    {
-      String relPath = uri.substring(wkspcRootLoc.length()+idx);
-      IResource res = root.findMember(new Path(relPath));
-      if (res instanceof IFile)
-      {
-        IVirtualComponent comp = ResourceUtils.getComponentOf(res);
-        if (comp!=null)
-        {
-          return comp.getName();
-        }        
-      }
-    }
-    return null;    
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
deleted file mode 100644
index b0a600576..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * This class is a very simple wrapper that binds a WSDL parser with
- * a wsdlSelection object.
- */
-public class WSDLSelectionWrapper 
-{
-  public WebServicesParser    parser;
-  public IStructuredSelection wsdlSelection;
-  
-  public WSDLSelectionWrapper( WebServicesParser    parser,
-                               IStructuredSelection selection )
-  {
-    this.parser        = parser;
-    this.wsdlSelection = selection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
deleted file mode 100644
index f9adcab51..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,371 +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.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-
-public class ClientRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String    pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  
-  /* CONTEXT_ID PWRS0003 for the Wizard Scenario Client configuration of the Runtime Selection Page */
-  private String INFOPOP_PWRS_GROUP_CLIENT = pluginId_ + ".PWRS0003";
-  
-  private Group                        clientGroup_;
-  private RuntimeServerSelectionWidget runtimeWidget_;
-  private SelectionListChoices         runtime2ClientTypes_;
-  private Combo                        clientType_;
-  private SelectionAdapter             clientTypeSelListener;
-  private ProjectSelectionWidget       projectWidget_;
-  private boolean 					           isVisible_;
-  
-  
-  public WidgetDataEvents addControls( Composite parent, final Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ ); 
-    
-    clientGroup_ = uiUtils.createGroup( parent, "LABEL_CLIENT_SELECTION_VIEW_TITLE",
-                                        null, INFOPOP_PWRS_GROUP_CLIENT, 2, 5, 5 );
-    
-    runtimeWidget_ = new RuntimeServerSelectionWidget( true );
-    runtimeWidget_.addControls( clientGroup_, statusListener );
-    runtimeWidget_.addModifyListener( new ModifyListener()
-                                      {
-                                        public void modifyText(ModifyEvent e)
-                                        {
-                                          handleRuntime2ClientTypesEvent();
-                                          handleUpdateProjectWidget();
-                                        }
-                                      });
-    
-    clientType_ = uiUtils.createCombo( clientGroup_, "LABEL_CLIENT_TYPE",  
-                                       "TOOLTIP_PWCR_COMBO_CLIENT_TYPE",
-                                       INFOPOP_PWRS_GROUP_CLIENT, 
-                                       SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    clientTypeSelListener = new SelectionAdapter()
-                                {
-                                  public void widgetSelected( SelectionEvent evt )
-                                  {
-                                    handleSetProjects( clientType_.getSelectionIndex() );
-                                    statusListener.handleEvent(null);
-                                  }
-                                };
-                                
-    clientType_.addSelectionListener(clientTypeSelListener);
-    
-    projectWidget_ = new ProjectSelectionWidget(true);
-    projectWidget_.addControls( clientGroup_, statusListener );
-    
-    //projectWidget_.addModifyListener(new ModifyListener(){
-    //  								public void modifyText(ModifyEvent e){
-    //  								  getProjectSelections();
-    //  								}
-    //								});
-    
-    return this;
-  }
-  
-  // This method is called by the creator of this widget to control
-  // whether it is visible or not.
-  public void setVisible( boolean value )
-  {
-    clientGroup_.setVisible( value ); 
-    isVisible_ = value;
-  }
-  
-  public boolean isVisible(){
-  	return this.isVisible_;
-  }
-
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {     
-    runtimeWidget_.setTypeRuntimeServer( ids );
-    projectWidget_.setTypeRuntimeServer(ids);
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return runtimeWidget_.getTypeRuntimeServer();  
-  }
-  
-  public String getJ2EEVersion()
-  {
-    return runtimeWidget_.getJ2EEVersion();
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-    runtimeWidget_.setJ2EEVersion(j2eeVersion);
-    projectWidget_.setJ2EEVersion(j2eeVersion);
-  }
-    
-  public boolean getClientNeedEAR()
-  {
-    return projectWidget_.getNeedEAR();
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-    projectWidget_.setNeedEAR(b);
-  }  
-  
-  public String getClientComponentName()
-  {
-	return projectWidget_.getComponentName();  
-  }
-  
-  public void setClientComponentName( String name )
-  {
-    projectWidget_.setComponentName( name );
-  }
-  
-  public String getClientEarComponentName()
-  {
-    return projectWidget_.getEarComponentName();	  
-  }
-  
-  public void setClientEarComponentName( String name )
-  {
-	projectWidget_.setEarComponentName( name );  
-  }
-  
-  public String getClientComponentType()
-  {
-    SelectionList projTypeList = runtime2ClientTypes_.getChoice().getList();
-    projTypeList.setIndex( clientType_.getSelectionIndex() );
-    return projTypeList.getSelection();
-  }
-  
-  public void setClientComponentType( String type )
-  {
-	projectWidget_.setComponentType( type );  
-  }
-  
-  public String getClientProjectName()
-  {
-    return projectWidget_.getProjectName();  
-  }
-  
-  public String getClientEarProjectName()
-  {
-	return projectWidget_.getEarProjectName();  
-  }
-  
-  /**
-   * @param runtime2ClientTypes The runtime2ClientTypes to set.
-   */
-  public void setRuntime2ClientTypes(SelectionListChoices runtime2ClientTypes)
-  {
-    runtime2ClientTypes_ = runtime2ClientTypes;
-    handleRuntime2ClientTypesEvent();
-  }
-
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    
-    String runtime       = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
-    String clientProject = projectWidget_.getProjectChoices().getList().getSelection();
-    String earProject    = projectWidget_.getProjectChoices().getChoice().getList().getSelection();
-    
-    SelectionList runtimeList  = runtime2ClientTypes_.getList();
-    runtimeList.setSelectionValue( runtime );
-    
-    SelectionList projTypeList = runtime2ClientTypes_.getChoice().getList();
-    projTypeList.setIndex( clientType_.getSelectionIndex() );
-    
-    SelectionListChoices clientProjChoice = runtime2ClientTypes_.getChoice().getChoice();
-    SelectionList        clientProjList   = clientProjChoice.getList();
-    clientProjList.setSelectionValue( clientProject );    
-    
-    SelectionList        earProjList      = clientProjChoice.getChoice().getList();   
-    earProjList.setSelectionValue( earProject );
-    
-    return runtime2ClientTypes_; 
-  }
-  
-  private void handleRuntime2ClientTypesEvent()
-  {
-    if (runtime2ClientTypes_ != null)
-    {  
-      //If the runtimeId from runtimeWidget_ is already selected in
-      //in runtime2ClientTypes_, do nothing. 
-      String currentRuntimeId = runtime2ClientTypes_.getList().getSelection();
-      String newRuntimeId = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
-      if (currentRuntimeId != newRuntimeId)
-      {
-        SelectionList runtimes = runtime2ClientTypes_.getList();
-        runtimes.setSelectionValue( runtimeWidget_.getTypeRuntimeServer().getRuntimeId() );
-      }
-      
-      String[] clientTypeIds = runtime2ClientTypes_.getChoice().getList().getList();
-      int selectedClientTypeIdx = runtime2ClientTypes_.getChoice().getList().getIndex();
-      
-      clientType_.removeSelectionListener(clientTypeSelListener);
-      clientType_.setItems( getClientTypeLabels( clientTypeIds ));
-      clientType_.select(selectedClientTypeIdx);
-      clientType_.addSelectionListener(clientTypeSelListener);
-      handleSetProjects(selectedClientTypeIdx);
-      
-    }
-  }
-
-
-  private void handleUpdateProjectWidget()
-  {
-    projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
-    projectWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
-  }
-
-  
-  private void handleSetProjects( int clientTypeIndex )
-  {    
-    SelectionListChoices clientType2Projects = runtime2ClientTypes_.getChoice();
-    clientType2Projects.getList().setIndex( clientTypeIndex );
-    
-    // Make sure that the project name and EAR name are kept the same
-    // even if the client type is changed.  Note: the project and EAR lists
-    // will be updated according to what is set by the client type.
-    SelectionListChoices currentProjects = projectWidget_.getProjectChoices();
-    
-    if( currentProjects != null )
-    {
-      String projectName = currentProjects.getList().getSelection();
-      String earName     = currentProjects.getChoice().getList().getSelection();
-      
-      // Set the project to it's original state.
-      clientType2Projects.getChoice().getList().setSelectionValue( projectName );
-	
-	  // Set the EAR name to it's original state.
-      clientType2Projects.getChoice().getChoice().getList().setSelectionValue( earName );
-    }
-	
-    //projectWidget_.setProjectTypeId(clientType2Projects.getList().getSelection());
-	projectWidget_.setComponentType(clientType2Projects.getList().getSelection());
-    projectWidget_.setProjectChoices( clientType2Projects.getChoice() );    
-  }
-  
-  private String[] getClientTypeLabels( String[] types )
-  {
-	MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );	  
-    //ClientProjectTypeRegistry registry         = ClientProjectTypeRegistry.getInstance();
-    String[]                  clientTypeLabels = new String[types.length];
-    
-    for( int index = 0; index < types.length; index++ )
-    {
-      //clientTypeLabels[index] = registry.getElementById(types[index]).getAttribute("label");
-	  String type = types[index];
-	  if (type.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
-	  }
-	  else if (type.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
-	  }
-	  else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
-	  }
-	  else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
-	  {
-		  clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
-	  }
-	  else
-	  {
-		  clientTypeLabels[index] = type;
-	  }
-    }
-    
-    return clientTypeLabels;
-  }
-  
-  public ProjectSelectionWidget getProjectSelectionWidget() {
-    return this.projectWidget_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    IStatus finalStatus   = Status.OK_STATUS;
-    IStatus projectStatus = projectWidget_.getStatus();
-    IStatus runtimeStatus = runtimeWidget_.getStatus();
-    
-    if( runtimeStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = runtimeStatus;
-    }
-    else if( projectStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = projectStatus;
-    }
-    else
-    {
-      SelectionListChoices clientProjects = getProjectSelectionWidget().getProjectChoices();
-      ValidationUtils valUtils = new ValidationUtils();
-      if (clientProjects != null)
-      {
-          String clientEARName = projectWidget_.getEarProjectName();
-          if (clientEARName == null){
-        	  clientEARName = clientProjects.getChoice().getList().getSelection();
-          }
-          String clientProjName = projectWidget_.getProjectName();
-          if (clientProjName == null){
-            clientProjName = clientProjects.getList().getSelection();
-          }
-        
-        String clientCompName = projectWidget_.getComponentName();
-        String clientEARCompName = projectWidget_.getEarComponentName();
-
-        //Validate that the selected client project is of the type indicated by client project type.
-        IStatus clientProjectTypeStatus = valUtils.validateProjectType(clientProjName, runtime2ClientTypes_);
-        if (clientProjectTypeStatus.getSeverity() == Status.ERROR)
-        {
-          finalStatus = clientProjectTypeStatus;
-        }
-        
-        //Validate client side server targets and J2EE levels
-        String clientServerFactoryId = getClientTypeRuntimeServer().getServerId();
-        String clientJ2EElevel = getJ2EEVersion();
-        IStatus clientProjectStatus = valUtils.validateProjectTargetAndJ2EE(clientProjName, clientCompName, clientEARName, clientEARCompName, clientServerFactoryId,
-            clientJ2EElevel);
-        if (clientProjectStatus.getSeverity() == Status.ERROR)
-        {
-          finalStatus = clientProjectStatus;
-        }
-      }
-    }
-    return finalStatus;    
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 29f63c6d5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1179 +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.consumption.ui.widgets.runtime;
-
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IRuntime;
-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.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataModelOperation
-{   
-  protected MessageUtils msgUtils_;
-  // clientRuntimeJ2EEType contains the default client runtime and J2EE level based on the initial selection.
-  // If the initialSeleciton does not result in a valid client runtime and J2EE level, clientRuntimeJ2EEType
-  // should remain null for the life of this instance.  
-  private WSRuntimeJ2EEType    clientRuntimeJ2EEType_;
-  
-  private TypeRuntimeServer    clientIds_;
-  private SelectionListChoices runtimeClientTypes_;
-  private String clientComponentName_;
-  private String clientEarComponentName_;
-  
-  private IContext          context_;
-  private ISelection        selection_;
-  private IWebServiceClient webServiceClient_;
-  private ResourceContext   resourceContext_;
-  private boolean           test_;
-  
-  //A note on initialSelections ...
-  //The difference between clientInitialProject/Component_ and initialInitialSelection is that
-  //clientInitialProject/Component_ comes from the ObjectSelectionOutputCommand while initialInitialSelection
-  //is the actual thing that was selected before the wizard was launched. In the runtime/j2ee/project 
-  //defaulting algorithm, clientInitialSelection will be given first priority. If, however, it is 
-  //deemed that clientInitialProject is not a valid initial selection, initialInitialSelection
-  //will be given second priority. Things that could make an initialSelection invalid include
-  //1. The containing project contains the Web service for which we are trying to create a client
-  //2. The containing project has a J2EE level, server target, and project type combination which
-  //   is not supported by any of the registered Web service runtimes.
-  private IProject clientInitialProject_;
-  private String clientInitialComponentName_;
-  private IProject initialInitialProject_;
-  private String initialInitialComponentName_;
-
-  private String clientJ2EEVersion_;
-  protected boolean clientNeedEAR_ = true;
-  
-  private String wsdlURI_;
-  private WebServicesParser parser_;
-
-
-  public ClientRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-    String  pluginId = "org.eclipse.jst.ws.consumption.ui";
-    msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientIds_; 
-  }
-  
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    return runtimeClientTypes_;
-  }
-  
-  public String getClientProjectName()
-  {
-    return getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
-  }
-  
-  public String getClientEarProjectName()
-  {
-    return getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().getSelection();
-  }
-  
-  public String getClientComponentName()
-  {
-    return clientComponentName_;
-  }
-  
-  public String getClientEarComponentName()
-  {
-    return clientEarComponentName_;
-  }
-  
-  protected void setClientEARComponentName(String name)
-  {
-    clientEarComponentName_ = name;
-  }
-  
-  public String getClientComponentType()
-  {
-    return  getRuntime2ClientTypes().getChoice().getList().getSelection();
-  }
-  
-  public String getClientJ2EEVersion()
-  {
-    return clientJ2EEVersion_;
-  }
-  
-  public IWebServiceClient getWebService()
-  {
-    return webServiceClient_;  
-  }
-    
-  public IContext getContext()
-  {
-    return context_;
-  }  
-  
-  public ISelection getSelection()
-  {
-    return selection_;    
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-    
-    try
-    {
-        	
-	  String[] runtimeIds = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId()); 
-      SelectionList list = new SelectionList(runtimeIds, 0);
-      Vector choices = new Vector();
-      for (int i = 0; i < runtimeIds.length; i++) {
-        choices.add(getClientTypesChoice(runtimeIds[i]));
-      }
-      runtimeClientTypes_ = new SelectionListChoices(list, choices);
-      setClientDefaultRuntimeFromPreference();
-      setClientDefaultJ2EEVersionFromPreference();
-      setClientComponentType();
-      clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(clientInitialProject_, clientInitialComponentName_);
-      if (clientRuntimeJ2EEType_ != null)
-      {
-        clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
-        setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
-        setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
-        
-      }
-	  //setClientRuntimeId((WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId()))[0]);
-	  //setClientComponentType();
-	  //clientJ2EEVersion_ = (WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels())[0];
-	  
-
-      //If clientInitialProject is the service project, check the initialInitialProject
-      //to see if it is valid.
-	    ///* 
-      ValidationUtils vu = new ValidationUtils();
-      if (vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
-      {            
-        clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(initialInitialProject_, initialInitialComponentName_);
-        if (clientRuntimeJ2EEType_ != null)
-        {
-          clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
-          setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
-          setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
-          //Since the original clientIntialProject was invalid but initialInitialProject is valid,
-          //reset clientInitalProject_ to be initialInitialProject for the benefit of
-          //downstream project defaulting.
-          clientInitialProject_ = initialInitialProject_;
-          clientInitialComponentName_ = initialInitialComponentName_;
-        }
-      }
-      //*/
-    
-      setClientDefaultProject();
-      setClientDefaultEAR();
-      IStatus serverStatus = setClientDefaultServer();
-      if (serverStatus.getSeverity()== Status.ERROR)
-      {
-          env.getStatusHandler().reportError(serverStatus);
-          return serverStatus;
-      }
-      updateClientEARs();
-      
-      //Calculate default IWebServiceClient
-      setDefaultsForExtension(env);
-      return Status.OK_STATUS;
-    } catch (Exception e)
-    {
-      //Catch all Exceptions in order to give some feedback to the user
-      IStatus errorStatus = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}), e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-  }
-  
-
-  /**
-   * 
-   * @param runtimeId
-   * @return
-   */
-  private SelectionListChoices getClientTypesChoice(String runtimeId)
-  {
-    String[] clientComponentTypes;
-	clientComponentTypes = WebServiceRuntimeExtensionUtils.getClientProjectTypes(clientIds_.getTypeId(), runtimeId);
-    SelectionList list = new SelectionList(clientComponentTypes, 0);
-    Vector choices = new Vector();
-    for (int i = 0; i < clientComponentTypes.length; i++) {
-      choices.add(getProjectChoice(clientComponentTypes[i]));
-    }
-    return new SelectionListChoices(list, choices);
-  }
-    
-  /**
-   * 
-   * @param clientType
-   * @return
-   * 
-   */
-  private SelectionListChoices getProjectChoice(String clientType)
-  {
-    //IProject[] projects = ClientProjectTypeRegistry.getInstance().getProjects(clientType);	  
-    //String[] projectNames = new String[projects.length];
-	    //for (int i = 0; i < projectNames.length; i++)
-		  //    projectNames[i] = projects[i].getName();	  
-	String[] projectNames = J2EEUtils.getProjectsContainingComponentOfType(clientType);
-    SelectionList list = new SelectionList(projectNames, 0);
-    Vector choices = new Vector();
-    for (int i = 0; i < projectNames.length; i++)
-	{
-	  IProject project = ProjectUtilities.getProject(projectNames[i]);
-      choices.add(getProjectEARChoice(project));
-	}
-    return new SelectionListChoices(list, choices, getEARProjects());
-  }
-  
-/**
- * 
- * @param project
- * @return
- */
-  protected SelectionListChoices getProjectEARChoice(IProject project)
-  {
-    String[] flexProjects = getAllFlexibleProjects();
-    SelectionList list = new SelectionList(flexProjects, 0);
-    return new SelectionListChoices(list, null);
-  }
-  
-  protected SelectionList getEARProjects()
-  {
-    /*
-    IProject[] earProjects = J2EEUtils.getEARProjects();
-    String[] earProjectNames = new String[earProjects.length];
-    for (int i=0; i<earProjects.length; i++)
-    {
-      earProjectNames[i] = earProjects[i].getName();
-    }
-    */
-    String[] flexProjects = getAllFlexibleProjects();
-    return new SelectionList(flexProjects, 0);
-  }
-
-  // rskreg
-  /*
-  private String[] gatherAttributeValues(IConfigurationElement[] elements, String key)
-  {
-    Vector v = new Vector();
-    for (int i = 0; i < elements.length; i++)
-    {
-      String value = elements[i].getAttribute(key);
-      if (value != null && value.length() > 0)
-      {
-        if (!v.contains(value))
-          v.add(value);
-      }
-    }
-    return (String [])v.toArray(new String[0]);
-  }
-  */
-  // rskreg
-  
-
-  private void setClientDefaultRuntimeFromPreference()
-  {
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String pRuntimeId = context.getRuntimeId();
-
-    //set the client runtime to be the preferred runtime if the client type allows.
-    setClientRuntimeId(pRuntimeId);
-  }
-
-  
-  private void setClientRuntimeId(String id)
-  {
-    String[] clientRuntimeIds = getRuntime2ClientTypes().getList().getList();
-    for (int i=0; i<clientRuntimeIds.length;i++)
-    {
-    	if(clientRuntimeIds[i].equals(id))
-    	{
-    	  getClientTypeRuntimeServer().setRuntimeId(id);
-		  getRuntime2ClientTypes().getList().setIndex(i);
-		  break;
-   	    }
-    }    
-  }
-  
-  private void setClientProjectType(String id)
-  {
-    String[] clientProjectTypeIds = getRuntime2ClientTypes().getChoice().getList().getList();
-    for (int i=0; i<clientProjectTypeIds.length;i++)
-    {
-    	if(clientProjectTypeIds[i].equals(id))
-    	{
-    	  getRuntime2ClientTypes().getChoice().getList().setIndex(i);
-		  break;
-   	    }
-    }        
-  }
-  
-
-  protected void setClientDefaultJ2EEVersionFromPreference()
-  {
-    if (clientIds_ != null)
-    {
-      String runtimeId = clientIds_.getRuntimeId();
-      if (runtimeId != null)
-      {
-        //IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
-        WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
-        if (wsrt != null)
-        {
-          String[] versions = wsrt.getJ2eeLevels();
-          if (versions != null && versions.length > 0)
-          {
-          	PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-          	String pJ2EE = context.getJ2EEVersion();
-          	if (pJ2EE!=null && pJ2EE.length()>0)
-          	{
-              for (int i=0;i<versions.length;i++)
-          	  {
-          		if (versions[i].equals(pJ2EE))
-          		{
-          	      clientJ2EEVersion_ = versions[i];
-          		  return;
-          		}
-          	  }
-          	}
-          	clientJ2EEVersion_ = versions[0];
-          	return;          	
-          }
-        }
-      }
-    }  	
-  }
-
-
-  private WSRuntimeJ2EEType getClientRuntimeAndJ2EEFromProject(IProject project, String componentName)
-  {
-    WSRuntimeJ2EEType cRJ2EE = null;
-    //If there is a valid initial selection, use it to determine
-    //reasonable J2EE version and Web service runtime values
-
-    if (project != null && project.exists())
-    {   
-      boolean isValidComponentType = false;
-      if (componentName != null && componentName.length()>0)
-      {
-        isValidComponentType = J2EEUtils.isWebComponent(project, componentName) ||
-                                     J2EEUtils.isEJBComponent(project, componentName) ||
-                                     J2EEUtils.isAppClientComponent(project, componentName) ||
-                                     J2EEUtils.isJavaComponent(project, componentName);
-      }
-      
-      if (isValidComponentType)
-      {
-        //WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-        
-        //Get the J2EE level
-        String versionString = null;
-        if (!J2EEUtils.isJavaComponent(project, componentName))
-        {
-	        int versionId = J2EEUtils.getJ2EEVersion(project, componentName);        
-	        versionString = String.valueOf(versionId);
-        }
-
-        //Get the runtime target of the project
-        IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
-        String runtimeTargetId = null;
-        if (runtimeTarget != null) 
-          runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-        
-        //Get the client project type
-        //String clientProjectTypeId = getClientProjectTypeFromRuntimeId(project, clientIds_.getRuntimeId());
-        String clientComponentTypeId = J2EEUtils.getComponentTypeId(project, componentName);        
-        
-        //If the preferred runtime supports this J2EE level and server target, keep it
-        if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId())) &&
-            ((runtimeTarget == null) ||
-             ((runtimeTarget != null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId()))) &&
-             (WebServiceRuntimeExtensionUtils.doesRuntimeSupportComponentType(clientIds_.getTypeId(), clientIds_.getRuntimeId(), clientComponentTypeId))
-           )
-        {
-          //Set the J2EE level and web service runtime to match the project
-          cRJ2EE = new WSRuntimeJ2EEType();
-          cRJ2EE.setJ2eeVersionId(versionString);
-          cRJ2EE.setWsrId(clientIds_.getRuntimeId());
-          cRJ2EE.setClientProjectTypeId(clientComponentTypeId);
-          return cRJ2EE;
-        } else
-        {
-          //Look for a runtime that matches
-          String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId());
-          for (int i = 0; i < validRuntimes.length; i++)
-          {
-            //String thisClientProjectTypeId = getClientProjectTypeFromRuntimeId(project, validRuntimes[i]); 
-            if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i])) &&
-                ((runtimeTarget == null) ||
-                 ((runtimeTarget != null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))) &&
-                 (WebServiceRuntimeExtensionUtils.doesRuntimeSupportComponentType(clientIds_.getTypeId(), validRuntimes[i], clientComponentTypeId))
-                )
-            {
-              cRJ2EE = new WSRuntimeJ2EEType();
-              cRJ2EE.setJ2eeVersionId(versionString);
-              cRJ2EE.setWsrId(validRuntimes[i]);
-              cRJ2EE.setClientProjectTypeId(clientComponentTypeId);
-              return cRJ2EE;
-            }
-          }
-        }
-      }
-    }    
-    return cRJ2EE;
-  }
-
-  
-  private void setClientComponentType()
-  {
-	  getRuntime2ClientTypes().getChoice().getList().setIndex(0);	  
-  }
-
-  /*
-  private void setClientDefaultProjectNew()
-  {
-    if (clientInitialProject_ != null)
-    {
-      getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
-      String moduleName = null;
-      if (clientInitialComponentName_!=null && clientInitialComponentName_.length()>0)
-      {
-        moduleName = clientInitialComponentName_;
-      }
-      else
-      {
-        moduleName = J2EEUtils.getFirstWebModuleName(clientInitialProject_);
-      }
-      clientComponentName_ = moduleName;
-      String version = String.valueOf(J2EEUtils.getJ2EEVersion(clientInitialProject_, moduleName));
-      String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels();
-      for (int i=0; i< validVersions.length; i++)
-      {
-        if (validVersions[i].equals(version))
-        {
-          clientJ2EEVersion_ = validVersions[i];
-        }
-      }           
-    }
-    else
-    {
-      //Pick the first one
-      IProject[] projects = WebServiceRuntimeExtensionUtils.getAllProjects();
-      if (projects.length>0)
-      {
-        getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projects[0].getName());
-        String moduleName = J2EEUtils.getFirstWebModuleName(projects[0]);
-        clientComponentName_ = moduleName;
-        String version = String.valueOf(J2EEUtils.getJ2EEVersion(projects[0], moduleName));
-        String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels();
-        for (int i=0; i< validVersions.length; i++)
-        {
-          if (validVersions[i].equals(version))
-          {
-            clientJ2EEVersion_ = validVersions[i];
-          }
-        }        
-        
-      }
-      else
-      {
-        //there are no projects in the workspace. Pass the default names for new projects.
-        getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-        clientComponentName_ = ResourceUtils.getDefaultWebComponentName();
-      }      
-    }
-  }
-  */
-  
-  private void setClientDefaultProject()
-  {    
-	//Handle the case where no valid initial selection exists
-    if (clientInitialProject_ == null || (clientInitialProject_!=null && clientRuntimeJ2EEType_==null))
-    {
-      //Select the first existing project that is valid.
-      setClientProjectToFirstValid();
-      return;
-    }    
-
-    ValidationUtils vu = new ValidationUtils();
-    if (!vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
-    {
-      getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
-      clientComponentName_ = clientInitialComponentName_;
-    }
-    else
-    {
-      setClientProjectToFirstValid();
-    }
-
-  }
-
-
-  private void setClientProjectToFirstValid()
-  {
-    //WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-    ValidationUtils vu = new ValidationUtils();
-    String[] projectNames = getRuntime2ClientTypes().getChoice().getChoice().getList().getList();
- 
-    for (int i=0;i<projectNames.length; i++)
-    {
-      IProject project = ProjectUtilities.getProject(projectNames[i]);
-      IVirtualComponent[] vcs = J2EEUtils.getComponentsByType(project, getClientComponentType());
-      if (project.isOpen() && vcs!=null && vcs.length>0)
-      {
-        
-        //Get the runtime target of the project
-        IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
-        String runtimeTargetId = null;
-        if (runtimeTarget != null) 
-          runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-        
-        for (int j=0; j < vcs.length; j++)
-        {          
-          //Get the J2EE level
-          int versionId = J2EEUtils.getJ2EEVersion(vcs[j]);
-          String versionString = String.valueOf(versionId);
-        
-
-        
-          if (clientJ2EEVersion_ != null && clientJ2EEVersion_.length()>0 && clientJ2EEVersion_.equals(versionString))
-          {
-            if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId()) &&
-               ((runtimeTarget == null) || 
-               ((runtimeTarget!=null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId()))) 
-               )
-            {
-              if (!vu.isProjectServiceProject(project, wsdlURI_, parser_))
-              {        	
-                getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projectNames[i]);
-                clientComponentName_ = vcs[j].getName();
-                return;
-              }
-            }
-          }
-        }
-      }
-    }
-    
-    //No valid project was found. Enter a new project name.
-    getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-    clientComponentName_ = ResourceUtils.getDefaultWebProjectName();
-  }
-
-  
-  protected IResource getResourceFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          return resource;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  
-  private void setClientDefaultEAR()
-  {
-    //Client-side
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);    
-    //IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject);
-    String[] clientEARInfo = getDefaultEARFromClientProject(initialClientProject, clientComponentName_);
-    
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(clientEARInfo[0]);
-    clientEarComponentName_ = clientEARInfo[1];
-  }
-  
-  /*
-  private void setClientDefaultEARNew()
-  {    
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject =   (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
-    IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialClientProject, clientComponentName_);
-    if (earComps.length>0)
-    {
-      //Pick the first one
-      IVirtualComponent earComp = earComps[0];
-      String earProjectName = earComp.getProject().getName();
-      String earComponentName = earComp.getName();
-      getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
-      clientEarComponentName_ = earComponentName;      
-    }
-    else
-    {
-      //Component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
-      IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-      if (allEarComps.length>0)
-      {
-        for (int i=0; i<allEarComps.length; i++)
-        {
-          if (clientJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
-          {
-            String earProjectName = allEarComps[i].getProject().getName();
-            getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
-            clientEarComponentName_ = allEarComps[i].getName();
-            
-          }
-            
-        }
-      }
-      else
-      {
-        //there are no Ears.
-        getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultClientEARProjectName());
-        clientEarComponentName_ = ResourceUtils.getDefaultClientEARComponentName();
-      }
-      
-      
-    }
-  }
-  */
-  /**
-   * 
-   * @param project
-   * @return
-   * 
-   *  
-   */
-  
-  protected String[] getDefaultEARFromClientProject(IProject project, String componentName)
-  {
-    String[] projectAndComp = new String[2];
-    IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(project, componentName);
-    if (earComps.length>0)
-    {
-      //Pick the first one
-      IVirtualComponent earComp = earComps[0];
-      projectAndComp[0] = earComp.getProject().getName();
-      projectAndComp[1]= earComp.getName();
-      return projectAndComp;
-      //getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
-      //clientEarComponentName_ = earComponentName;      
-    }    
-
-    //Either project does not exist or component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
-    IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-    if (allEarComps.length>0)
-    {
-      for (int i=0; i<allEarComps.length; i++)
-      {
-        if (clientJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
-        {
-          String earProjectName = allEarComps[i].getProject().getName();
-          projectAndComp[0] = earProjectName;
-          projectAndComp[1] = allEarComps[i].getName();
-          return projectAndComp;
-          //getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
-          //clientEarComponentName_ = allEarComps[i].getName();
-          
-        }
-          
-      }
-      projectAndComp[0] = ResourceUtils.getDefaultClientEARProjectName();
-      projectAndComp[1] = ResourceUtils.getDefaultClientEARComponentName();
-      return projectAndComp;      
-      
-    }
-    else
-    {
-      //there are no Ears.
-      projectAndComp[0] = ResourceUtils.getDefaultClientEARProjectName();
-      projectAndComp[1] = ResourceUtils.getDefaultClientEARComponentName();
-      return projectAndComp;
-      //getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultClientEARProjectName());
-      //clientEarComponentName_ = ResourceUtils.getDefaultClientEARComponentName();
-    }    
-  }
-    
-  private IStatus setClientDefaultServer()
-  {
-	  IStatus status = Status.OK_STATUS;
-    //Calculate reasonable default server based on initial project selection. 
-    String initialClientProjectName = runtimeClientTypes_.getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
-    if (initialClientProject.exists())
-    {
-      String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialClientProject, clientComponentName_, clientIds_.getRuntimeId(), true);
-      if (serverInfo!=null)
-      {
-        if (serverInfo[0]!=null && serverInfo[0].length()>0)
-        {
-          clientIds_.setServerId(serverInfo[0]);
-        }
-        if (serverInfo[1]!=null && serverInfo[1].length()>0)
-        {
-          clientIds_.setServerInstanceId(serverInfo[1]);
-        }        
-      }      
-    }
-    else //the project does not exist.
-    {
-      //Does the EAR exist?
-      String initialClientEARProjectName = runtimeClientTypes_.getChoice().getChoice().getChoice().getList().getSelection();
-      IProject initialClientEARProject = ProjectUtilities.getProject(initialClientEARProjectName);
-      if (initialClientEARProject.exists())
-      {
-        String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialClientEARProject, clientEarComponentName_, clientIds_.getRuntimeId(), false);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            clientIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            clientIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }              
-      }
-      else
-      {
-        String[] serverInfo = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(clientIds_.getRuntimeId(), clientJ2EEVersion_);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            clientIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            clientIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }
-        else
-        {
-        	//Since the project and the EAR are both new, try changing the J2EE level
-        	boolean foundServer = false;
-        	WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId());
-            if (wsrt != null)
-            {
-              String[] versions = wsrt.getJ2eeLevels();
-              if (versions != null && versions.length > 0)
-              {
-            	  for (int k=0; k<versions.length; k++)
-            	  {
-            		  //If this J2EE version is different from the current one, see if there is
-            		  //a server available.
-            		  if (clientJ2EEVersion_!=versions[k])
-            		  {
-            			  String[] si = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(clientIds_.getRuntimeId(), versions[k]);
-             		      if (si!=null)
-            		      {
-            		        if (si[0]!=null && si[0].length()>0)
-            		        {
-            		          clientIds_.setServerId(si[0]);
-            		        }
-            		        if (si[1]!=null && si[1].length()>0)
-            		        {
-            		          clientIds_.setServerInstanceId(si[1]);
-            		        }             
-            		        clientJ2EEVersion_ = versions[k];
-            		        foundServer = true;
-            		        break;
-            		      }
-            		  
-            	      }
-                  }
-               }
-            }
-        	//No valid server runtimes appear to be configured, this is an error condition.
-            if (!foundServer)
-            {
-              String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(clientIds_.getRuntimeId());
-              String serverLabels = getServerLabels(clientIds_.getRuntimeId());
-        	  status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}) );
-            }
-        	
-        }
-      }
-      
-    }    
-    
-    return status;
-  }  
-  
-  protected String getServerLabels(String runtimeId)
-  {
-	    WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
-	    String[] validServerFactoryIds = wsrt.getServerFactoryIds();
-	    //String[] validServerLabels = new String[validServerFactoryIds.length];
-	    StringBuffer validServerLabels = new StringBuffer(); 
-	    for (int i=0; i<validServerFactoryIds.length; i++)
-	    {
-	    	if (i>0)
-	    	{
-	    		validServerLabels.append(", ");
-	    	}
-	    	validServerLabels.append(WebServiceRuntimeExtensionUtils.getServerLabelById(validServerFactoryIds[i]));
-	    	
-	    }
-	    return validServerLabels.toString();
-  }
-  
-  protected void updateClientProject(String projectName, String componentName, String serviceTypeId)
-  {
-    boolean isEJB = false;
-    String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(serviceTypeId);
-    isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb"));
-    String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, componentName, isEJB);
-    getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(updatedNames[0]);
-    clientComponentName_ = updatedNames[1];
-    
-  }
-  
-  protected void updateClientEARs()
-  {
-  	//Set EAR selection to null if the project/server defaults imply an EAR should not be created
-    String clientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
-  	IProject clientProject = ProjectUtilities.getProject(clientProjectName);
-  	if (clientProject != null && clientProject.exists())
-  	{
-  	  //Get the runtime target on the serviceProject
-  	  IRuntime clientTarget = ServerSelectionUtils.getRuntimeTarget(clientProjectName);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(clientProject, clientComponentName_));
-  	  if (clientTarget != null)
-  	  {
-  	  	if (!ServerUtils.isTargetValidForEAR(clientTarget.getRuntimeType().getId(),j2eeVersion))
-  	  	{
-  	      //Default the EAR selection to be empty
-  	  	  getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
-          clientEarComponentName_="";
-  	  	  clientNeedEAR_ = false;
-  	  	}  	  		
-  	  }
-  	  
-  	}
-  	else
-  	{
-      String serverId = clientIds_.getServerId();
-      if (serverId != null)
-      {
-  		//Use the server type
-  		String clientServerTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
-  		if (clientServerTargetId!=null && clientServerTargetId.length()>0)
-  		{
-  		  if (!ServerUtils.isTargetValidForEAR(clientServerTargetId,clientJ2EEVersion_))
-  	  	  {
-  	        //Default the EAR selection to be empty
-  	  	    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
-            clientEarComponentName_="";
-  	  	    clientNeedEAR_ = false;
-  	  	  }
-  		}
-      }
-  	}  	
-  }  
-  
-  private void setDefaultsForExtension(Environment env)
-  {
-    IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntime(clientIds_.getRuntimeId());
-    if (wsrt != null)
-    {
-      WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
-      wsInfo.setJ2eeLevel(clientJ2EEVersion_);
-      wsInfo.setServerFactoryId(clientIds_.getServerId());
-      wsInfo.setServerInstanceId(clientIds_.getServerInstanceId());
-      wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
-      wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId());
-      wsInfo.setWsdlURL(wsdlURI_);
-
-      webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
-      WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
-      if (resourceContext_ != null)
-      {
-        context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_
-            .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled());
-      }
-    }
-  
-  }
-  
-  public void setClientInitialSelection(IStructuredSelection selection)
-  {
-    if (clientInitialProject_ == null)
-    {
-      clientInitialProject_ = getProjectFromInitialSelection(selection);
-      clientInitialComponentName_ = getComponentNameFromInitialSelection(selection);
-    }
-  }
-
-  public void setClientInitialProject(IProject clientInitialProject)
-  {
-    clientInitialProject_ = clientInitialProject;
-  }
-  
-  public void setClientInitialComponentName(String name)
-  {
-    clientInitialComponentName_ = name;
-  }  
-  
-  /**
-   * @param initialInitialSelection_ The initialInitialSelection_ to set.
-   */
-  public void setInitialInitialSelection(IStructuredSelection initialInitialSelection)
-  {
-    initialInitialProject_ = getProjectFromInitialSelection(initialInitialSelection);
-    initialInitialComponentName_ = getComponentNameFromInitialSelection(initialInitialSelection);
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientNeedEAR_;
-  }
-
-  /**
-   * @param parser_ The parser_ to set.
-   */
-  public void setWebServicesParser(WebServicesParser parser) {
-  	parser_ = parser;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    wsdlURI_ = wsdlURI;
-  }
-  
-  public void setTestService(boolean testService)
-  {
-    test_ = testService;
-  }   
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;   
-  }  
-  
-  private IProject getProjectFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
-          return p;
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-  
-  private String getComponentNameFromInitialSelection(IStructuredSelection selection)
-  {
-    if (selection != null && selection.size() == 1)
-    {
-      Object obj = selection.getFirstElement();
-      if (obj != null) 
-      {
-        try
-        { 
-          IResource resource = ResourceUtils.getResourceFromSelection(obj);
-          if (resource==null) 
-            return null;
-          
-          IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-          if (comp!=null)
-          {
-            return comp.getName();
-          }
-        } catch(CoreException e)
-        {
-          return null;
-        }        
-      }
-    }
-    return null;
-  }
-
-  /*
-  private String getClientProjectTypeFromRuntimeId(IProject p, String runtimeId)
-  {
-    //Navigate the runtimeClientTypes to see if we can navigate from the provided
-    //runtime to the provided project's name.
-    String pName = p.getName();
-    String[] runtimeIds = getRuntime2ClientTypes().getList().getList();
-    int numberOfRuntimes = runtimeIds.length;
-    //Get the index of the runtimeId we are interested in
-    for (int i=0; i<numberOfRuntimes; i++)
-    {
-      if (runtimeIds[i].equals(runtimeId))
-      {
-        //Get the list of client project types for this runtimeId
-        SelectionListChoices clientProjectTypesToProjects= getRuntime2ClientTypes().getChoice(i);
-        String[] clientProjectTypes = clientProjectTypesToProjects.getList().getList();
-        for (int j=0; j<clientProjectTypes.length; j++)
-        {
-          //Get the list of projects for this clientProjectType. If pName
-          //is in this list, we know the runtimeId supports this project
-          //and we know the client project type.
-          String[] clientProjects = clientProjectTypesToProjects.getChoice(j).getList().getList();
-          for (int k=0; k<clientProjects.length; k++)
-          {
-            if (clientProjects[k].equals(pName))
-            {
-              //Found the project!!
-              return clientProjectTypes[j];
-            }
-          }
-        }
-        
-      }
-    }
-
-    //We didn't find the project under any of this runtimes client project types.
-    //This means that this runtime does not support that client type. Return null
-    return null;
-  }
-  */
-  
-  protected String[] getAllFlexibleProjects()
-  {
-    Vector v = new Vector();
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    for (int i = 0; i < projects.length; i++)
-    {
-      if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
-      {
-        v.add(projects[i].getName());
-      }
-    }    
-    
-    return (String[])v.toArray(new String[0]);
-    
-  }
-  
-  /**
-   * This inner class is being used to pass around Web service runtime
-   * and J2EE level information.
-   * 
-   */
-  protected class WSRuntimeJ2EEType
-  {
-    private String wsrId_;
-    private String j2eeVersionId_;
-    private String clientProjectTypeId; //only used for client-side defaulting
-    
-    public WSRuntimeJ2EEType()
-    {
-     //making this ctor public so that subclasses can instantiate. 
-    }    
-    /**
-     * @return Returns the j2eeVersionId_.
-     */
-    public String getJ2eeVersionId()
-    {
-      return j2eeVersionId_;
-    }
-    /**
-     * @param versionId_ The j2eeVersionId_ to set.
-     */
-    public void setJ2eeVersionId(String versionId_)
-    {
-      j2eeVersionId_ = versionId_;
-    }
-    /**
-     * @return Returns the wsrId_.
-     */
-    public String getWsrId()
-    {
-      return wsrId_;
-    }
-    /**
-     * @param wsrId_ The wsrId_ to set.
-     */
-    public void setWsrId(String wsrId_)
-    {
-      this.wsrId_ = wsrId_;
-    }    
-    
-    /**
-     * @return Returns the clientProjectTypeId.
-     */
-    public String getClientProjectTypeId()
-    {
-      return clientProjectTypeId;
-    }
-    /**
-     * @param clientProjectTypeId The clientProjectTypeId to set.
-     */
-    public void setClientProjectTypeId(String clientProjectTypeId)
-    {
-      this.clientProjectTypeId = clientProjectTypeId;
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
deleted file mode 100644
index 81a2cd5a6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,651 +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.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
-
-  private final String EAR_PERMITTED_PROJECT_TYPE = "EAR_PERMITTED_PROJECT_TYPE";
-  //private final String JAVA_PROJECT_TYPE_ID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-  
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  private SelectionListChoices projects_;
-  
-  private boolean needEAR_;
-  
-  private TypeRuntimeServer trsIds_;
-  
-  private String j2eeVersion_;
-  
-  private String projectTypeId_ = EAR_PERMITTED_PROJECT_TYPE;
-
-  private Listener statusListener_;
-
-  private Text messageText_;
-
-  private boolean isClient_ = false;
-
-  private MessageUtils msgUtils;
-
-  private byte CREATE_PROJECT = (byte) 1;
-
-  private byte CREATE_EAR = (byte) 2;
-
-  private byte ADD_EAR_ASSOCIATION = (byte) 4;
-  
-  private Combo moduleProject_;
-  private Combo earProject_;
-  private String   componentType_;
-  
-  private ModifyListener moduleProjectListener_;
-  private ModifyListener moduleListener_;
-  private ModifyListener earProjectListener_;
-  private ModifyListener earModuleListener_;
-
-  private String initialModuleName_;
-  
-  /*
-   * CONTEXT_ID PWRS0006 for the service-side Web project combo box of the
-   * runtime selection Page
-   */
-  private String INFOPOP_PWRS_COMBO_PROJECT = pluginId_ + ".PWRS0006";
-
-  private Combo module_;
-
-  /* CONTEXT_ID PWRS0012 for the EAR combo box of the runtime selection Page */
-  private String INFOPOP_PWRS_COMBO_EAR = pluginId_ + ".PWRS0012";
-
-  private Combo earModule_;
-
-  /*
-   * Default Constructor
-   */
-  public ProjectSelectionWidget() {
-  }
-
-  /*
-   * ProjectSelectionWidget @param isClient
-   */
-  public ProjectSelectionWidget(boolean isClient) {
-    this.isClient_ = isClient;
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
-    msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-    UIUtils uiUtils = new UIUtils(msgUtils, pluginId_);
-
-    statusListener_ = statusListener;
-		
-    if (isClient_)
-	{
-	  moduleProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_PROJECT", "LABEL_CLIENT_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-      module_ = uiUtils.createCombo(parent, "LABEL_CLIENT_MODULE", "LABEL_CLIENT_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  earProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_PROJECT", "LABEL_CLIENT_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  earModule_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_MODULE", "LABEL_CLIENT_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER );
-    }
-    else 
-	{
-	  moduleProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_PROJECT", "LABEL_SERVICE_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-      module_ = uiUtils.createCombo(parent, "LABEL_SERVICE_MODULE", "LABEL_SERVICE_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  earProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_PROJECT", "LABEL_SERVICE_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
-	  earModule_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_MODULE", "LABEL_SERVICE_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER );
-    }
-	
-    //module_.addModifyListener(projectListener_);
-	
-    //earModule_.addModifyListener(earListener_);
-    //earModule_.addListener(SWT.Modify, statusListener);
-	
-	moduleProjectListener_ = new ModifyListener()
-	                         {
-	                           public void modifyText(ModifyEvent evt) 
-					           {
-					             handleModuleProjectChanged(null);
-					             statusListener_.handleEvent( null );
-		                       }
-	                         };
-
-	moduleListener_ = new ModifyListener()
-                      {
-                        public void modifyText(ModifyEvent evt) 
-			            {
-			              handleModuleChanged();
-				          statusListener_.handleEvent( null );
-	                    }
-                      };
-	
-	earProjectListener_ = new ModifyListener()
-                          {
-                            public void modifyText(ModifyEvent evt) 
-				            {
-				              handleEarProjectChanged();
-				              statusListener_.handleEvent( null );
-	                        }
-                          };
-                          
-    earModuleListener_ = new ModifyListener()
-                             {
-                               public void modifyText(ModifyEvent evt) 
-				               {
-				                 statusListener_.handleEvent( null );
-	                           }
-                             };
-							  
-    // message area
-    messageText_ = uiUtils.createText(parent, "LABEL_NO_LABEL", "LABEL_NO_LABEL", null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
-  
-    return this;
-  }
-  
-  private void listenersOn()
-  {
-	module_.addModifyListener( moduleListener_ );
-	moduleProject_.addModifyListener( moduleProjectListener_ );
-	earProject_.addModifyListener( earProjectListener_ );
-	earModule_.addModifyListener( earModuleListener_ );
-  }
-  
-  private void listenersOff()
-  {
-    module_.removeModifyListener( moduleListener_ );
-	moduleProject_.removeModifyListener( moduleProjectListener_ );
-	earProject_.removeModifyListener( earProjectListener_ );
-	earModule_.removeModifyListener( earModuleListener_ );
-  }
-  
-  private void handleModuleProjectChanged(String moduleName)
-  {
-	String   projectName = moduleProject_.getText(); 
-	IProject project     = null;
-	
-	if( projectName.equals( "" ) ) 
-	{
-	  module_.setItems( new String[0] );
-	  
-	  return;
-	}
-			
-	project = ProjectUtilities.getProject( projectName );
-	
-	
-	IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, componentType_ );
-	String[] modules = new String[components.length];
-	
-	for( int index = 0; index < components.length; index++ )
-	{
-	  modules[index] = components[index].getName();	
-	}
-	
-	module_.setItems( modules );
-	
-	  if( modules.length > 0 )
-	  {
-      if (moduleName != null)
-      {
-       module_.setText(moduleName); 
-      }
-      else
-      {
-	      module_.setText( modules[0] );
-      }
-       
-	  }
-	  else
-	  {
-	    module_.setText( projectName );
-	  }
-  
-  }
-  
-  private void handleModuleChanged()
-  {
-	IVirtualComponent component = getEarModuleForModule();
-	
-	if( component != null )
-	{
-	  String earProject    = component.getProject().getName();
-	  String componentName = component.getName();
-	
-      // This will cause the module list to be update via a listener.
-	  earProject_.setText( earProject );  
-	  earModule_.setText( componentName );
-	}
-	else
-	{
-	  earProject_.setText( "" );  
-	  earModule_.setText( "" );
-	}
-	
-	updateEAREnabledState();
-  }
-
-  private void handleEarProjectChanged()
-  {
-	
-	String   projectName = earProject_.getText(); 
-	
-	if( projectName != null && !projectName.equals( "" ))
-	{
-	  IProject project     = ProjectUtilities.getProject( projectName );
-	
-	  IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, J2EEUtils.EAR );
-	  String[] earModules = new String[components.length];
-	
-	  for( int index = 0; index < components.length; index++ )
-	  {
-	    earModules[index] = components[index].getName();	
-	  }
-	
-	  earModule_.setItems( earModules );
-	
-	  if( earModules.length > 0 )
-	  {
-	    earModule_.setText( earModules[0] );	
-	  }
-	  else
-	  {
-	    earModule_.setText( projectName );	
-	  }
-	}
-	else
-	{
-	  earModule_.setItems( new String[0] );	
-	}
-  }
-  
-  private IVirtualComponent getEarModuleForModule()
-  {
-	String   projectName = moduleProject_.getText(); 
-	
-	if( projectName.equals( "" ) )
-	{
-	  return null;	
-	}
-	
-	IProject project     = ProjectUtilities.getProject( projectName );
-	String   compName    = module_.getText();
-	
-	IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project, compName );
-	
-	return components.length == 0 ? null : components[0];
-  }
-    
-  public void setProjectChoices(SelectionListChoices projects) 
-  {
-	listenersOff();
-	
-    projects_ = projects;
-	
-	String   selectedModuleProject    = projects.getList().getSelection();
-	String   selectedEarModuleProject = projects.getChoice().getList().getSelection();
-	String[] projectNames             = getProjects();
-	
-	moduleProject_.setItems( projectNames );
-	moduleProject_.setText( selectedModuleProject );
-	earProject_.setItems( projectNames );
-	earProject_.setText( selectedEarModuleProject );
-		
-	handleModuleProjectChanged(initialModuleName_);
-  handleModuleChanged();
-	updateEAREnabledState();	
-    listenersOn();
-  }
-
-  public SelectionListChoices getProjectChoices() 
-  {
-    return projects_;
-  }
-  
-  public String getComponentName()
-  {
-	return module_.getText();
-  }
-  
-  public void setComponentName( String name )
-  {
-	listenersOff();
-    module_.setText( name );
-    initialModuleName_ = name;
-	listenersOn();
-  }
-  
-  public String getEarComponentName()
-  {
-    return earModule_.getText();
-  }
-  
-  public void setEarComponentName( String name )
-  { 
-	listenersOff();
-	earModule_.setText( name );
-	listenersOn();
-  }
-  
-  public void setComponentType( String type )
-  {
-	componentType_ = type;  
-  }
-  
-  public String getComponentType( )
-  {
-	  return componentType_;
-  }
-  
-  public boolean getNeedEAR()
-  {
-    return needEAR_;
-  }
-  
-  public String getProjectName()
-  {
-    return moduleProject_.getText();  
-  }
-  
-  public String getEarProjectName()
-  {
-	return earProject_.getText();  
-  }
-  
-  public void setNeedEAR(boolean b)
-  {
-    needEAR_ = b;
-  }    
-
-  public void setTypeRuntimeServer(TypeRuntimeServer trs)
-  {
-    trsIds_ = trs;
-	listenersOff();
-    updateEAREnabledState();
-    listenersOn();
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-    j2eeVersion_ = j2eeVersion;
-	listenersOff();
-    updateEAREnabledState();
-	listenersOn();
-  }
-  
-  public void setProjectTypeId(String id)
-  {
-    projectTypeId_ = id;
-  }
-  
-  private String[] getProjects()
-  {
-	IProject[] projects     = J2EEUtils.getAllFlexibleProjects();
-	String[]   projectNames = new String[projects.length];
-	
-	for( int index = 0; index < projects.length; index++ )
-	{
-	  projectNames[index] = projects[index].getName();	
-	}
-	
-	return projectNames;
-  }
-    
-  private void updateEAREnabledState()
-  {
-    if (projects_ != null)
-    {
-      if(!projectNeedsEAR(moduleProject_.getText(), module_.getText()))
-      {
-	    earModule_.setEnabled(false);   
-		earProject_.setEnabled(false);
-        earModule_.setText("");
-		earProject_.setText("");
-        needEAR_ = false;
-      }
-      else
-      {
-        needEAR_ = true;
-        earModule_.setEnabled(true);
-		earProject_.setEnabled(true);
-        populateEARCombos();
-      }
-    }
-  }
-
-  private void populateEARCombos()
-  {
-    earModule_.removeAll();
-    earProject_.removeAll();
-    String moduleName = module_.getText();
-    IProject moduleProj = ResourcesPlugin.getWorkspace().getRoot().getProject(moduleProject_.getText());
-    if (moduleProj.exists())
-    {
-      IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(moduleProj, moduleName);
-      if (ears != null && ears.length > 0)
-      {
-        for (int i = 0; i < ears.length; i++)
-        {
-          earModule_.add(ears[i].getName());
-          earProject_.add(ears[i].getProject().getName());
-        }
-        earModule_.select(0);
-        earProject_.select(0);
-        return;
-      }
-    }
-    String earName = moduleName + "EAR";
-    earModule_.setText(earName);
-    earProject_.setText(earName);
-  }
-
-  private boolean projectNeedsEAR(String projectName, String componentName)
-  {
-    if (projectTypeId_.equals(IModuleConstants.JST_UTILITY_MODULE))
-      return false;
-    
-    if (projectName == null || projectName.length()==0)
-      return true;
-    
-    if (componentName == null || componentName.length()==0)
-      return true;
-    
-    
-    //IProject project = (IProject)((new StringToIProjectTransformer()).transform(projectName));
-	IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
-  	if (project != null && project.exists())
-  	{
-  	  //Get the runtime target on the project
-  	  IRuntime target = ServerSelectionUtils.getRuntimeTarget(projectName);
-  	  String j2eeVersion = String.valueOf(J2EEVersionConstants.J2EE_1_4_ID);
-  	  if (J2EEUtils.exists(project, componentName))
-  	    j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(project, componentName));
-  	
-  	  
-  	  if (target != null)
-  	  {
-  	  	if (!ServerUtils.isTargetValidForEAR(target.getRuntimeType().getId(),j2eeVersion))
-  	  	{
-          return false;
-  	  	}
-  	  		
-  	  }
-  	}
-  	else
-  	{
-  		//Use the server type
-  	    if (trsIds_ != null && trsIds_.getServerId() != null)
-  	    {
-  		  String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId());
-  		  if (targetId!=null && targetId.length()>0)
-  		  {
-  		    if (!ServerUtils.isTargetValidForEAR(targetId,j2eeVersion_))
-  		    {
-  		      return false;
-  	  	    }
-  		  }
-  	    }
-  	}      	
-  	
-  	return true;    
-  }
-  
-  private IStatus handleSetMessageText() {
-    IStatus status = Status.OK_STATUS;
-    try {
-      byte result = (byte) 0;
-      if (module_.getText().length() != 0 && earModule_.getText().length() != 0) {
-    	String moduleName = module_.getText();
-    	String earModuleName = earModule_.getText();
-        String projectText = moduleProject_.getText();
-        String earText = earProject_.getText();
-        IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
-        IProject ear = ResourceUtils.getWorkspaceRoot().getProject(earText);
-        if (project != null) {
-          if (!project.exists()) {
-            result = (byte) (result | CREATE_PROJECT);
-          }
-          if (!ear.exists()) {
-            result = (byte) (result | CREATE_EAR);
-          }
-
-          if (project.exists() && J2EEUtils.exists(project, moduleName) && ear.exists() && J2EEUtils.exists(ear, earModuleName)) {
-            if (!J2EEUtils.isComponentAssociated(ear, earModuleName, project, moduleName)) result = (byte) (result | ADD_EAR_ASSOCIATION);
-          }
-        }
-      }
-      if (isClient_) {
-        messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_CLIENT_SUB")));
-      }
-      else {
-        messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_SERVICE_SUB")));
-      }
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( msgUtils.getMessage("PAGE_MSG_VALIDATION_INTERNAL_ERROR"), e );
-    }
-    return status;
-  }
-  
-  private String getValidationMessage(byte result, String serviceOrClient) {
-    String msg = null;
-    switch (result) {
-    case 0:
-      return "";
-    case 1:
-    case 5:
-      msg = "MSG_PROJECT_WILL_BE_CREATED";
-      break;
-    case 2:
-    case 6:
-      msg = "MSG_EAR_WILL_BE_CREATED";
-      break;
-    case 3:
-    case 7:
-      msg = "MSG_PROJECT_AND_EAR_CREATED";
-      break;
-    case 4:
-      msg = "MSG_EAR_WILL_BE_ASSOCIATED";
-      break;
-    }
-    return msg != null ? msgUtils.getMessage(msg, new Object[] { serviceOrClient}) : "";
-  }
-
-  public IStatus getStatus() 
-  {
-    IStatus finalStatus = Status.OK_STATUS;
-    handleSetMessageText();
-    String projectText = moduleProject_.getText();
-    String earText = earProject_.getText();
-    String moduleText = msgUtils.getMessage( "MSG_MODULE" );
-    
-    if (projectText==null || projectText.length()==0)
-    {
-      if (isClient_)
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_PROJECT_EMPTY", new String[]{""} ) );
-      else
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVICE_PROJECT_EMPTY", new String[]{""} ) );
-    }
-    
-    if (needEAR_ && (earText==null || earText.length()==0))
-    {
-      if (isClient_)
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{""} ) );
-      else
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVICE_EAR_EMPTY", new String[]{""} ) );      
-    }
-    
-    if( module_ == null || module_.getText().length() == 0 ) 
-    {
-      if( isClient_ )
-      {
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_PROJECT_EMPTY", new String[]{moduleText} ) );
-      }
-      else
-      {
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{moduleText} ) );        	
-      }
-    }
-      
-    if( needEAR_ && ( earModule_ == null || earModule_.getText().length() == 0 ) )
-    {
-      if( isClient_ )
-      {
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{moduleText} ) );
-      }
-      else
-      {
-        return StatusUtils.errorStatus( msgUtils.getMessage("MSG_SERVICE_EAR_EMPTY", new String[]{moduleText} ) );        	
-      }  
-    }
-    
-//  TODO:  Defect 107997 - Revisit prject and module creation logic
-//    if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
-//    {
-//      IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
-//        
-//      if( project != null && project.exists() )
-//      {
-//    	String            moduleName = module_.getText();
-//        IVirtualComponent component  = J2EEUtils.getVirtualComponent( project, moduleName );  
-//        
-//        if( !component.exists() && !moduleName.equals( projectText ) )
-//        {
-//          finalStatus = new SimpleStatus("",msgUtils.getMessage("MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME" ),Status.ERROR);   	
-//        }
-//      }
-//    }
-    
-    return finalStatus;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
deleted file mode 100644
index 6b4db2bf1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
+++ /dev/null
@@ -1,273 +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.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-
-public class RuntimeServerSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String            pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private Text              runtime_;
-  private Text              server_;
-  private Text              j2eeVersionText;
-  private Composite         parent_;
-  private boolean           isClientContext_;
-  private TypeRuntimeServer ids_;
-  private String             j2eeVersion_;
-  private MessageUtils       msgUtils_;
-  private Listener           statusListener_;
-  
-  /* CONTEXT_ID PWRS0004 for the service-side runtime selection of the runtime selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE_RUNTIME = pluginId_ + ".PWRS0004";
-
-  /* CONTEXT_ID PWRS0005 for the service-sdie server selection of the runtime selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE_SERVER = pluginId_ + ".PWRS0005";
-
-  /* CONTEXT_ID PWRS0009 for the J2EE version selection of the runtime selection Page */
-  private String INFOPOP_PWRS_J2EE_VERSION = pluginId_ + ".PWRS0009";
-
-  public RuntimeServerSelectionWidget( boolean isClientScenario )
-  {
-    isClientContext_ = isClientScenario; 
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils_, pluginId_ ); 
-    
-    parent_         = parent;
-    statusListener_ = statusListener;
-        
-    // Runtime label and text
-    runtime_ = uiUtils.createText( parent, "LABEL_RUNTIMES_LIST",  
-                                   "TOOLTIP_PWRS_TEXT_RUNTIME",
-                                   INFOPOP_PWRS_GROUP_SERVICE_RUNTIME, SWT.READ_ONLY );
-    
-    // Server label and text
-    server_ = uiUtils.createText( parent, "LABEL_SERVERS_LIST",  
-                                  "TOOLTIP_PWRS_TEXT_SERVER",
-                                  INFOPOP_PWRS_GROUP_SERVICE_SERVER, SWT.READ_ONLY );
-    
-    j2eeVersionText = uiUtils.createText(parent, "LABEL_J2EE_VERSION", "TOOLTIP_PWRS_J2EE_VERSION", INFOPOP_PWRS_J2EE_VERSION, SWT.READ_ONLY);
-    
-    Button editButton = new Button( parent, SWT.NONE );
-    editButton.setText( msgUtils_.getMessage("LABEL_EDIT_BUTTON")); 
-    editButton.addSelectionListener( new SelectionAdapter()
-                                     {
-                                       public void widgetSelected( SelectionEvent  evt )
-                                       {
-                                         handleEditButton(); 
-                                       }
-                                     } );
-    
-    // Dummy label that goes on the right side of the edit button.
-    new Label( parent, SWT.NONE );
-    
-    return this;
-  }
-
-  public TypeRuntimeServer getTypeRuntimeServer()
-  {
-    return ids_;  
-  }
-  
-  public void setTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    ids_ = ids;
-    setLabels();
-  }
-  
-  public String getJ2EEVersion()
-  {
-    return j2eeVersion_;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-    this.j2eeVersion_ = j2eeVersion;
-    j2eeVersionText.setText((j2eeVersion_ != null) ? J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion_) : msgUtils_.getMessage("LABEL_NA"));
-    //setLabels();
-  }
-  
-  private void setLabels()
-  {
-	  // rskreg
-    //WebServiceClientTypeRegistry registry     = WebServiceClientTypeRegistry.getInstance();
-    //String                       runtimeLabel = registry.getRuntimeLabelById( ids_.getRuntimeId() );
-	String                       runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById( ids_.getRuntimeId() );
-    String                       serverLabel  = null;
-    
-    if( ids_.getServerInstanceId() == null )
-    {
-      // Get the label for the general server type.
-      //WebServiceServer server = registry.getWebServiceServerByFactoryId( ids_.getServerId() );
-      //serverLabel = server == null ? "" : server.getLabel();
-      String serverId = ids_.getServerId();
-      if (serverId != null)
-        serverLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(serverId);
-    }
-    else
-    {
-      // Get the label for the server instance.
-      //serverLabel = registry.getServerInstanceLabelFromInstanceId( ids_.getServerInstanceId() );
-      String serverInstanceId = ids_.getServerInstanceId();
-      if (serverInstanceId != null)
-        serverLabel = WebServiceRuntimeExtensionUtils.getServerInstanceLabelFromInstanceId(serverInstanceId);
-    }
-    // rskreg
-    runtimeLabel = runtimeLabel == null ? "" : runtimeLabel;
-    
-    runtime_.setText( runtimeLabel );
-    if (serverLabel != null)
-      server_.setText( serverLabel );
-    j2eeVersionText.setText((j2eeVersion_ != null) ? J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion_) : msgUtils_.getMessage("LABEL_NA"));
-  }
-  
-  public void handleEditButton()
-  {
-    byte mode = isClientContext_ ? (byte)1 : (byte)0;
-    
-    RuntimeServerSelectionDialog dialog     
-      = dialog = new RuntimeServerSelectionDialog( parent_.getShell(), mode, ids_, j2eeVersion_ );
-    dialog.create();
-    dialog.handleServerViewSelectionEvent();
-    int result = dialog.open();
-
-    if (result == Window.OK)
-    {
-      ids_ = dialog.getTypeRuntimeServer();
-      j2eeVersion_ = dialog.getJ2EEVersion();
-      setLabels();
-      statusListener_.handleEvent(null);
-    }  
-  }  
-  
-  public void addModifyListener(ModifyListener listener)
-  {
-    if (runtime_ != null)
-      runtime_.addModifyListener(listener);
-  }
-  
-  public void removeModifyListener(ModifyListener listener)
-  {
-    if (runtime_ != null)
-      runtime_.removeModifyListener(listener);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    IStatus status = Status.OK_STATUS;
-    String scenario = isClientContext_ ? msgUtils_.getMessage( "MSG_CLIENT_SUB" )
-                                        : msgUtils_.getMessage( "MSG_SERVICE_SUB" );
-    
-	String                       runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById( ids_.getRuntimeId() );
-	String                       serverLabel  = ids_.getServerId() == null ? "" : WebServiceRuntimeExtensionUtils.getServerLabelById(ids_.getServerId());
-    
-	
-    if( ids_.getRuntimeId() == null || runtimeLabel == null || runtimeLabel.equals("" ))
-    {
-      status = StatusUtils.errorStatus(msgUtils_.getMessage( "MSG_NO_RUNTIME", new String[]{ scenario } ) );
-    }
-    else if( ids_.getServerId() == null || serverLabel.equals( "" ))
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage( "MSG_NO_SERVER", new String[]{ scenario } ) );      
-    }
-
-    //Check if only stub runtime is available for the selected server type
-    
-    String serverFactoryId = ids_.getServerId();
-    //
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-	if (serverType!=null) {
-		
-		//Find a Runtime which is not a stub
-		//IRuntime nonStubRuntime = null;
-		boolean foundNonStubRuntime = false;
-		IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
-		String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-		for (int i = 0; i < runtimes.length; i++) {
-			IRuntime runtime = runtimes[i];
-			String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-			if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
-		        //Found an appropriate IRuntime that is not a stub
-				foundNonStubRuntime=true;
-				break;
-			}
-		}				
-		
-		if (!foundNonStubRuntime)
-		{	
-			String servertypeLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(serverFactoryId);
-			status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_STUB_ONLY",new String[]{servertypeLabel}) );					
-		}
-	}		
-    
-    //
-    
-	//--------- check if WSCT exists for these selections
-	if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && isClientContext_)
-	{
-
-		if (!WebServiceRuntimeExtensionUtils.webServiceClientRuntimeTypeExists( ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) 
-		{
-			status = StatusUtils.errorStatus( msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ) );		  
-		}
-
-	}    
-    
-    //--------- check if WSSRT exists for these selections
-    if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && !isClientContext_)
-    {
-
-	  if (!WebServiceRuntimeExtensionUtils.isServerRuntimeTypeSupported(ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) {	  
-        status = StatusUtils.errorStatus( msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ) );      
-      }
-
-    }
-	
-    
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
deleted file mode 100644
index 72afb34cb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,351 +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.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusHandler;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the 
-* JBWizard Plugin
-*
-*
-*/
-public class ClientTestDelegateCommand extends AbstractDataModelOperation
-{
-  private WebServiceTestRegistry testRegistry;
-  private SelectionList testFacilities;
-  private String jspFolder;
-  private BooleanSelection[] methods;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String proxyBean;
-  private String sampleProject;
-  private String sampleP;
-  private String sampleC;
-  private String clientProject;
-  private String clientP;
-  private String clientC;
-  private boolean clientNeedEAR;
-  private String clientEarProjectName;
-  private String clientEarComponentName;
-  private TypeRuntimeServer serverIds;
-  private String serviceProject;
-  private String serviceP;
-  private String wsdlServiceURL;
-  private boolean isTestWidget = false;
-  private String setEndpointMethod;
-  private List endpoints;
-
-  public ClientTestDelegateCommand ()
-  {
-    testRegistry = WebServiceTestRegistry.getInstance();
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-  	IStatus status = Status.OK_STATUS;
-  	String clientTestID = testFacilities.getSelection();
-  	
-	//Get the webservice extension
-	
-	WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID);
-    IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
-	TestInfo testInfo = getTestInfo();
-	
-	status = commandFactoryExecution(iwst.generate(testInfo),env, monitor );
-	if(status.getSeverity() == Status.ERROR){
-	  return status;	
-	}
-	status = commandFactoryExecution(iwst.launch(testInfo),env, monitor );
-	if(status.getSeverity() == Status.ERROR){
-	  return status;	
-	}
-	
-    return status;
-  }
-  
-  private IStatus commandFactoryExecution(ICommandFactory commandFactory,Environment env, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;  	
-	
-	while(commandFactory.hasNext())
-  {
-    AbstractDataModelOperation operation = commandFactory.getNextCommand();
-    operation.setEnvironment( env );
-    
-    try
-    {
-      status = operation.execute( monitor, null );
-    }
-    catch( Exception exc )
-    {
-      status = StatusUtils.errorStatus( exc );  
-    }
-    
-	  if(status.getSeverity() == Status.ERROR){
-	    StatusHandler sHandler = env.getStatusHandler();
-		sHandler.reportError(status);
-		return status;
-	  }
-    }
-    return status;
-  }
-  
-  
-  //Helper method which sets up the TestInfo data structure
-  private TestInfo getTestInfo()
-  {
-	IServer serviceExistingServer = null;
-	String serviceServerTypeID = null;
-		
-	//service server info
-	if(serverIds != null){
-	  if (serverIds.getServerInstanceId() != null) 
-	    serviceExistingServer = ServerCore.findServer(serverIds.getServerInstanceId());
-	}	
-	if (serviceExistingServer != null)
-      serviceServerTypeID = serviceExistingServer.getServerType().getId();
-    
-	
-	if(clientProject != null){
-  	  int index = clientProject.indexOf("/");
-      if (index!=-1){
-        clientP = clientProject.substring(0,index);
-        clientC = clientProject.substring(index + 1);
-      }
-  	}
-
-  
-	if(sampleProject != null){
-	  int index = sampleProject.indexOf("/");
-      if (index!=-1){
-        sampleP = sampleProject.substring(0,index);
-        sampleC = sampleProject.substring(index + 1);
-      }
-	}
-	
-    
-	
-	TestInfo testInfo = new TestInfo();  
-	testInfo.setClientExistingServer(sampleExistingServer);
-	testInfo.setClientServerTypeID(sampleServerTypeID);
-	testInfo.setJspFolder(jspFolder);
-	testInfo.setEndpoint(endpoints);
-	testInfo.setGenerationProject(sampleP);
-	testInfo.setGenerationModule(sampleC);
-	testInfo.setProxyBean(proxyBean);
-	testInfo.setSetEndpointMethod(setEndpointMethod);
-	testInfo.setClientProject(clientP);
-	testInfo.setClientModule(clientC);
-	testInfo.setClientNeedEAR(clientNeedEAR);
-	testInfo.setClientEARProject(clientEarProjectName);
-	testInfo.setClientEARModule(clientEarComponentName);
-	testInfo.setMethods(methods);
-	
-	//if this is a client scenario the service stuff is empty
-	if(serviceServerTypeID == null){
-	  serviceServerTypeID = sampleServerTypeID;
-	  serviceExistingServer = sampleExistingServer;
-	}
-	
-	
-	testInfo.setServiceServerTypeID(serviceServerTypeID);
-	testInfo.setServiceExistingServer(serviceExistingServer);
-	//wsdl stuff
-	testInfo.setServiceProject(getWSDLProject());
-	testInfo.setWsdlServiceURL(wsdlServiceURL);
-	return testInfo;
-  }
-   
-
-  
-  //The test facilities retrieved from the extension
-  //plus the default
-  public void setTestFacility(SelectionList selection)
-  {
-    testFacilities = selection;
-  } 
-  
-  public void setFolder(String folder)
-  {
-  }
-  
-  public void setJspFolder(String jspFolder)
-  {
-  	this.jspFolder = jspFolder;
-  }
-  
-  public void setMethods(BooleanSelection[] methods)
-  {
-    this.methods = methods;  
-  }
- 
-  public void setRunClientTest(boolean runClientTest)
-  {
-  }
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-  
-  public void setSampleProject(String sampleProject)
-  {
-  	this.sampleProject = sampleProject;
-  }
-  
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
-  public void setScenarioContext(ScenarioContext scenarioContext)
-  {
-  }
-  
-  public void setClientTestRegistry(WebServiceTestRegistry testRegistry)
-  {
-  	this.testRegistry = testRegistry;
-  }
-   
-  public void setSampleServerTypeID(String sampleServerTypeID)
-  {
-  	this.sampleServerTypeID = sampleServerTypeID;
-  }
-  
-  public void setSampleExistingServer(IServer sampleExistingServer)
-  {
-  	this.sampleExistingServer = sampleExistingServer;
-  }
-
-  public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-  }
-  
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-  {
-    serverIds = ids;
-  }
-  
-  public String getSampleServerTypeID()
-  {
-  	return sampleServerTypeID;
-  }
-  
-  public IServer getSampleExistingServer()
-  {
-  	return sampleExistingServer;
-  }
-
-  public void setClientServer(String clientServer)
-  {
-  }
-  
-  public void setServerProject(String serviceProject)
-  {
-  	this.serviceProject = serviceProject;
-  }
-  
-  public String getWSDLProject()
-  {
-  	 if(serviceProject != null){
-	     int index = serviceProject.indexOf("/");
-       if (index!=-1) {
-		     serviceP = serviceProject.substring(0,index);
-	       return serviceP;
-       }
-  	}	
-	
-  	return clientP;
-  }
-  
-  public void setWsdlURI(String wsdlServiceURL)
-  {
-    this.wsdlServiceURL = wsdlServiceURL;
-  }
- 
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  }
-  
-  public boolean getIsTestWidget()
-  {
-  	return isTestWidget;
-  }
-
-  public void setClientEarProjectName(String clientEarProjectName)
-  {
-     this.clientEarProjectName = clientEarProjectName;
-  }
-  
-  public void setClientEarComponentName(String clientEarComponentName)
-  {
-	this.clientEarComponentName = clientEarComponentName;
-  }
-  
-  
-  
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-  /**
-   * @param endpoint The endpoint to set.
-   */
-  public void setEndpoint(String endpoint)
-  {
-    if (endpoint != null && endpoint.length() > 0)
-    {
-      Vector v = new Vector();
-      v.add(endpoint);
-      setEndpoints(v);
-    }
-  }
-  
-  public void setEndpoints(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-  
-  public boolean getClientNeedEAR() {
-		return clientNeedEAR;
-	}
-
-	public void setClientNeedEAR(boolean clientNeedEAR) {
-		this.clientNeedEAR = clientNeedEAR;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
deleted file mode 100644
index 1c13e3b4d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
+++ /dev/null
@@ -1,59 +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.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class ClientTestFragment extends BooleanFragment
-{
-  private boolean testService;
-  private boolean genProxy;
-  private boolean launchedTest = false;
-  
-  public ClientTestFragment( String id )
-  {
-    SequenceFragment clientTestRoot = new SequenceFragment();
-    Condition        condition      = new Condition()
-                                      {
-                                        public boolean evaluate()
-                                        {
-                                          return testService && genProxy;
-                                        }
-                                      };
-    setCondition( condition );
-    
-    clientTestRoot.add( new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" ) );
-    clientTestRoot.add( new SimpleFragment( id ) );
-    setTrueFragment( clientTestRoot );
-    
-  }
-  
-  public void setGenerateProxy( boolean genProxy )
-  {
-    this.genProxy = genProxy;  
-  }
-  
-  public void setTestService( Boolean testService )
-  {
-    this.testService = testService.booleanValue();  
-  } 
-
-  public boolean getLaunchedTest()
-  {
-  	return launchedTest;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
deleted file mode 100644
index 87d54067f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,416 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-
-
-public class ClientTestWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
-  /*CONTEXT_ID PWSM0001 for the Sample Page*/
-  private String INFOPOP_PWSM_PAGE =  "PWSM0001";
-  //
-  private Button testCheckbox_;
-  /*CONTEXT_ID PWSM0002 for the Test check box of the Sample Page*/
-  private String INFOPOP_PWSM_CHECKBOX_TEST = "PWSM0002";
-
-  private Combo testTypeCombo_;
-   /*CONTEXT_ID PWSM0003 for the Test Type Combo box of the Sample Page*/
-  private String INFOPOP_PWSM_COMBOBOX_TEST = "PWSM0003";
-
-  private Text  jspFolderText_;
-  /*CONTEXT_ID PWSM0008 for the JSP Folder field of the Sample Page*/
-  private String INFOPOP_PWSM_TEXT_JSP_FOLDER = "PWSM0008";
-
-  private Button sampleFolderBrowseButton_;
-  /*CONTEXT_ID PWSM0009 for the JSP Folder Browse button of the Sample Page*/
-  private String INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE = "PWSM0009";
-
-  private Combo projectCombo_;
-  /*CONTEXT_ID PWSM0010 for the Project combo box of the Sample Page*/
-  private String INFOPOP_PWSM_COMBO_PROJECT = "PWSM0010";
-
-  private Tree methodsTree_;
-
-  private Button selectAllMethodsButton_;
-  /*CONTEXT_ID PWSM0006 for the Select All button of the Sample Page*/
-  private String INFOPOP_PWSM_BUTTON_SELECT_ALL = "PWSM0006";
-
-  private Button deselectAllMethodsButton_;
-  /*CONTEXT_ID PWSM0007 for the Deselect All button of the Sample Page*/
-  private String INFOPOP_PWSM_BUTTON_DESELECT_ALL = "PWSM0007";
-
-  private Text sampleFolderText_;
-  /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/   
-  private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014";
-  //
-  private Button runTestCheckbox_;  
-  /*CONTEXT_ID PWSM0015 for the run test check box of the Sample Page*/
-  private String INFOPOP_PWSM_CHECKBOX_LAUNCH = "PWSM0015";
-  //
-  private Combo earCombo_;
-  /*CONTEXT_ID PWSM0016 for the EAR combo box of the Sample Page*/
-  private String INFOPOP_PWSM_EAR_COMBO = "PWSM0016";
-  
-  private Composite            comboGroup_; 
-  private SelectionList        testFacilities_;
-  private FolderResourceFilter folderFilter_ = new FolderResourceFilter();
-  private IStructuredSelection initialSelection_;
-  private boolean isTestWidget = false;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    isTestWidget = true;
-  	MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, pluginId_ );
-        
-	parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWSM_PAGE" ) );
-	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE );
-    
-    testCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_TEST",
-                                            "TOOLTIP_PWSM_CHECKBOX_TEST",
-                                            INFOPOP_PWSM_CHECKBOX_TEST );
-    testCheckbox_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent evt )
-                                          {
-                                            handleTestButton();
-                                          }
-                                        });
-    
-    comboGroup_ = uiUtils.createComposite( parent, 3, 5, 0 );
-    
-    testTypeCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_TEST_TYPES",
-                                          "TOOLTIP_PWSM_COMBOBOX_TEST",
-                                          INFOPOP_PWSM_COMBOBOX_TEST,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    new Label( comboGroup_, SWT.NONE );
-    
-    projectCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_JSP_PROJECT_NAME",
-                                          "TOOLTIP_PWSM_COMBO_PROJECT",
-                                          INFOPOP_PWSM_COMBO_PROJECT,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    projectCombo_.setEnabled( false );
-    new Label( comboGroup_, SWT.NONE );
-    
-    
-    earCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_EAR_PROJECTS",
-                                     "TOOLTIP_PWSM_EAR_PROJECT",
-                                     INFOPOP_PWSM_EAR_COMBO,
-                                     SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    earCombo_.setEnabled( false );
-    new Label( comboGroup_, SWT.NONE );
-    
-    
-    
-    sampleFolderText_ = uiUtils.createText( comboGroup_, "LABEL_FOLDER_NAME",
-                                            "TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER",
-                                            INFOPOP_PWSM_TEXT_SAMPLE_FOLDER,
-                                            SWT.SINGLE | SWT.BORDER );
-    
-    sampleFolderText_.addModifyListener( new ModifyListener()
-        {
-        public void modifyText( ModifyEvent evt )
-        {
-          handleFolderText(); 
-        }
-      });
-    
-       
-    sampleFolderBrowseButton_ = uiUtils.createPushButton( comboGroup_, "BUTTON_BROWSE", 
-                                                          "TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE",
-                                                          INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE );
-    sampleFolderBrowseButton_.addSelectionListener( new SelectionAdapter()
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSampleBrowse(); 
-                                                      }
-                                                    });
-    
-    jspFolderText_ = uiUtils.createText( comboGroup_, "LABEL_JSP_FOLDER_NAME",
-            "TOOLTIP_PWSM_TEXT_JSP_FOLDER",
-            INFOPOP_PWSM_TEXT_JSP_FOLDER,
-            SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    jspFolderText_.setEnabled( false );
-    
-    Group methodsGroup = uiUtils.createGroup( parent, "LABEL_METHODS",  
-                                             "TOOLTIP_PWSM_TREE_METHODS", null );
-    
-	methodsGroup.setLayoutData( uiUtils.createFillAll() );
-	
-	GridLayout layout = new GridLayout();
-	layout.marginHeight = 0;
-	layout.marginWidth = 0;
-	methodsGroup.setLayout( layout );
-	
-	// TODO No infopop for this tree.
-	methodsTree_ = uiUtils.createTree( methodsGroup, "TOOLTIP_PWSM_TREE_METHODS", 
-	                                   null,
-	                   				   SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL	| SWT.CHECK );
-
-    Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-    
-    selectAllMethodsButton_ 
-      = uiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL", 
-                                                 "TOOLTIP_PWSM_BUTTON_SELECT_ALL",
-                                                 INFOPOP_PWSM_BUTTON_SELECT_ALL );
-    selectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                  {
-                                                    public void widgetSelected( SelectionEvent evt )
-                                                    {
-                                                      handleSelectAll( true );
-                                                    }
-                                                  });
-    
-    deselectAllMethodsButton_ 
-      = uiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL", 
-                                  "TOOLTIP_PWSM_BUTTON_DESELECT_ALL",
-                                  INFOPOP_PWSM_BUTTON_DESELECT_ALL );
-    deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter() 
-                                                    {
-                                                      public void widgetSelected( SelectionEvent evt )
-                                                      {
-                                                        handleSelectAll( false );
-                                                      }
-                                                    });
-    
-    runTestCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_RUN_TEST",
-                                               "TOOLTIP_PWSM_CHECKBOX_LAUNCH",
-                                               INFOPOP_PWSM_CHECKBOX_LAUNCH );
-    
-    return this;
-  }
-  
-  private void handleFolderText()
-  {
-  	String folder = sampleFolderText_.getText();	
-    String jspFolder = jspFolderText_.getText();
-    int index = jspFolder.lastIndexOf(Path.SEPARATOR);
-    if(index == -1) return;
-    jspFolder = jspFolder.substring(0,index + 1);
-    jspFolder = jspFolder + folder;
-    jspFolderText_.setText(jspFolder);
-  }
-  
-  private void handleSampleBrowse()
-  {
-    IPath      selectedPath       = null;
-    IResource  initialResource    = null;
-    IPath      projectPath        = new Path( projectCombo_.getText() ).makeAbsolute();
-    IResource  project            = ResourceUtils.findResource( projectPath );
-//    IContainer webModuleContainer = ResourceUtils.getWebModuleServerRoot( (IProject)project);
-    IContainer webModuleContainer = J2EEUtils.getFirstWebContentContainer((IProject)project);  
-    try
-    {
-      initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ );
-    }
-    catch( CoreException exc )
-    {  
-    }
-    
-    if( initialResource == null )initialResource = project;
-    
-    IResource resource = DialogUtils.browseResources( comboGroup_.getShell(), 
-                                                      project,
-                                                      initialResource, 
-                                                      folderFilter_ );
-    
-    if( resource != null )
-    {
-      selectedPath = resource.getFullPath();   
-    
-      int webModuleSegments = selectedPath.matchingFirstSegments(webModuleContainer.getFullPath());
-      
-      if ( webModuleSegments < 2 )
-      {
-        sampleFolderText_.setText("");
-        handleFolderText();
-      }
-      else
-      {
-        sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString());
-        handleFolderText();
-      }
-    }
-  }
-  
-  private void handleTestButton()
-  {
-    boolean enabled = testCheckbox_.getSelection();
-    
-    testTypeCombo_.setEnabled( enabled );
-    sampleFolderText_.setEnabled( enabled );
-    methodsTree_.setEnabled( enabled );
-    runTestCheckbox_.setEnabled( enabled );
-    selectAllMethodsButton_.setEnabled( enabled );
-    deselectAllMethodsButton_.setEnabled( enabled );
-    sampleFolderBrowseButton_.setEnabled( enabled );
-  }
-  
-  private void handleSelectAll( boolean value )
-  {
-	TreeItem[] items = methodsTree_.getItems();
-	
-	for( int i = 0; i < items.length; i++ ) 
-	{
-	  items[i].setChecked(value);
-	}
-  } 
-  
-  // Here are the getters and setters for this widget.
-  public void setTestService( Boolean testService )
-  {
-    testCheckbox_.setSelection( testService.booleanValue() );
-    handleTestButton();
-  }
-  
-  public Boolean getTestService()
-  {
-    return new Boolean( testCheckbox_.getSelection() );
-  }
-  
-  public void setTestFacility( SelectionList testFacilities )
-  {
-    testFacilities_ = testFacilities;
-    testTypeCombo_.setItems( testFacilities.getList() );
-    testTypeCombo_.select( testFacilities.getIndex() );
-  }
-  
-  public SelectionList getTestFacility()
-  {
-    testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() );
-    return testFacilities_;
-  }
-  
-  public String getTestID()
-  {
-    return testTypeCombo_.getText();
-  }
-  
-  public void setSampleProject(String clientProject) 
-  {
-	projectCombo_.setItems( new String[]{ clientProject } );
-	projectCombo_.select(0);
-  }
-  
-  public void setSampleProjectEAR(String clientProjectEAR) 
-  {
-    earCombo_.setItems( new String[]{ clientProjectEAR } );
-    earCombo_.select(0);
-  }
-  
-  public String getFolder()
-  {
-    return sampleFolderText_.getText();
-  }
-  
-  public void setFolder( String folder )
-  {
-    sampleFolderText_.setText( folder );
-  }
-  
-  public boolean getIsTestWidget()
-  {
-  	return isTestWidget;
-  }
-  
-  public void setJspFolder( String folder )
-  {
-    jspFolderText_.setText( folder );
-  }
-  
-  public String getJspFolder()
-  {
-    return jspFolderText_.getText();
-  }
-  
-  public void setLaunchedServiceTestName (String launchedServiceTestName)
-  {
-  }
-  
-  public boolean getRunClientTest()
-  {
-    return runTestCheckbox_.getSelection();
-  }
-  
-  public void setRunClientTest( boolean value )
-  {
-    runTestCheckbox_.setSelection( value );
-  }
-  
-  public BooleanSelection[] getMethods()
-  {
-    TreeItem[]         items   = methodsTree_.getItems();
-    BooleanSelection[] methods = new BooleanSelection[items.length];
-    
-    for( int index = 0; index < items.length; index++ )
-    {
-      methods[index] = new BooleanSelection( items[index].getText(), items[index].getChecked() );
-    }
-    
-    return methods;
-  }
-  
-  public void setMethods( BooleanSelection[] methods )
-  {
-    methodsTree_.removeAll();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      if(methods[index] == null)continue;
-      TreeItem item = new TreeItem( methodsTree_, SWT.NULL );
-      item.setText( methods[index].getValue() );
-      item.setChecked( methods[index].isSelected() );
-    }
-  }
-  
-  public void setInitialSelection( IStructuredSelection selection )
-  {
-    initialSelection_ = selection;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
deleted file mode 100644
index 887507d23..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
+++ /dev/null
@@ -1,130 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusHandler;
-
-
-public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation 
-{
-  private String sampleProject;
-	private String sampleC;
-  private MessageUtils msgUtils;
-	
-/**
- * Default CTOR;
- */
-
-
-public CopyWebServiceUtilsJarCommand()
-{
-  String pluginId = "org.eclipse.jst.ws.consumption";
-  msgUtils = new MessageUtils(pluginId + ".plugin", this);  
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  Environment env = getEnvironment();
-  
-  try
-  {
-    ProgressUtils.report( monitor, msgUtils.getMessage( "PROGRESS_INFO_COPY_WEBSERVICE_UTILS" ) );
-    IProject sampleIProject = ProjectUtilities.getProject(sampleProject);    
-    IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject, sampleC);	
-    if (webModulePath == null)
-      return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_PROJECT_NOT_FOUND") );
-      
-    IStatus status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env, monitor);
-    if(status.getSeverity() == Status.ERROR){
-      StatusHandler sHandler = env.getStatusHandler();
-      IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS") );
-      sHandler.reportError(errorStatus);	
-      return status;
-     }
-      
-      
-    }
-    catch (Exception e) {
-      StatusHandler sHandler = env.getStatusHandler();
-      IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS") );
-      sHandler.reportError(errorStatus);	
-      return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"), e);
-    }
-  return Status.OK_STATUS;
-}
-
-/**
- *
- */
-private IStatus copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,Environment env, IProgressMonitor monitor )
-{
-    
-  if (plugin != null)
-  {
-    IPath target = targetPath.append(new Path(targetFile));
-    
-    ProgressUtils.report( monitor, msgUtils.getMessage( "PROGRESS_INFO_COPYING_FILE" ) );
-    try
-    {
-       ResourceContext context = new TransientResourceContext();
-       context.setOverwriteFilesEnabled(true);
-       context.setCreateFoldersEnabled(true);
-       context.setCheckoutFilesEnabled(true);
-       IResource resource = FileResourceUtils.findResource(target);
-       if(resource != null) return Status.OK_STATUS;
-       FileResourceUtils.createFile(context, 
-                      							target,
-                                    plugin.openStream(new Path(source)),
-                                    monitor,
-                                    env.getStatusHandler());
-    }
-    catch (Exception e) {
-      return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS") ,e);
-    }
-  }
-  return Status.OK_STATUS;
-}
-
-public void setSampleProject(String sampleProject)
-{
-  this.sampleProject = sampleProject;  
-}
-
-public void setSampleComponent(String sampleComponent){
-  this.sampleC = sampleComponent;
-}
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
deleted file mode 100644
index a5de43f1c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
+++ /dev/null
@@ -1,174 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IServer;
-
-public class CreateSampleProjectCommand extends AbstractDataModelOperation
-{
-  private String sampleProject;
-  private String sampleProjectEar;
-  private IServer existingServer;
-  private String serverFactoryId;
-  private boolean needEAR;
-  private String j2eeVersion;
-  
-  
-  public CreateSampleProjectCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-    if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists())
-    {
-      //Do the following
-      //1. Create the Web project/component to house the sample JSPs.
-      //2. If needEAR is true then
-      //   - create a EAR project and component if it doesn't exist
-      //   - add the Web component to the EAR component
-      //3. Add the right component to the server.
-      CreateModuleCommand command = new CreateModuleCommand();
-	  command.setProjectName(sampleProject);
-	  command.setModuleName(sampleProject);			
-	  command.setModuleType(CreateModuleCommand.WEB);
-	  command.setServerFactoryId(serverFactoryId);
-	  command.setServerInstanceId(existingServer.getId());
-	  command.setJ2eeLevel(j2eeVersion);
-    command.setEnvironment( env );
-	  IStatus status = command.execute( monitor, null ) ;
-	  if (status.getSeverity()==Status.ERROR)
-	  {
-		  env.getStatusHandler().reportError(status);
-		  return status;
-	  }
-		  
-	  if (needEAR)
-	  {
-			CreateModuleCommand commandEAR = new CreateModuleCommand();
-			commandEAR.setProjectName(sampleProjectEar);
-			//TODO The EAR component name is not necessarily the same as the project name
-			//so the component name needs to somehow be piped into this command
-			commandEAR.setModuleName(sampleProjectEar);
-			commandEAR.setModuleType(CreateModuleCommand.EAR);
-			commandEAR.setServerFactoryId(serverFactoryId);
-			commandEAR.setServerInstanceId(existingServer.getId());
-			commandEAR.setJ2eeLevel(j2eeVersion);
-      commandEAR.setEnvironment( env );
-			status = commandEAR.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-			  env.getStatusHandler().reportError(status);
-			  return status;
-			}			
-				
-				
-			//Associate the service module and service EAR
-			AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-			associateCommand.setProject(sampleProject);
-			associateCommand.setModule(sampleProject);
-			associateCommand.setEARProject(sampleProjectEar);
-			//TODO The EAR component name is not necessarily the same as the project name
-			//so the component name needs to somehow be piped into this command
-			associateCommand.setEar(sampleProjectEar);
-      associateCommand.setEnvironment( env );
-			status = associateCommand.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-				env.getStatusHandler().reportError(status);
-				return status;
-			}			
-				
-			//Add the EAR to the server
-			AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
-			commandInstall.setServerInstanceId(existingServer.getId());
-			commandInstall.setProject(sampleProjectEar);
-			//TODO The EAR component name is not necessarily the same as the project name
-			//so the component name needs to somehow be piped into this command
-			commandInstall.setModule(sampleProjectEar);
-			commandInstall.setEnvironment( env );	
-			status = commandInstall.execute( monitor, null ) ;
-			if (status.getSeverity()==Status.ERROR)
-			{
-				env.getStatusHandler().reportError(status);
-				return status;
-			}							
-		}
-	    else
-		{
-		    //Add the Web component to the server
-			AddModuleToServerCommand commandInstall = new AddModuleToServerCommand();
-			commandInstall.setServerInstanceId(existingServer.getId());
-			commandInstall.setProject(sampleProject);
-			commandInstall.setModule(sampleProject);
-      commandInstall.setEnvironment( env );
-			
-			status = commandInstall.execute( monitor, null ) ;
-			if (status.getSeverity()==Status.ERROR)
-			{
-				env.getStatusHandler().reportError(status);
-				return status;
-			}			  
-		}
-		  
-    }
-    return Status.OK_STATUS;
-  }
-
-  public void setSampleProject(String sampleProject)
-  {
-    this.sampleProject = sampleProject; 	
-  }
-
-  public void setSampleProjectEAR(String sampleProjectEar)
-  {
-  	this.sampleProjectEar = sampleProjectEar;
-  }
-
-  public void setExistingServer(IServer existingServer) {
-
-    this.existingServer = existingServer;
-  }
-  
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	this.serverFactoryId = serverFactoryId;
-  }
-
-  /**
-   * @param needEAR The needEAR to set.
-   */
-  public void setNeedEAR(boolean needEAR)
-  {
-    this.needEAR = needEAR;
-  }
-    
-  /**
-   * @param version The j2eeVersion to set.
-   */
-  public void setJ2eeVersion(String version)
-  {
-    j2eeVersion = version;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
deleted file mode 100644
index d18ad63a4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
+++ /dev/null
@@ -1,73 +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.consumption.ui.widgets.test;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the 
-* JBWizard Plugin
-*
-*
-*/
-public class FinishDefaultCommand extends AbstractDataModelOperation
-{
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  private String sampleServerInstanceId;
-
-  
-  public FinishDefaultCommand ()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  	IStatus status = Status.OK_STATUS;
-  	if(sampleServerInstanceId != null){
-  	  sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
-  	if (sampleExistingServer != null)
-      sampleServerTypeID = sampleExistingServer.getServerType().getId();
-      
-  	}
-    return status;
-  
-  }
-  
-  public void setServerInstanceId(String serverInstanceId)
-  {
-	this.sampleServerInstanceId = serverInstanceId;
-  }
-  
-  public String getSampleServerTypeID()
-  {
-  	return sampleServerTypeID;
-	
-  }
-  
-  public IServer getSampleExistingServer()
-  {
-  	return sampleExistingServer;
-  }
-
-  public void setExistingServerId(String existingServerId)
-  {
-  }  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
deleted file mode 100644
index b6e822d23..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
+++ /dev/null
@@ -1,64 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishJavaTestFragment extends BooleanFragment 
-{
-  private boolean generateProxy;
-	
-  public FinishJavaTestFragment()
-  {
-  	SequenceFragment javaTestRoot = new SequenceFragment();
-  	Condition condition = new Condition()
-	{
-	  public boolean evaluate()
-	  {
-	    return generateProxy; 
-	  }
-	};
-    setCondition(condition);
-    javaTestRoot.add(new SimpleFragment(new TestClientDepartureInitCommand(), ""));
-    javaTestRoot.add(new SimpleFragment(new BuildProjectCommand(), ""));
-    setTrueFragment(javaTestRoot);
-  }
-
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-  public void setIsJSPGen(boolean jspGen)
-  {
-  	
-  }
-  
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
deleted file mode 100644
index c5d4b774f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
+++ /dev/null
@@ -1,105 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishTestFragment extends BooleanFragment{
-
-  private boolean isTestWidget;	
-  private boolean generateProxy;
-  private String launchedServiceTestName;
-  private boolean testService;
-  private String testID;
-  public FinishTestFragment()
-  {
-    Condition condition = new Condition()
-	{
-	  public boolean evaluate()
-	  {
-	    if(!testService) return false;
-	  	if(launchedServiceTestName == null) return true;
-	    if(launchedServiceTestName != null)
-	      if((!launchedServiceTestName.equals("") &&  (!isPreferedAWSDLTest() || (isTestWidget && isClientTestJava())) && generateProxy) || launchedServiceTestName.equals("")) return true;	
-	    
-	  	return false; 
-	  }
-	};
-	   
-	setTrueFragment(new WebServiceTestClientDepartureFragment());
-    setCondition(condition);
-  }
-	    
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-	this.launchedServiceTestName = launchedServiceTestName;
-  }
-	  
-  public boolean isPreferedAWSDLTest()
-  {
-    ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-	String[] testTypes = scenarioContext.getWebServiceTestTypes();
-	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-	WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[0]);  	
-	if(wscte.testWSDL())	
-	  return true;
-	return false;
-  }
-
-  public boolean isClientTestJava()
-  {
-  	if(testID == null) return false;
-  	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-	WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID);  	
-	if(!wscte.testWSDL())	
-      return true;
-    return false;   	
-  }
-  
-  
-  public void setTestService(boolean testService)
-  {
-    this.testService = testService;	 
-  }
-
-  public void setGenerateProxy(boolean generateProxy)
-  {
-    this.generateProxy = generateProxy;	 
-  }
-
-  public void setTestID(String testID)
-  {
-    this.testID = testID;
-  }
-
-  public void setIsTestWidget(boolean isTestWidget)
-  {
-  	this.isTestWidget = isTestWidget;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
deleted file mode 100644
index 66c233d64..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class TestClientDepartureInitCommand extends AbstractDataModelOperation 
-{
-  
-  private boolean forceBuild;	
-	
-  public TestClientDepartureInitCommand()
-  {
-  	forceBuild = true;
-  }
-
-  public boolean getForceBuild()
-  {
-  	return forceBuild;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
deleted file mode 100644
index 4c78feb6a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,95 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TestDefaultingFragment extends AbstractDataModelOperation
-{
-  
-  private SelectionList testFacilities;
-  private String launchedServiceTestName;
-  private ScenarioContext scenarioContext;	
-  
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-  	IStatus status = Status.OK_STATUS;
-  	
-  	scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	//  test facilities
-    selectTestFacility();
-    return status;
-  }
-	
-  // The test facilities retrieved from the extension
-  // plus the default
-  public SelectionList getTestFacility()
-  {
-    return testFacilities;
-  } 
-	  
-  
-  
-  //	*********************** 
-  // This method uses the preference to 
-  // select the correct test facility 
-  // 
-  //***********************
-  private void selectTestFacility()
-  {
-    //if we find something we launched earlier 
-    //put it on the bottom
-    String[] testTypes = scenarioContext.getWebServiceTestTypes();	  
-    String[] newTestTypes = new String[testTypes.length];
-    boolean launched = false;
-    int j = 0;
-    for(int i = 0;i<testTypes.length;i++){
-	  if(testTypes[i].equals(launchedServiceTestName))
-	    launched = true;
-	  else{
-	     newTestTypes[j] = testTypes[i];
-	     j++;
-	  }
-	}
-	   	
-    if(launched)
-	  newTestTypes[testTypes.length - 1] = launchedServiceTestName;
-	  	
-    testFacilities = new SelectionList(newTestTypes,0);	
-  }
-
-  public void setLaunchedServiceTestName(String launchedServiceTestName)
-  {
-  	this.launchedServiceTestName = launchedServiceTestName;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
deleted file mode 100644
index 5d8d401db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class TestWebServiceClient extends AbstractWebServiceClient {
-  
-  public TestWebServiceClient(WebServiceClientInfo clientInfo){
-	super(clientInfo);  
-  }
-  
-  public ICommandFactory assemble(Environment env, IContext ctx, ISelection sel,
-      String project, String module, String earProject, String ear){
-    return null;	  
-  }
-			
-  public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
-      String project, String module, String earProject, String ear){
-    return null;	  
-  }
-			
-
-  public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
-		      String project, String module, String earProject, String ear){
-    return null;	  
-  }
-				
-  public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
-		      String project, String module, String earProject, String ear){
-    return null;
-  }
-			
-
-  public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
-		      String project, String module, String earProject, String ear){
-    return null;	  
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
deleted file mode 100644
index 07f436804..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
+++ /dev/null
@@ -1,30 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLFinishFragment extends BooleanFragment{
-  
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
deleted file mode 100644
index e3d7cc22f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
+++ /dev/null
@@ -1,188 +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
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusHandler;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-/**
- * @author gilberta
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLTestLaunchCommand extends AbstractDataModelOperation
-{
-  private String testID; 
-  private String launchedServiceTestName;
-  private TypeRuntimeServer serviceids;
-  private String serverProject;
-  private String serverModule;
-  private String wsdlURI;
-  private MessageUtils msgUtils;
-  private List endpoints;
-  private IServer serviceExistingServer = null;
-  private String serviceServerTypeID = null;
-  private String serviceServerInstanceId = null;
-	
-  public WSDLTestLaunchCommand()
-  {
-  	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);  	
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-  	IStatus status = Status.OK_STATUS;
-  	
-  	WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-  	WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID);
-	IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
-	TestInfo testInfo = getTestInfo();
-	
-	
-	status = commandFactoryExecution(iwst.launch(testInfo),env, monitor);
-	
-    //Dont need to shut everything down because the wsdl test doesnt work
-    if(status.getSeverity() != Status.OK){
-      StatusHandler sHandler = env.getStatusHandler();
-      IStatus infoStatus = StatusUtils.infoStatus( msgUtils.getMessage("MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST") );
-      sHandler.reportInfo(infoStatus);
-      return infoStatus;	
-    }
-   return status;
-  	
-  }
-
-  private IStatus commandFactoryExecution(ICommandFactory commandFactory,Environment env, IProgressMonitor monitor)
-  {
-	IStatus status = Status.OK_STATUS;  	
-	while(commandFactory.hasNext())
-  { 
-	  AbstractDataModelOperation operation = commandFactory.getNextCommand();
-    
-	  if (operation != null)
-    {
-      try
-      {
-        operation.setEnvironment( env );
-	      status = operation.execute( monitor, null );
-      }
-      catch( Exception exc )
-      {
-        status = StatusUtils.errorStatus( exc );
-      }
-    }
-    
-	  if(status.getSeverity() == Status.ERROR){
-	    StatusHandler sHandler = env.getStatusHandler();
-		sHandler.reportError(status);
-		return status;
-	  }
-    }
-    return status;
-  }
-  
-  
-  private TestInfo getTestInfo()
-  {
-    //	get the server stuff
-    if (serviceids.getServerInstanceId() != null) 
-	  serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId());
-    else if (serviceServerInstanceId!=null)
-		serviceExistingServer = ServerCore.findServer(serviceServerInstanceId);
-	
-	if (serviceExistingServer != null)
-	  serviceServerTypeID = serviceExistingServer.getServerType().getId();
-	else
-	  serviceServerTypeID = serviceids.getServerId();
-	// server will be created in ServerDeployableConfigurationCommand
-  
-    TestInfo testInfo = new TestInfo();
-	if (serviceExistingServer!=null)
-		testInfo.setServiceExistingServer(serviceExistingServer);
-    testInfo.setServiceServerTypeID(serviceServerTypeID);
-	testInfo.setServiceProject(serverProject);
-	testInfo.setWsdlServiceURL(wsdlURI);
-	testInfo.setEndpoint(endpoints);
-	return testInfo;
-	
-  }
-  
-  
-  public void setTestID(String testID)
-  {
-  	this.testID = testID;
-  }
-
-  public String getLaunchedServiceTestName()
-  {
-    return launchedServiceTestName;	
-  }
-  public void setWsdlURI(String wsdlURI)
-  {
-  	this.wsdlURI = wsdlURI;
-  }
-    
-  public void setServerProject(String serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-  
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
-  {
-    this.serviceids = serviceids;
-  }
-
-  public void setExternalBrowser(boolean externalBrowser)
-  {
-  }
-  
-  public void setEndpoint(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-
-public String getServerModule() {
-	return serverModule;
-}
-
-public void setServerModule(String serverModule) {
-	this.serverModule = serverModule;
-}
-
-public void setServiceServerInstanceId(String ssInstanceId){
-	this.serviceServerInstanceId = ssInstanceId;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
deleted file mode 100644
index 42a6e539f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.ListIterator;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusHandler;
-
-
-/**
-* This task sets up all the defaults for the webservice test
-* client page
-*
-*/
-public class WebServiceClientTestArrivalCommand extends AbstractDataModelOperation
-{
-  public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent";
-  public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample";
-
-  private MessageUtils msgUtils;
-  public static String SAMPLE_DIR = "sample";
-  
-  private String clientProject;
-  private String clientProjectEAR;
-  private String clientP;
-  private String clientC;
-  private IProject clientIProject;
-  private String folder;
-  private String jspFolder;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private String sampleProject;
-  private String sampleP;
-  private String sampleC;
-  private String sampleProjectEAR;
-
-  
-  
-  /**
-  * Constructs a new WebServiceClientTestArrivalTask object with the given label and description.
-  */
-  public WebServiceClientTestArrivalCommand ()
-  {
-  	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);  	
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-  	
-	IStatus status = Status.OK_STATUS;
-  	
-	sampleProjectAndEarSetup(env);
-  	
-    //Get the sample Folder ready
-    StringBuffer sb = new StringBuffer();
-	
-	sb.append("/").append(sampleC).append("/").append(DEFAULT_WEB_MODULE_ROOT).append("/");
-    folder = SAMPLE_DIR + getBean(); 
-        
-    sb.append(folder);
-    jspFolder = sb.toString();
-    
-    //get the method names ready
-    //find the full path of the file in the project
-    /*
-    * Getting the method names using javamof introspection
-    */
-    if(proxyBean == null){
-      StatusHandler sHandler = env.getStatusHandler();
-      IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED") );
-      sHandler.reportError(errorStatus);
-      return errorStatus;
-      
-    } 	
-    
-    
-    JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand(); 
-    javamofcommand.setProxyBean(proxyBean);
-    javamofcommand.setClientProject(clientP);
-    javamofcommand.setEnvironment( env );
-    
-    
-    
-    try{ 
-      IStatus mofStatus = javamofcommand.execute( monitor, null);
-      if(mofStatus.getSeverity() == Status.ERROR)
-      	return mofStatus;
-    }catch(Exception exc){
-    	StatusHandler sHandler = env.getStatusHandler();
-        IStatus errorStatus = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED") );
-        sHandler.reportError(errorStatus);
-        return errorStatus;
-    }  
-    JavaHelpers javaHelpers = javamofcommand.getJavaClass();
-    if (javaHelpers == null) return status;
-      
-    JavaClass javaClass = null; 
-    if(javaHelpers instanceof JavaClass) 
-     javaClass = (JavaClass)javaHelpers; 
-    else return status; 
-    List methodList = javaClass.getPublicMethods();
- 	BooleanSelection[] tempMethods = new BooleanSelection[methodList.size()];
-    ListIterator listIterator = methodList.listIterator();
-    
-    int j = 0;
- 	while (listIterator.hasNext())
-    {
-      Method method = (Method)listIterator.next();
-      if(method.isConstructor()) continue;
-      
-      tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true);      
-      j++;
-    } 
-    methods = tempMethods;
-    return status;
-  }
-  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-  
-  private void sampleProjectAndEarSetup(Environment env)
-  {
-	if(clientProject == null) return;
-  	else{
-	  int index = clientProject.indexOf("/");
-	  clientP = clientProject.substring(0,index);
-	  clientC = clientProject.substring(index + 1);
-  	}
-	  
-	clientIProject = (IProject)ProjectUtilities.getProject(clientP);
-  	
-  	if(J2EEUtils.isWebComponent(clientIProject, clientC)){
-      sampleProject = clientProject;
-	  sampleP = clientP;
-	  sampleC = clientC;
- 	}  	
-  	else{ 
-  	  sampleP = clientP + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
-	  sampleC = clientC + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
-	  sampleProject = sampleP + "/" + sampleC;
-	  
-	  
-	}  
-	sampleProjectEAR = clientProjectEAR;
-	if (sampleProjectEAR == null || sampleProjectEAR.length()==0){
-	  sampleProjectEAR = sampleP + DEFAULT_SAMPLE_EAR_PROJECT_EXT + "/" + sampleC + DEFAULT_SAMPLE_EAR_PROJECT_EXT;	
-	}
-	
-  }
-    
-  //getters and setters
-  
-  private String getBean()
-  {
-  	int index = proxyBean.lastIndexOf(".");
-  	String end = "";
-  	if(index != -1){
-  	  end = proxyBean.substring(index + 1);  	
-  	}
-  	String bean = end.substring(0,end.length());
-    
-  	return bean;
-  }
-  
-  
- 
-  
-  public String getFolder()
-  {
-  	return folder;
-  }
-  
-  public String getJspFolder()
-  {
-  	return jspFolder;
-  }
-  
-  public BooleanSelection[] getMethods()
-  {
-    return methods;  
-  }
-    
-  public String getSampleProject()
-  {
-  	return sampleProject;
-  }
-       
-  public void setClientProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-  
-    
-  public void setClientProjectEAR(String clientProjectEAR)
-  {
-    this.clientProjectEAR = clientProjectEAR;
-  }
-  
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-  
-  public String getSampleProjectEAR()
-  {
-    return sampleProjectEAR;
-  }
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
deleted file mode 100644
index 9e0efec2f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
+++ /dev/null
@@ -1,50 +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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestClientDepartureFragment extends SequenceFragment 
-{
-  public WebServiceTestClientDepartureFragment()
-  {
-  	add(new SimpleFragment(new FinishDefaultCommand(),""));
-   	add(new SimpleFragment(new ClientTestDelegateCommand(),""));
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  	dataRegistry.addMapping(TestClientDepartureInitCommand.class, "ForceBuild",BuildProjectCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",AddModuleDependenciesCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",AddModuleDependenciesCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",ClientTestDelegateCommand.class);
-  	dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",ClientTestDelegateCommand.class);
-  	    
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
deleted file mode 100644
index df2ae28cf..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
+++ /dev/null
@@ -1,114 +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.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class ExplorerServiceTestCommand extends AbstractDataModelOperation implements WSDLTestFinishCommand
-{
-
-  private boolean externalBrowser = true;
-  private String wsdlServiceURL;
-  private String serviceServerTypeID;
-  private IServer serviceExistingServer;
-  private String serviceProject;
-  private List endpoints;
-  
-  /**
-  * Constructs a new WebServiceExplorerLaunch object with the given label and description.
-  */
-  public ExplorerServiceTestCommand ()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-  	IStatus status = Status.OK_STATUS;
-    
-    StartProjectCommand spc = new StartProjectCommand( true );
-    spc.setServiceServerTypeID(serviceServerTypeID);
-    spc.setServiceExistingServer(serviceExistingServer);
-    IProject project = (IProject) ResourceUtils.findResource(serviceProject);
-    spc.setServiceProject(project);
-    spc.setIsWebProjectStartupRequested(true);
-    spc.setEnvironment( env );
-    
-    status = spc.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR)
-    	return status;
-
-    WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
-    launchCommand.setForceLaunchOutsideIDE(externalBrowser);
-    Vector launchOptionVector = new Vector();
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-	launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-	launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
-    launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,wsdlServiceURL));
-    if (endpoints != null)
-      for (Iterator it = endpoints.iterator(); it.hasNext();)
-        launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
-    launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
-    launchCommand.setEnvironment( env );
-    status = launchCommand.execute( monitor, null );
-    return status;
-  }
-
-  public void setExternalBrowser(boolean externalBrowser)
-  {
-  	this.externalBrowser = externalBrowser;
-  }
-  
-  public void setWsdlServiceURL(String wsdlServiceURL)
-  {
-  	this.wsdlServiceURL = wsdlServiceURL;
-  }
-  
-  public void setServerTypeID(String serviceServerTypeID)
-  {
-  	this.serviceServerTypeID = serviceServerTypeID;
-  }
-  
-  public void setExistingServer(IServer serviceExistingServer)
-  {
-  	this.serviceExistingServer = serviceExistingServer;
-  }
-  
-  public void setServiceProject(String serviceProject)
-  {
-    this.serviceProject = serviceProject;
-  }
-  
-  public void setEndpoint(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
deleted file mode 100644
index b7f60ca96..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class WSEGenerateCommand extends AbstractDataModelOperation 
-{
-
-  private TestInfo testInfo;
-	  
-  public WSEGenerateCommand(TestInfo testInfo){
-    this.testInfo = testInfo;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-  	IStatus status = Status.OK_STATUS;
-    
-    StartProjectCommand spc = new StartProjectCommand( true );
-    spc.setServiceServerTypeID(testInfo.getServiceServerTypeID());
-    spc.setServiceExistingServer(testInfo.getServiceExistingServer());
-    IProject project = (IProject) ProjectUtilities.getProject(testInfo.getServiceProject());
-    spc.setServiceProject(project);
-    spc.setIsWebProjectStartupRequested(true);
-    spc.setEnvironment( env );
-    
-    status = spc.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR)
-    	return status;
-
-    WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
-    launchCommand.setForceLaunchOutsideIDE(false);
-    Vector launchOptionVector = new Vector();
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-	launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-	launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
-    launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,testInfo.getWsdlServiceURL()));
-    if (testInfo.getEndpoint() != null)
-      for (Iterator it = testInfo.getEndpoint().iterator(); it.hasNext();)
-        launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
-    launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
-    launchCommand.setEnvironment( env );
-    status = launchCommand.execute( monitor, null );
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
deleted file mode 100644
index 6ab3b93ab..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class WSEWebServiceTester implements IWebServiceTester  {
-
-  public ICommandFactory generate(TestInfo testInfo){
-    Vector commands = new Vector();
-	return new SimpleCommandFactory(commands);
-  }
-	  
-  public ICommandFactory launch(TestInfo testInfo){
-    Vector commands = new Vector();
-	commands.add(new WSEGenerateCommand(testInfo));
-	return new SimpleCommandFactory(commands);	
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
deleted file mode 100644
index 5d40bee5f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
+++ /dev/null
@@ -1,35 +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.consumption.ui.widgets.test.explorer;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceExplorerExecutable implements WebServiceExecutable
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-   
-  
-  public AbstractDataModelOperation getFinishCommand()
-  {
-    return new ExplorerServiceTestCommand();
-  }
-  
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
deleted file mode 100644
index 38724a7a7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,210 +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.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class AddModuleDependenciesCommand extends AbstractDataModelOperation
-{
-  
-  private TestInfo testInfo;	
-	
-  private IProject sampleIProject;
-  private IProject clientIProject;
-  private IProject sampleEARIProject;
-  private String sampleEARProject;
-  private String sampleEARModule;
-  
-  public AddModuleDependenciesCommand(TestInfo testInfo)
-  {
-    this.testInfo = testInfo;
-  }
-
-  /**
-   * Execute WebServerDefaultingTask Set the default server name and id given a
-   * deployable.
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    try
-    {
-      createSampleProjects(env, monitor );
-	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	        
-      if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, testInfo.getClientModule()))
-      {
-        String uri = clientIProject.getName() + ".jar";
-		if (J2EEUtils.isJavaComponent(clientIProject,testInfo.getClientModule()))
-          addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri);
-        addJAROrModuleDependency(sampleIProject, testInfo.getGenerationModule(), uri);
-        addBuildPath(sampleIProject, clientIProject);
-      }
-    }
-    catch (IOException ioe)
-    {
-    }
-    catch (CoreException ce)
-    {
-    }
-    return Status.OK_STATUS;
-  }
-
-  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri)
-  {
-		//  TODO  Remove refs to old command
-//    AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(earProject, uri, javaProject);
-//    cmd.execute();
-  }
-
-  private void addJAROrModuleDependency(IProject project, String compName, String uri) throws IOException, CoreException
-  {
-     ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
-     manifest.mergeClassPath(new String[]{uri});
-     J2EEProjectUtilities.writeManifest(project, manifest);
-    
-  }
-
-  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-  
-  private void createSampleProjects(Environment env, IProgressMonitor monitor )
-  {
-	  
-	  
-	  
-	  sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	  
-	if (testInfo.getClientNeedEAR()) {
-	  if(testInfo.getClientEARProject() == null || testInfo.getClientEARProject().length() == 0){
-		  sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;
-	      sampleEARModule = testInfo.getGenerationModule() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;	
-	  }
-	  else{ 
-	      sampleEARProject = testInfo.getClientEARProject();
-		  sampleEARModule = testInfo.getClientEARModule();
-	  }
-	  
-	  sampleEARIProject  = ProjectUtilities.getProject(sampleEARProject);
-	  if(sampleEARIProject == null || !sampleEARIProject.isOpen()){
-		  
-	    CreateModuleCommand createEAR = new CreateModuleCommand();
-	    createEAR.setProjectName(sampleEARProject);
-	    createEAR.setModuleName(sampleEARModule);
-	    createEAR.setServerInstanceId(testInfo.getClientExistingServer().getId());
-	    createEAR.setServerFactoryId(testInfo.getClientServerTypeID());
-	    createEAR.setModuleType(CreateModuleCommand.EAR);
-	    createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject,testInfo.getClientModule()));
-      createEAR.setEnvironment( env );
-		  IStatus status = createEAR.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-        {
-          env.getStatusHandler().reportError(status);     
-        }
-	  
-		AddModuleToServerCommand modToServer = new AddModuleToServerCommand();
-		modToServer.setModule(sampleEARModule);
-		modToServer.setProject(sampleEARProject);
-		modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-    modToServer.setEnvironment( env );
-		status = modToServer.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }     
-	  
-	  }
-	}
-	
-	  if (!sampleIProject.isOpen())
-      {
-        CreateModuleCommand createSample = new CreateModuleCommand();
-        createSample.setProjectName(testInfo.getGenerationProject());
-        createSample.setModuleName(testInfo.getGenerationModule());
-		createSample.setModuleType(CreateModuleCommand.WEB);
-		createSample.setServerInstanceId(testInfo.getClientExistingServer().getId());
-        createSample.setServerFactoryId(testInfo.getClientServerTypeID());
-        createSample.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject,testInfo.getClientModule()));
-        createSample.setEnvironment( env );
-		IStatus status = createSample.execute( monitor, null );
-      
-	   if (testInfo.getClientNeedEAR()) {
-//		Associate the client module and service EAR
-	    AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-	    associateCommand.setProject(testInfo.getGenerationProject());
-	    associateCommand.setModule(testInfo.getGenerationModule());
-	    associateCommand.setEARProject(sampleEARProject);
-	    associateCommand.setEar(sampleEARModule);
-      associateCommand.setEnvironment( env );
-	    status = associateCommand.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }  
-	   }
-		
-		StartServerCommand startServer = new StartServerCommand(false, true);
-		startServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
-    startServer.setEnvironment( env );
-		status = startServer.execute( monitor, null );
-	    if (status.getSeverity()==Status.ERROR)
-	    {
-	      env.getStatusHandler().reportError(status);     
-	    }     
-		
-	  }
-	  
-  }
-  
-  private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
-  {
-    IJavaProject javaProject = JavaCore.create(referencingProject);
-    if (javaProject != null)
-    {
-      IClasspathEntry[] oldCp = javaProject.getRawClasspath();
-	  IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length + 1];
-	  for (int i = 0; i < oldCp.length; i++)
-        newCp[i] = oldCp[i];
-	  newCp[newCp.length - 1] = JavaCore.newProjectEntry(referencedProject.getFullPath());
-	  javaProject.setRawClasspath(newCp, new NullProgressMonitor());
-    }
-  }
-
-   
-
-  
-
- 
-
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
deleted file mode 100644
index 2ef743893..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class GSTCGenerateCommand extends AbstractDataModelOperation 
-{
-
-  public static String INPUT       = "Input.jsp";
-  public static String TEST_CLIENT = "TestClient.jsp";
-  public static String RESULT      = "Result.jsp";
-  public static String METHOD      = "Method.jsp";
-	
-  private TestInfo testInfo;
-  private Model proxyModel;
-  private String jspfolder;
-  
-  public GSTCGenerateCommand(TestInfo testInfo){
-  	this.testInfo = testInfo;
-  }
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-	CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();    
-	copy.setSampleProject(testInfo.getGenerationProject());
-    copy.setSampleComponent(testInfo.getGenerationModule());
-    copy.setEnvironment( env );
-	status = copy.execute( monitor, null);
-	if (status.getSeverity() == Status.ERROR) return status;
-	setJSPFolder();
-	status = createModel(env, monitor);
-	if (status.getSeverity() == Status.ERROR) return status;
-	status = generatePages(env);
-	if (status.getSeverity() == Status.ERROR) return status;
-	return status;   
-  }
-
-  private void setJSPFolder(){
-    //if the client is not a webcomponent then the 
-	//sample must have been created, we must now factor in 
-	//flexible projects  
-	  
-	IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, testInfo.getClientModule())){   
-	  IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	  IPath path = J2EEUtils.getWebContentPath(project,testInfo.getGenerationModule());
-	  int index = testInfo.getJspFolder().lastIndexOf("/");
-	  String jsp = testInfo.getJspFolder().substring(index + 1);
-	  StringBuffer sb = new StringBuffer();	
-	  sb.append("/").append(path.toString()).append("/").append(jsp);	  
-	  jspfolder = sb.toString();
-	} 
-    else
-	  jspfolder = testInfo.getJspFolder();	
-  
-  
-  }
-  
-  //create the model from the resource
-  private IStatus createModel(Environment env, IProgressMonitor monitor ) {
-    JavaToModelCommand jtmc = new JavaToModelCommand();
-	jtmc.setMethods(testInfo.getMethods());
-	jtmc.setClientProject(testInfo.getClientProject());
-	jtmc.setProxyBean(testInfo.getProxyBean());
-	jtmc.setEnvironment( env );
-	IStatus status = jtmc.execute( monitor, null);
-	if (status.getSeverity() == Status.ERROR) return status;
-    proxyModel = jtmc.getJavaDataModel();
-	return status;
-  } 
-  
-   /**
-   * Generate the four jsps that make up this
-   * sample app.
-   */
-   private IStatus generatePages(Environment env)
-   {
-   	IStatus status = Status.OK_STATUS;
-	IPath fDestinationFolderPath = new Path(jspfolder);
-    fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-    IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
-     IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
-     IFile fileTest = fWorkspace.getFile(pathTest);
-     GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-       new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
-     //gpcTest.setStatusMonitor(getStatusMonitor());
-     gpcTest.setEnvironment( env );
-     status = gpcTest.execute( null, null );
-     if (status.getSeverity() == Status.ERROR )
-     	return status;
-     
-
-     //input codegen
-     IPath pathInput = fDestinationFolderPath.append(INPUT);
-     IFile fileInput = fWorkspace.getFile(pathInput);
-     InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
-     GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-       inputGenerator,fileInput);
-     //gpcInput.setStatusMonitor(getStatusMonitor());
-     gpcInput.setEnvironment( env );
-     status = gpcInput.execute( null, null );
-     if (status.getSeverity() == Status.ERROR )
-     	return status;
-
-     //method codegen
-     IPath pathMethod = fDestinationFolderPath.append(METHOD);
-     IFile fileMethod = fWorkspace.getFile(pathMethod);
-     MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
-     methodGenerator.setClientFolderPath(jspfolder);
-     GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-       methodGenerator,fileMethod);
-     //gpcMethod.setStatusMonitor(getStatusMonitor());
-     gpcMethod.setEnvironment( env );
-     status = gpcMethod.execute( null, null );
-     if (status.getSeverity() == Status.ERROR )
-     	return status;    
-
-
-     //result codegen
-     IPath pathResult = fDestinationFolderPath.append(RESULT);
-     IFile fileResult = fWorkspace.getFile(pathResult);
-     ResultFileGenerator rfg = new ResultFileGenerator();
-     rfg.setClientFolderPath(jspfolder);
-     rfg.setSetEndpointMethod(testInfo.getSetEndpointMethod());
-     GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-       rfg,fileResult);
-     gpcResult.setEnvironment( env );
-     status = gpcResult.execute( null, null );
-     
-     return status;
-   }
-
-   
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
deleted file mode 100644
index fe212516a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class GSTCLaunchCommand extends AbstractDataModelOperation
-{
-
-  public static String INPUT       = "Input.jsp";
-  public static String TEST_CLIENT = "TestClient.jsp";
-  public static String RESULT      = "Result.jsp";
-  public static String METHOD      = "Method.jsp";
-		
-  private TestInfo testInfo;
-  private MessageUtils msgUtils;
-  private String jspfolder;
-  
-  public GSTCLaunchCommand(TestInfo testInfo){
-    this.testInfo = testInfo;
-	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);
-  }
-		
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-    
-    setJSPFolder();
-    
-	  return launchSample(env, monitor);
-  }
-  private void setJSPFolder(){
-	    //if the client is not a webcomponent then the 
-		//sample must have been created, we must now factor in 
-		//flexible projects  
-		  
-		IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, testInfo.getClientModule())){   
-		  IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
-		  IPath path = J2EEUtils.getWebContentPath(project,testInfo.getGenerationModule());
-		  int index = testInfo.getJspFolder().lastIndexOf("/");
-		  String jsp = testInfo.getJspFolder().substring(index + 1);
-		  StringBuffer sb = new StringBuffer();	
-		  sb.append("/").append(path.toString()).append("/").append(jsp);	  
-		  jspfolder = sb.toString();
-		} 
-	    else
-		  jspfolder = testInfo.getJspFolder();	
-	  
-	  
-	  }
-  
-  private IStatus launchSample (Environment env, IProgressMonitor monitor ) {
-    IStatus status = Status.OK_STATUS;
-	  IPath fDestinationFolderPath = new Path(jspfolder);
-	  fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-    PublishProjectCommand ppc = new PublishProjectCommand();
-    ppc.setServerTypeID(testInfo.getClientServerTypeID());
-    ppc.setExistingServer(testInfo.getClientExistingServer());
-    ppc.setProject(testInfo.getGenerationProject());
-    ppc.setEnvironment( env );
-	status = ppc.execute( monitor, null );
-
-	StartServerCommand serverCommand = new StartServerCommand( true, true );
-	serverCommand.setServerInstanceId( testInfo.getClientExistingServer().getId() );
-  serverCommand.setEnvironment( env );
-	
-	status = serverCommand.execute(monitor, null);
-	if (status.getSeverity() == Status.ERROR) return status;
-	
-	IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	IPath newPath = new Path(ServerUtils.getWebComponentURL(sampleProject,testInfo.getGenerationModule(),testInfo.getClientServerTypeID(),testInfo.getClientExistingServer()));
-	int count = J2EEUtils.getWebContentPath(sampleProject,testInfo.getGenerationModule()).segmentCount();
-	
-	newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(count).makeAbsolute());
-	StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
-	if (testInfo.getEndpoint() != null && !testInfo.getEndpoint().isEmpty())
-	{
-	  urlString.append("?endpoint=");
-	  urlString.append(testInfo.getEndpoint().get(0).toString());
-	}
-	    
-	try{
-	      URL url;
-	      url = new URL(urlString.toString());
-
-	      for( int retries = 0; retries < 10; retries++ )
-	      {
-	        try
-	        {
-	          // Test the URLs
-	          (new URL(newPath.append(RESULT).toString())).openStream();
-	          (new URL(newPath.append(METHOD).toString())).openStream();
-	          (new URL(newPath.append(INPUT).toString())).openStream();
-	          (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
-	          // Looks good, exit loop
-	          break;
-	        }
-	        catch( IOException ioe )
-	        {
-	          try
-	          {
-	            Thread.sleep(1000);
-	          }
-	          catch (InterruptedException ie) {} 	  	          
-	        }
-	      }
-
-			IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
-			IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR, null, null, null);
-			browser.openURL(url);
-	      return status;
-		 }catch(PartInitException exc){
-			//TODO: change error message
-			env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
-			status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL") );
-			try {
-				env.getStatusHandler().report(status);
-			} catch (StatusException e) {
-				status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
-			}
-	    	return status;
-	    }catch(MalformedURLException exc){
-	    	env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
-			status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), exc );
-			try {
-				env.getStatusHandler().report(status);
-			} catch (StatusException e) {
-				status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
-			}
-	    	return status;
-	    }
-     }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
deleted file mode 100644
index 4926adc59..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class GSTCWebServiceTester implements IWebServiceTester  {
-
-  public ICommandFactory generate(TestInfo testInfo){
-    Vector commands = new Vector();
-	commands.add(new AddModuleDependenciesCommand(testInfo));
-	commands.add(new GSTCGenerateCommand(testInfo));
-	return new SimpleCommandFactory(commands);
-  }
-  
-  public ICommandFactory launch(TestInfo testInfo){
-	Vector commands = new Vector();
-    commands.add(new GSTCLaunchCommand(testInfo));
-    return new SimpleCommandFactory(commands);	
-  }
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
deleted file mode 100644
index 74a41f2f5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
+++ /dev/null
@@ -1,330 +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.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WSSampleFinishCommand extends AbstractDataModelOperation implements JavaProxyTestCommand
-{
-
-  public static String INPUT       = "Input.jsp";
-  public static String TEST_CLIENT = "TestClient.jsp";
-  public static String RESULT      = "Result.jsp";
-  public static String METHOD      = "Method.jsp";
-
-  private MessageUtils msgUtils;
-  
-  private Model proxyModel;
-  private String sampleServerTypeID;
-  private IServer sampleExistingServer;
-  
-  
-  private String clientProject;
-  private String jspFolder;
-  private boolean runClientTest;
-  private String sampleProject;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private String setEndpointMethod;
-  private List endpoints;
-  
-  /**
-  * Constructs a new JavaBeanToSampleActiveTask object with the given label and description.
-  */
-  public WSSampleFinishCommand ()
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption.ui";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-  	IStatus status = Status.OK_STATUS;
-    //setters and getters to be removed
-  	CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();    
-  	copy.setSampleProject(sampleProject);
-    copy.setEnvironment( env );
-  	status = copy.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR) return status;
-    status = createModel(env, monitor );
-    if (status.getSeverity() == Status.ERROR) return status;
-    status = generatePages(env, monitor );
-    if (status.getSeverity() == Status.ERROR) return status;
-    //if (!isSuccessful()) return;
-    status = launchSample(env, monitor);
-    return status;   
-  }
-
-   
-  /**
-  * Generate the four jsps that make up this
-  * sample app.
-  */
-  protected IStatus generatePages(Environment env, IProgressMonitor monitor )
-  {
-  	IStatus status = Status.OK_STATUS;
-    IPath fDestinationFolderPath = new Path(jspFolder);
-    fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-    IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
-    IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
-    IFile fileTest = fWorkspace.getFile(pathTest);
-    GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
-    //gpcTest.setStatusMonitor(getStatusMonitor());
-    gpcTest.setEnvironment( env );
-    status = gpcTest.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR )
-    	return status;
-    
-
-    //input codegen
-    IPath pathInput = fDestinationFolderPath.append(INPUT);
-    IFile fileInput = fWorkspace.getFile(pathInput);
-    InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
-    GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      inputGenerator,fileInput);
-    //gpcInput.setStatusMonitor(getStatusMonitor());
-    gpcInput.setEnvironment( env );
-    status = gpcInput.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR )
-    	return status;
-
-    //method codegen
-    IPath pathMethod = fDestinationFolderPath.append(METHOD);
-    IFile fileMethod = fWorkspace.getFile(pathMethod);
-    MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
-    methodGenerator.setClientFolderPath(jspFolder);
-    GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      methodGenerator,fileMethod);
-    //gpcMethod.setStatusMonitor(getStatusMonitor());
-    gpcMethod.setEnvironment( env );
-    status = gpcMethod.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR )
-    	return status;    
-
-
-    //result codegen
-    IPath pathResult = fDestinationFolderPath.append(RESULT);
-    IFile fileResult = fWorkspace.getFile(pathResult);
-    ResultFileGenerator rfg = new ResultFileGenerator();
-    rfg.setClientFolderPath(jspFolder);
-    rfg.setSetEndpointMethod(setEndpointMethod);
-    GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
-      rfg,fileResult);
-    //gpcResult.setStatusMonitor(getStatusMonitor());
-    gpcResult.setEnvironment( env );
-    status = gpcResult.execute( monitor, null );
-    
-    return status;
-  }
-
-
-  protected IStatus launchSample (Environment env, IProgressMonitor monitor ) {
-
-  	IStatus status = Status.OK_STATUS;
-    if (!runClientTest) return status;
-    
-
-    IPath fDestinationFolderPath = new Path(jspFolder);
-    fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();    
-
-    PublishProjectCommand ppc = new PublishProjectCommand();
-    ppc.setServerTypeID(sampleServerTypeID);
-    ppc.setExistingServer(sampleExistingServer);
-    ppc.setProject(sampleProject);
-    ppc.setEnvironment( env );
-    status = ppc.execute( monitor, null );
-
-    StartProjectCommand spc = new StartProjectCommand(false );
-    spc.setServiceServerTypeID(sampleServerTypeID);
-    spc.setSampleExistingServer(sampleExistingServer);
-    IProject project = (IProject) ResourceUtils.findResource(sampleProject);
-    spc.setSampleProject(project);
-    spc.setIsWebProjectStartupRequested(true);
-    spc.setEnvironment( env );
-    
-    status = spc.execute( monitor, null );
-    if (status.getSeverity() == Status.ERROR) return status;
-    
-    IPath newPath = new Path(ResourceUtils.getWebProjectURL(ResourceUtils.getProjectOf(fDestinationFolderPath),sampleServerTypeID,sampleExistingServer));
-    newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(2).makeAbsolute());
-    StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
-    if (endpoints != null && !endpoints.isEmpty())
-    {
-      urlString.append("?endpoint=");
-      urlString.append(endpoints.get(0).toString());
-    }
-    
-    try{
-      URL url;
-      url = new URL(urlString.toString());
-
-      for( int retries = 0; retries < 10; retries++ )
-      {
-        try
-        {
-          // Test the URLs
-          (new URL(newPath.append(RESULT).toString())).openStream();
-          (new URL(newPath.append(METHOD).toString())).openStream();
-          (new URL(newPath.append(INPUT).toString())).openStream();
-          (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
-          // Looks good, exit loop
-          break;
-        }
-        catch( IOException ioe )
-        {
-          try
-          {
-            Thread.sleep(1000);
-          }
-          catch (InterruptedException ie) {} 	  	          
-        }
-      }
-
-		IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
-		IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null);
-		browser.openURL(url);
-      return status;
-	 }catch(PartInitException exc){
-		//TODO: change error message
-		env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
-		status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), exc );
-		try {
-			env.getStatusHandler().report(status);
-		} catch (StatusException e) {
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
-		}
-    	return status;
-    }catch(MalformedURLException exc){
-    	env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
-		status = StatusUtils.warningStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), exc );
-		try {
-			env.getStatusHandler().report(status);
-		} catch (StatusException e) {
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), e );
-		}
-    	return status;
-    }
-  }
-
-  
-
-  protected IStatus createModel(Environment env, IProgressMonitor monitor ) {
-
-  	//create the model from the resource
-    JavaToModelCommand jtmc = new JavaToModelCommand();
-    jtmc.setMethods(methods);
-    jtmc.setClientProject(clientProject);
-    jtmc.setProxyBean(proxyBean);
-    jtmc.setEnvironment( env );
-    //jtmc.setStatusMonitor(getStatusMonitor());
-    IStatus status = jtmc.execute( monitor, null);
-    if (status.getSeverity() == Status.ERROR) return status;
-
-    proxyModel = jtmc.getJavaDataModel();
-    return status;
-  }
-
-  public void setServerTypeID(String sampleServerTypeID)
-  {
-  	this.sampleServerTypeID = sampleServerTypeID;
-  }
-  
-  public void setExistingServer(IServer sampleExistingServer)
-  {
-  	this.sampleExistingServer = sampleExistingServer;
-  }
-  
-  public void setJspFolder(String jspFolder)
-  {
-    this.jspFolder = jspFolder;
-  }
-  
-  public void setRunClientTest(boolean runClientTest)
-  {
-  	this.runClientTest = runClientTest;
-  }
-  
-  public void setSampleProject(String sampleProject)
-  {
-  	this.sampleProject = sampleProject;
-  }
-
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
-  public void setMethods(BooleanSelection[] methods)
-  {
-  	this.methods = methods;
-  }
-
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-  
-  public void setEndpoint(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
deleted file mode 100644
index 93ac97034..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
+++ /dev/null
@@ -1,33 +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.consumption.ui.widgets.test.wssample;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceWSSampleExecutable implements WebServiceExecutable
-{
-   
-  
-  public AbstractDataModelOperation getFinishCommand()
-  {
-  	return new WSSampleFinishCommand();
-  }
-    
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index e19b750e6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,59 +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.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-
-
-public class PrivateUDDIRegistryTypeRegistry
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private static PrivateUDDIRegistryTypeRegistry instance_;
-
-  private PrivateUDDIRegistryTypeRegistry() {
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceClientTypeRegistry object.
-  */
-  public static PrivateUDDIRegistryTypeRegistry getInstance() {
-    if (instance_ == null) {
-      instance_ = new PrivateUDDIRegistryTypeRegistry();
-    }
-    
-    return instance_;
-  }
-
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType() {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "privateUDDIRegistryType");
-
-    try {
-      Object configElement = ((config.length > 0) ? config[0].createExecutableExtension("class") : null);
-      if(configElement != null && configElement instanceof PrivateUDDIRegistryType) 
-        return (PrivateUDDIRegistryType)configElement; 
-      else
-        return null;
-    }
-    catch (CoreException e) {
-      return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 4d2873220..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-
-
-public class PublicUDDIRegistryTypeRegistry
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  private static PublicUDDIRegistryTypeRegistry instance_;
-  private Vector types_;
-  private Vector configElements_;
-
-  private PublicUDDIRegistryTypeRegistry() {
-    types_ = new Vector();
-    configElements_ = new Vector();
-
-    init();
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceClientTypeRegistry object.
-  */
-  public static PublicUDDIRegistryTypeRegistry getInstance() {
-    if (instance_ == null) {
-      instance_ = new PublicUDDIRegistryTypeRegistry();
-    }
-    
-    return instance_;
-  }
-
-  public void init() {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "publicUDDIRegistryType");
-
-    for (int i = 0; i < config.length; i++) {
-      try {
-        Object configElement = config[i].createExecutableExtension("class");
-
-        if( configElement instanceof PublicUDDIRegistryType)  {
-          types_.add(configElement);
-          configElements_.add(config[i]);
-        }
-      }
-      catch (CoreException e) {}
-    }
-  }
-
-  public PublicUDDIRegistryType[] getAllPublicUDDIRegistryTypes() {
-    PublicUDDIRegistryType[] types = new PublicUDDIRegistryType[types_.size()];
-    for (int i = 0; i < types_.size(); i++) {
-      types[i] = (PublicUDDIRegistryType)types_.elementAt(i);
-    }
-    return types;
-  }
-
-  public PublicUDDIRegistryType getPublicUDDIRegistryTypeByID(String id) {
-    for (int i = 0; i < configElements_.size(); i++) {
-      IConfigurationElement c = (IConfigurationElement)configElements_.elementAt(i);
-      if (c.getAttribute("id").equals(id))
-        return (PublicUDDIRegistryType)types_.elementAt(i);
-    }
-    return null;
-  }
-
-  public String getPublicUDDIRegistryTypeIDByName(String name) {
-    for (int i = 0; i < types_.size(); i++) {
-      PublicUDDIRegistryType type = (PublicUDDIRegistryType)types_.elementAt(i);
-      if (type.getName().equals(name))
-        return ((IConfigurationElement)configElements_.elementAt(i)).getAttribute("id");
-    }
-    return null;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
deleted file mode 100644
index cef821386..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,861 +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.consumption.ui.wizard;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-
-public class RuntimeServerSelectionDialog extends Dialog implements Listener {
-
-  private Shell thisShell;
-  private Group viewSelectionGroup_;
-  private Text messageBanner_;
-  private Composite primaryGroup_;
-  private Group runtimesGroup_;
-  private Group serversGroup_;
-  private Tree runtimesList_;
-  private Tree serverList_;
-  private Button viewSelectionByRuntimeButton_;
-  private Button viewSelectionByServerButton_;
-  private Button viewSelectionByExploreButton_;
-  private Combo j2eeVersionCombo;
-  /*
-   * CONTEXT_ID PWRS0001 for the selection of runtime, server and project combination
-   */
-  private String INFOPOP_PWRS_DIALOG = WebServiceConsumptionUIPlugin.ID + ".PWRS0001";
-  /* CONTEXT_ID PWRS0002 for the runtime selection on in the dailog */
-  private String INFOPOP_PWRS_LIST_RUNTIMES = WebServiceConsumptionUIPlugin.ID + ".PWRS0002";
-  /* CONTEXT_ID PWRS0003 for the server selection in the dialog */
-  private String INFOPOP_PWRS_LIST_SERVERS = WebServiceConsumptionUIPlugin.ID + ".PWRS0003";
-  /*
-   * CONTEXT_ID PWRS0004 for the EJB Project combo box of the runtime selection dialog
-   */
-  //  private String INFOPOP_PWRS_EJB_PROJECT = WebServiceConsumptionUIPlugin.ID
-  // + ".PWRS0004";
-  /*
-   * CONTEXT_ID PWRS0005 for the runtime view radio button of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_RADIO_RUNTIME = WebServiceConsumptionUIPlugin.ID + ".PWRS0005";
-  /*
-   * CONTEXT_ID PWRS0006 for the server view radio button of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_RADIO_SERVER = WebServiceConsumptionUIPlugin.ID + ".PWRS0006";
-  /*
-   * CONTEXT_ID PWRS0007 for the explore view radio button of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_RADIO_EXPLORE = WebServiceConsumptionUIPlugin.ID + ".PWRS0007";
-  /*
-   * CONTEXT_ID PWRS0008 for the Web Project combo box of the runtime selection dialog
-   */
-  //  private String INFOPOP_PWRS_COMBO_PROJECT =
-  // WebServiceConsumptionUIPlugin.ID + ".PWRS0008";
-  /*
-   * CONTEXT_ID PWRS0009 for the J2EE version combo box of the runtime selection dialog
-   */
-  private String INFOPOP_PWRS_J2EE_VERSION = WebServiceConsumptionUIPlugin.ID + ".PWRS0009";
-
-  // rskreg
-  //private WebServiceServerRuntimeTypeRegistry wssrtRegistry;
-  //private WebServiceClientTypeRegistry wsctRegistry;
-  // rskreg
-  private Hashtable serverLabels_;
-  private Hashtable existingServersTable_;
-  private String defaultServer_;
-  private String defaultRuntime_;
-  private String typeId_;
-  // rskreg
-  //private IWebServiceRuntime selectedRuntime_;
-  private WebServiceRuntimeInfo selectedRuntime_;
-  // rskreg
-  private IServer selectedServer_;
-  private String selectedServerLabel_;
-  private String selectedServerFactoryID_;
-  private boolean isExistingServer_;
-  private boolean validateOn_ = false;
-  private byte selectionMode_;
-  private final byte MODE_SERVICE = (byte) 0;
-  private final String SERVER_TYPES_ICON = "icons/servers/servers_obj.gif";
-  private final String EXISTING_SERVERS_ICON = "icons/servers/existing_server_obj.gif";
-  private String j2eeVersion;
-  private String serverInstanceID_;
-
-  public RuntimeServerSelectionDialog(Shell shell, byte mode, TypeRuntimeServer ids, String j2eeVersion) {
-    super(shell);
-    selectionMode_ = mode;
-    typeId_ = ids.getTypeId();
-    defaultRuntime_ = ids.getRuntimeId();
-    defaultServer_ = ids.getServerId();
-    serverInstanceID_ = ids.getServerInstanceId();
-    setIsExistingServer(ids.getServerInstanceId() != null);
-    serverLabels_ = new Hashtable();
-    existingServersTable_ = new Hashtable();
-	// rskreg
-    //wsctRegistry = WebServiceClientTypeRegistry.getInstance();
-    //wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-	// rskreg
-    this.j2eeVersion = j2eeVersion;
-  }
-
-  public TypeRuntimeServer getTypeRuntimeServer() {
-    TypeRuntimeServer ids = new TypeRuntimeServer();
-
-    ids.setTypeId(typeId_);
-    if (selectedRuntime_ != null)
-      ids.setRuntimeId(selectedRuntime_.getId());
-    
-    if( selectedServerFactoryID_ == null )
-    {
-      ids.setServerId( defaultServer_ );
-      ids.setServerInstanceId( serverInstanceID_ );
-    }
-    else
-    {
-      ids.setServerId(selectedServerFactoryID_);
-
-      if (isExistingServer_ && selectedServer_ != null) 
-      {
-        ids.setServerInstanceId(selectedServer_.getId());
-      }
-    }
-    
-    return ids;
-  }
-
-  public String getJ2EEVersion() {
-    return j2eeVersion;
-  }
-
-  private boolean getIsExistingServer() {
-    return isExistingServer_;
-  }
-
-  private void setIsExistingServer(boolean isExisting) {
-    isExistingServer_ = isExisting;
-  }
-
-  protected Control createContents(Composite parent) {
-    Composite comp = (Composite) super.createContents(parent);
-    parent.getShell().pack();
-    return comp;
-  }
-
-  protected Control createDialogArea(Composite parent) {
-    validateOn_ = false;
-    thisShell = parent.getShell();
-    if (thisShell == null) {
-      thisShell = createShell();
-    }
-    Composite composite = (Composite) super.createDialogArea(parent);
-    GridLayout gl;
-    GridData gd;
-    // Window title
-    if (selectionMode_ == MODE_SERVICE)
-      thisShell.setText(getMessage("%PAGE_TITLE_WS_RUNTIME_SELECTION"));
-    else
-      thisShell.setText(getMessage("%PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"));
-    
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    
-    helpSystem.setHelp(thisShell, INFOPOP_PWRS_DIALOG);
-    // Dialog description banner
-    messageBanner_ = new Text(composite, SWT.READ_ONLY | SWT.WRAP);
-    messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION") + "\n" + "      "); // reserves a second line for message display
-    messageBanner_.setToolTipText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    messageBanner_.setLayoutData(gd);
-    //  -----------------------------------------------------------------------//
-    new Label(composite, SWT.HORIZONTAL);
-    //  -----------------------------------------------------------------------//
-    // Selection
-    thisShell.setToolTipText(getMessage("%TOOLTIP_PWRS_PAGE"));
-    viewSelectionGroup_ = new Group(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    viewSelectionGroup_.setLayout(gl);
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    viewSelectionGroup_.setLayoutData(gd);
-    if (selectionMode_ == MODE_SERVICE)
-      viewSelectionGroup_.setText(getMessage("%LABEL_SELECTION_VIEW_TITLE"));
-    else
-      viewSelectionGroup_.setText(getMessage("%LABEL_CLIENT_SELECTION_VIEW_TITLE"));
-    viewSelectionByServerButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByServerButton_.setText(getMessage("%LABEL_SELECTION_VIEW_SERVER"));
-    viewSelectionByServerButton_.addListener(SWT.Selection, this);
-    viewSelectionByServerButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_SERVER"));
-    viewSelectionByServerButton_.setSelection(true);
-    helpSystem.setHelp(viewSelectionByServerButton_, INFOPOP_PWRS_RADIO_SERVER);
-    viewSelectionByRuntimeButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByRuntimeButton_.setText(getMessage("%LABEL_SELECTION_VIEW_RUNTIME"));
-    viewSelectionByRuntimeButton_.addListener(SWT.Selection, this);
-    viewSelectionByRuntimeButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_RUNTIME"));
-    helpSystem.setHelp(viewSelectionByRuntimeButton_, INFOPOP_PWRS_RADIO_RUNTIME);
-    viewSelectionByExploreButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
-    viewSelectionByExploreButton_.setText(getMessage("%LABEL_SELECTION_VIEW_EXPLORE"));
-    viewSelectionByExploreButton_.addListener(SWT.Selection, this);
-    viewSelectionByExploreButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_EXPLORE"));
-    helpSystem.setHelp(viewSelectionByExploreButton_, INFOPOP_PWRS_RADIO_EXPLORE);
-    primaryGroup_ = new Composite(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.makeColumnsEqualWidth = true;
-    gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    runtimesGroup_ = new Group(primaryGroup_, SWT.NONE);
-    gl = new GridLayout();
-    runtimesGroup_.setLayout(gl);
-    gd = new GridData(GridData.FILL_BOTH);
-    runtimesGroup_.setLayoutData(gd);
-    runtimesGroup_.setText(getMessage("%LABEL_RUNTIMES_LIST"));
-    runtimesList_ = new Tree(runtimesGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    gd = new GridData(GridData.FILL_BOTH);
-    runtimesList_.setLayoutData(gd);
-    runtimesList_.addListener(SWT.Selection, this);
-    runtimesList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_RUNTIMES"));
-    helpSystem.setHelp(runtimesList_, INFOPOP_PWRS_LIST_RUNTIMES);
-    //  Server labels control
-    serversGroup_ = new Group(primaryGroup_, SWT.NONE);
-    gl = new GridLayout();
-    serversGroup_.setLayout(gl);
-    gd = new GridData(GridData.FILL_BOTH);
-    serversGroup_.setLayoutData(gd);
-    serversGroup_.setText(getMessage("%LABEL_SERVERS_LIST"));
-    serverList_ = new Tree(serversGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    serverList_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
-    serverList_.addListener(SWT.Selection, this);
-    serverList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_SERVERS"));
-    ServersList serverList = new ServersList();
-    serverList.setServerTreeItems(serverList_);
-    helpSystem.setHelp(serverList_, INFOPOP_PWRS_LIST_SERVERS);
-    setRuntimesGroup();
-    // J2EE version
-    Composite j2eeVersionComposite = new Composite(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    gl.numColumns = 2;
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    j2eeVersionComposite.setLayout(gl);
-    j2eeVersionComposite.setLayoutData(gd);
-    Label j2eeVersionLabel = new Label(j2eeVersionComposite, SWT.NONE);
-    j2eeVersionLabel.setText(getMessage("%LABEL_J2EE_VERSION"));
-    j2eeVersionCombo = new Combo(j2eeVersionComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    j2eeVersionCombo.setLayout(gl);
-    j2eeVersionCombo.setLayoutData(gd);
-    j2eeVersionCombo.addListener(SWT.Selection, this);
-    j2eeVersionCombo.setToolTipText(getMessage("%TOOLTIP_PWRS_J2EE_VERSION"));
-    helpSystem.setHelp(j2eeVersionCombo, INFOPOP_PWRS_J2EE_VERSION);
-    //  -----------------------------------------------------------------------//
-    new Label(composite, SWT.HORIZONTAL);
-    validateOn_ = true;
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
-    setJ2EEVersions();
-    return composite;
-  }
-
-  private void setJ2EEVersions() {
-    j2eeVersionCombo.setEnabled(true);
-    j2eeVersionCombo.removeAll();
-    String[] versions = null;
-	// rskreg
-    //if (selectedRuntime_ != null)
-      //versions = selectedRuntime_.getJ2EEVersions();
-    if (selectedRuntime_ != null)
-	      versions = selectedRuntime_.getJ2eeLevels();
-	// rskreg	
-    if (versions != null) {
-      //j2eeVersionCombo.setItems(versions);
-      setJ2EEComboItems(versions);
-      j2eeVersionCombo.select(0);
-      if (j2eeVersion != null) {
-        int i = j2eeVersionCombo.indexOf(J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion));
-        if (i > 0)
-          j2eeVersionCombo.select(i);
-      }
-    }
-    else
-      j2eeVersionCombo.setEnabled(false);
-  }
-
-  private void setJ2EEComboItems(String[] versions)
-  {
-    String[] j2eeLabels = new String[versions.length];
-    for (int i = 0; i < versions.length; i++)
-    {
-      String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-      if (label != null && label.length() >0)
-        j2eeLabels[i] = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-      else
-        j2eeLabels[i] = getMessage("%LABEL_NA"); 
-    }
-    j2eeVersionCombo.setItems(j2eeLabels);
-  }
-
-  private void setJ2EEVersionBasedOnServer()
-  {
-    //Get the list of J2EE versions
-    String[] versions = null;
-    if (selectedRuntime_ == null || selectedServerFactoryID_== null)
-      return;
-   
-	// rskreg
-    //versions = selectedRuntime_.getJ2EEVersions();
-	versions = selectedRuntime_.getJ2eeLevels();
-	// rskreg
-    if (versions==null)
-      return;
-    
-    //Pick the first version that the selected server supports
-    for (int i=0; i<versions.length; i++)
-    {
-      if (isServerValid(selectedServerFactoryID_, versions[i]))
-      {
-        //Set the j2ee level to this version
-        String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
-        j2eeVersionCombo.setText(label);
-        setJ2EEVersionFromJ2EEVersionCombo();
-      }
-    }      
-  }
-
-  
-  private boolean isServerValid(String serverFactoryId, String j2eeVersion)
-  {
-    String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-    if (stJ2EEVersion == null)
-      return false;
-    
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType!=null)
-    {
-      IRuntimeType serverRuntime = serverType.getRuntimeType();
-      IModuleType[] mTypes = serverRuntime.getModuleTypes();
-      for (int i=0; i<mTypes.length; i++)      
-      {
-        IModuleType mType = mTypes[i];
-        String type = mType.getId();
-        String moduleVersion = mType.getVersion();
-        if (type.equals(IServerTargetConstants.WEB_TYPE) && moduleVersion.equals(stJ2EEVersion))
-        {
-          //Found a match, return true!
-          return true;
-        }
-      }
-    }
-    //no match found or the server type was null. Return false.
-    return false;
-  }
-  
-  private void validateServerRuntimeSelection() {
-    // Check if the extension exists
-    if (selectionMode_ == MODE_SERVICE) {
-      if (selectedServerFactoryID_!=null && selectedRuntime_!=null) {
-		  // rskreg
-      //WebServiceServerRuntimeType wssrt = wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_, selectedRuntime_.getId(), typeId_);
-		  // rskreg
-      // rm WebServiceServerRuntimeType wssrt =
-      // wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_,
-      // selectedRuntime_.getId(), wse.getWebServiceType());
-      // rm if (wssrt!=null &&
-      // wssrtRegistry.isServerSupportedForChosenType(wse.getWebServiceType(),selectedServerFactoryID_))
-      // {
-		  
-		  //rskreg
-      boolean wssrtSupported = WebServiceRuntimeExtensionUtils.isServerRuntimeTypeSupported(selectedServerFactoryID_,selectedRuntime_.getId(),typeId_);		  
-      //if (wssrt != null && wssrtRegistry.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
-        //setOKStatusMessage();
-      //}
-	  
-      if (wssrtSupported && WebServiceRuntimeExtensionUtils.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
-	        setOKStatusMessage();
-	      }
-	  // rskreg
-      else {
-        setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
-      }
-      }
-    }
-    else {
-      // rm String clientId =
-      // wsctRegistry.getClientTypeIdByName(clientScenarioId_);
-      String clientId = typeId_;
-      // rm String clientId =
-      // wsctRegistry.getClientTypeIdByName(wse.getProxySelected());
-	  // rskreg
-	  
-      //WebServiceServer wss = wsctRegistry.getWebServiceServerByFactoryId(selectedServerFactoryID_);
-
-      //if (wss == null || selectedRuntime_ == null || !wsctRegistry.webServiceClientRuntimeTypeExists(wss.getId(), selectedRuntime_.getId(), clientId)) {
-        //setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
-      //}
-      if (selectedServerFactoryID_==null || selectedRuntime_ == null || !WebServiceRuntimeExtensionUtils.webServiceClientRuntimeTypeExists(selectedServerFactoryID_, selectedRuntime_.getId(), clientId)) {
-	        setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
-	  }	  
-	  // rskreg
-      else {
-        setOKStatusMessage();
-      }
-    }
-    // Disable OK button if the runtime selection is invalid
-    TreeItem[] runtimeSel = runtimesList_.getSelection();
-    if (runtimeSel == null || runtimeSel.length <= 0 || runtimeSel[0].getText().length() == 0) {
-      disableOKButton();
-    }
-    // Disable OK button if server selection is invalid
-    TreeItem[] serverSel = serverList_.getSelection();
-    String currentSelection = (serverSel != null && serverSel.length > 0) ? serverSel[0].getText() : "";
-    if (serverSel == null || currentSelection.length() == 0) {
-      disableOKButton();
-    }
-    if (!serverLabels_.containsKey(currentSelection) || !existingServersTable_.containsKey(currentSelection)) {
-      disableOKButton();
-      setOKStatusMessage();
-    }
-    // Disable OK button if category is selected rather than a server
-    if (serverSel.length > 0 && serverSel[0].getItemCount()!=0) {
-    	disableOKButton();
-    }
-    else {
-    	enableOKButton();
-    }
-    
-  }
-
-  private void setOKStatusMessage() {
-    messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
-    Color black = new Color(thisShell.getDisplay(), 0x00, 0, 0);
-    messageBanner_.setForeground(black);
-    enableOKButton();
-  }
-
-  private void setERRORStatusMessage(String message) {
-    messageBanner_.setText(getMessage(message));
-    Color red = new Color(thisShell.getDisplay(), 0xFF, 0, 0);
-    messageBanner_.setForeground(red);
-    disableOKButton();
-  }
-
-  private void disableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(false);
-  }
-
-  private void enableOKButton() {
-    if (getButton(0) != null)
-      getButton(0).setEnabled(true);
-  }
-
-  protected void okPressed() {
-    setJ2EEVersionFromJ2EEVersionCombo();
-    //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
-    setReturnCode(OK);
-    close();
-  }
-
-  private void setJ2EEVersionFromJ2EEVersionCombo()
-  {
-    if (j2eeVersionCombo.getEnabled())
-    {
-      String j2eeLabel = j2eeVersionCombo.getText();
-      String j2eeVersionString = J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
-      if (j2eeVersionString != null && j2eeVersionString.length() > 0)
-        j2eeVersion = j2eeVersionString;
-      else
-        j2eeVersion = null;
-    }
-    else
-      j2eeVersion = null;    
-  }
-  /**
-   * Called when an event occurs on the page. Handles the event and revalidates the page.
-   * 
-   * @param event
-   *          The event that occured.
-   */
-  public void handleEvent(Event event) {
-    if (!validateOn_)
-      return;
-    enableOKButton();
-    if (viewSelectionByRuntimeButton_ == event.widget) {
-      handleRuntimeViewSelectionEvent();
-      return;
-    }
-    else if (viewSelectionByServerButton_ == event.widget) {
-      handleServerViewSelectionEvent();
-      return;
-    }
-    else if (viewSelectionByExploreButton_ == event.widget) {
-      handleExploreViewSelectionEvent();
-      return;
-    }
-    else if (j2eeVersionCombo == event.widget) {
-      setJ2EEVersionFromJ2EEVersionCombo();
-      //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
-      return;
-    }
-    else if (runtimesList_ == event.widget) {
-      TreeItem[] runtimeSel = runtimesList_.getSelection();
-      processRuntimeListSelection(runtimeSel[0].getText());
-      validateServerRuntimeSelection();
-      setJ2EEVersions();
-      setJ2EEVersionBasedOnServer();
-    }
-    else if (serverList_ == event.widget) {
-      processServerListSelection();
-      validateServerRuntimeSelection();
-      setJ2EEVersionBasedOnServer();
-    }
-  }
-
-  private void handleRuntimeViewSelectionEvent() {
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.makeColumnsEqualWidth = true;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    primaryGroup_.layout();
-
-    // TODO: Show all runtimes, and only servers supported by current type id
-  }
-
-  // 
-  // Called by handleEvent() when the user selects the layout to view
-  //
-  public void handleServerViewSelectionEvent() {
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.makeColumnsEqualWidth = true;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    primaryGroup_.layout();
-    serversGroup_.setLocation(5, 5);
-    runtimesGroup_.setLocation(4, 100);
-    serversGroup_.layout();
-    runtimesGroup_.layout();
-
-    // TODO: Show all servers, and only runtimes supported by the current type id
-  }
-
-  // 
-  // Called by handleEvent() when the user selects the layout to view
-  //
-  private void handleExploreViewSelectionEvent() {
-    GridLayout gl;
-    gl = (GridLayout) primaryGroup_.getLayout();
-    gl.numColumns = 2;
-    gl.makeColumnsEqualWidth = true;
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    primaryGroup_.setLayout(gl);
-    primaryGroup_.setLayoutData(gd);
-    primaryGroup_.layout();
-
-    // TODO: Show all servers and runtimes from the type id
-
-  }
-
-  private void processRuntimeListSelection(String runtimeName) {
-	  // rskreg
-    if (selectionMode_ == MODE_SERVICE) {
-      //selectedRuntime_ = wssrtRegistry.getWebServiceRuntimeByLabel(runtimeName);
-		selectedRuntime_ = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeByLabel(runtimeName);
-    }
-    else {
-      //selectedRuntime_ = wsctRegistry.getWebServiceRuntimeByName(runtimeName);
-		selectedRuntime_ = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeByLabel(runtimeName);
-    }
-	 // rskreg
-  }
-
-  private void processServerListSelection() {
-    String currentSelection;
-    TreeItem[] serverSel = serverList_.getSelection();
-    if (serverSel != null && serverSel.length > 0) {
-      currentSelection = serverSel[0].getText();
-      if (serverLabels_.containsKey(currentSelection) || existingServersTable_.containsKey(currentSelection)) {
-        if (existingServersTable_.containsKey(currentSelection)) {
-          selectedServer_ = (IServer) existingServersTable_.get(currentSelection);
-          selectedServerLabel_ = currentSelection;
-          selectedServerFactoryID_ = selectedServer_.getServerType().getId();
-        }
-        else if (serverLabels_.containsKey(currentSelection)) {
-          TreeItem parentItem = serverSel[0].getParentItem();
-          if (parentItem != null && !parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
-            selectedServerLabel_ = currentSelection;
-            selectedServer_ = null;
-            selectedServerFactoryID_ = (String) serverLabels_.get(currentSelection);
-          }
-        }
-
-        // check if isExistingServer or new ServerType
-        TreeItem parentItem = serverSel[0].getParentItem();
-        if (parentItem != null && parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
-          setIsExistingServer(true);
-        }
-        else {
-          setIsExistingServer(false);
-        }
-      }
-      else {
-        selectedServer_ = null;
-        selectedServerLabel_ = null;
-        selectedServerFactoryID_ = null;
-        setIsExistingServer(false);
-        return;
-      }      
-    }
-  }
-
-  private static String getMessage(String key) {
-    return WebServiceConsumptionUIPlugin.getMessage(key);
-  }
-
-  private void setRuntimesGroup() {
-    runtimesList_.removeAll();
-    String[] runtimes = null;
-
-    if (selectionMode_ == MODE_SERVICE) {
-		// rskreg
-      //runtimes = wssrtRegistry.getRuntimesByType(typeId_);
-		runtimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(typeId_);
-    }
-    else {
-      //runtimes = wsctRegistry.getAllClientRuntimes();
-	  runtimes = WebServiceRuntimeExtensionUtils.getAllClientRuntimes();
-	  // rskreg
-    }
-
-    TreeItem[] runtimeName = new TreeItem[runtimes.length];
-
-    if (runtimes != null) {
-      for (int i = 0; i < runtimes.length; i++) {
-        String runtimeLabel = getRuntimeLabel(runtimes[i]);
-        runtimeName[i] = new TreeItem(runtimesList_, SWT.NONE);
-        runtimeName[i].setText(runtimeLabel);
-
-        if (runtimes[i].equalsIgnoreCase(defaultRuntime_)) {
-          runtimesList_.setSelection(new TreeItem[] { runtimeName[i]});
-          selectedRuntime_ = getRuntime(runtimes[i]);
-        }
-      }
-    }
-  }
-
-  private String getRuntimeLabel(String type) {
-    return getRuntime(type).getLabel();
-  }
-
-  // rskreg
-  private WebServiceRuntimeInfo getRuntime(String type) {
-    if (selectionMode_ == MODE_SERVICE) {
-      //return wssrtRegistry.getRuntimeById(type);
-	  return WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(type);
-    }
-    else {
-      //return wsctRegistry.getRuntimeById(type);
-	  return WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(type);
-    }
-  }
-  // rskreg
-
-  /**
-   * 
-   * ServersList class
-   * 
-   * Class which easily creates the Tree structure and entries for existing servers and server types
-   */
-  public class ServersList {
-
-    private TreeItem[] existingServersTree;
-    boolean existingServer = false;
-
-    public void setServerTreeItems(Tree serversList) {
-      this.setExistingServersTree(serversList);
-      this.setServerTypesTree(serversList);
-    }
-
-    public void setExistingServersTree(Tree serverList) {
-      String[] serverIds = this.getAllExistingServers();
-      existingServersTree = new TreeItem[1];
-      TreeItem[] existingServerItems = new TreeItem[serverIds.length];
-      existingServersTree[0] = new TreeItem(serverList, SWT.NONE);
-      existingServersTree[0].setText(getMessage("%LABEL_TREE_EXISTING_SERVERS"));
-      ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(EXISTING_SERVERS_ICON);
-      if (id != null)
-        existingServersTree[0].setImage(id.createImage());
-      for (int k = 0; k < serverIds.length; k++) {
-        IServerType serverType = ServerCore.findServerType(((IServer) existingServersTable_.get(serverIds[k])).getServerType().getId());
-        if (serverType != null) {
-          existingServerItems[k] = new TreeItem(existingServersTree[0], SWT.NONE);
-          existingServerItems[k].setText(serverIds[k]);
-          if (serverIds[k].equalsIgnoreCase(defaultServer_) && getIsExistingServer()) {
-            existingServersTree[0].setExpanded(true);
-            serverList.setSelection(new TreeItem[] { existingServerItems[k]});
-            existingServer = true;
-            RuntimeServerSelectionDialog.this.setIsExistingServer(true);
-            selectedServer_ = (IServer) existingServersTable_.get(defaultServer_);
-            selectedServerLabel_ = serverIds[k];
-            selectedServerFactoryID_ = selectedServer_.getServerType().getId();
-          }
-          existingServerItems[k].setImage(ServerUICore.getLabelProvider().getImage(serverType));
-        }
-      }
-    }
-
-    public void setServerTypesTree(Tree serverList) {
-
-      TreeItem[] serverTypesTree = new TreeItem[1];
-      serverTypesTree[0] = new TreeItem(serverList, SWT.NONE);
-      serverTypesTree[0].setText(getMessage("%LABEL_TREE_SERVER_TYPES"));
-      ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(SERVER_TYPES_ICON);
-      if (id != null)
-        serverTypesTree[0].setImage(id.createImage());
-      Hashtable categories_ = new Hashtable();
-      Hashtable categoryTreeItem = new Hashtable();
-      String[] serverIds = null;
-      // rm String wst = wse.getWebServiceType();
-      if (selectionMode_ == MODE_SERVICE) {
-		  // rskreg
-        //serverIds = wssrtRegistry.getServerFactoryIdsByType(typeId_);
-		serverIds = WebServiceRuntimeExtensionUtils.getServerFactoryIdsByType(typeId_);
-		  // rskreg
-      }
-      else {
-        //serverIds = wsctRegistry.getServerFactoryIdsByClientType(typeId_);
-		  // rskreg
-        //serverIds = wsctRegistry.getAllClientServerFactoryIds();
-		serverIds = WebServiceRuntimeExtensionUtils.getAllClientServerFactoryIds();
-		// rskreg
-
-      }
-      // rm serverId =
-      // wssrtRegistry.getServerFactoryIdsByType(wse.getWebServiceType());
-      if (serverIds == null) {
-        serverIds = getAllServerTypes();
-      }
-      TreeItem[] parent = new TreeItem[serverIds.length];
-      TreeItem[] item = new TreeItem[serverIds.length];
-      if (serverIds != null) {
-        for (int i = 0; i < serverIds.length; i++) {
-          String server = ServerUtils.getInstance().getServerLabelForId(serverIds[i]);
-          if (server != null) {
-            RuntimeServerSelectionDialog.this.serverLabels_.put(server, serverIds[i]);
-            IServerType serverType = ServerCore.findServerType(serverIds[i]);
-            IRuntimeType runtimeType = serverType.getRuntimeType();
-            if (!categories_.containsKey(serverType) && runtimeType != null) {
-              categories_.put(serverType, runtimeType);
-              if (categoryTreeItem.get(runtimeType) == null) {
-                String categoryText = runtimeType.getName();
-                Image categoryImage = ServerUICore.getLabelProvider().getImage(runtimeType);
-                parent[i] = new TreeItem(serverTypesTree[0], SWT.NONE);
-                parent[i].setText(categoryText);
-                parent[i].setImage(categoryImage);
-                categoryTreeItem.put(runtimeType, parent[i]);
-              }
-              else {
-                parent[i] = (TreeItem) categoryTreeItem.get(runtimeType);
-              }
-              String factoryText = serverType.getName();
-              Image factoryImage = ServerUICore.getLabelProvider().getImage(serverType);
-              item[i] = new TreeItem(parent[i], SWT.NONE);
-              item[i].setText(factoryText);
-              item[i].setImage(factoryImage);
-              item[i].setData(serverType);
-              if (factoryText.equalsIgnoreCase(defaultServer_) && !existingServer) {
-                serverList.setSelection(new TreeItem[] { item[i]});
-                selectedServer_ = null;
-                selectedServerLabel_ = factoryText;
-                selectedServerFactoryID_ = (String) serverLabels_.get(selectedServerLabel_);
-              }
-            }
-          }
-        }
-      }
-
-    }
-
-    /**
-     * Get all servers in the workspace
-     * 
-     * @return String[] of existing server names
-     */
-    private String[] getAllExistingServers() {
-      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];
-            serverIds.add(server.getName());
-            existingServersTable_.put(server.getName(), server);
-          }
-        }
-      }
-      return (String[]) serverIds.toArray(new String[serverIds.size()]);
-    }
-
-    /**
-     * Get all server types available for creation
-     * 
-     * @return String[] of server names
-     */
-    private String[] getAllServerTypes() {
-      Vector serverTypes_ = new Vector();
-      IServerType[] defaultServersList = ServerCore.getServerTypes();
-      for (int i = 0; i < defaultServersList.length; i++) {
-        IServerType serverType = (IServerType) defaultServersList[i];
-        serverTypes_.add(serverType.getId());
-      }
-      return (String[]) serverTypes_.toArray(new String[serverTypes_.size()]);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
deleted file mode 100644
index ee1a33015..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
+++ /dev/null
@@ -1,193 +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.consumption.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
-  {
-        
-    ArrayList supportedTypes = new ArrayList();
-    if (initialSelection != null && initialSelection.size() == 1)
-    {
-      
-      // Check for null initial selection
-      Object initialObject = initialSelection.getFirstElement();
-      if (initialObject == null)
-      {
-        return null;
-      }
-      // Match up resource type metadata with initial selection
-      Iterator iter = webServiceTypeList.iterator();
-      while (iter.hasNext())
-      {
-        String wst = (String)iter.next();
-        String scenario = wst.substring(0,wst.indexOf("/"));
-        String implId = wst.substring(wst.indexOf("/")+1);        
-        //IWebServiceType wst = (IWebServiceType)iter.next();
-        //String typeId = (String)wst.getId();
-        if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
-        {
-
-          
-          WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-          String[] resourceTypes = wsimpl.getResourceTypeMetadata();
-          for (int i=0; i<resourceTypes.length; i++)
-          {
-            if (resourceTypes[i]!=null)
-            {              
-              if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
-              {
-                String name = null;
-                IResource resource = null;
-
-                try
-                {                  
-                  resource = ResourceUtils.getResourceFromSelection(initialObject);
-                }
-                catch( CoreException exc )
-                {
-                  resource = null;
-                }
-
-                if (resource instanceof IContainer)
-                {
-                  name = initialObject.getClass().getName();
-                }
-                else if( resource != null )
-                {
-                  name = resource.getFullPath().toString();
-                }
-                else
-                {
-                  name = initialObject.getClass().getName();
-                }
-                String[] extensions = wsimpl.getExtensionMetadata();
-                if (acceptsName(name, extensions))
-                {
-                  supportedTypes.add(wst);
-                }
-              }
-              
-            }
-          }
-        }
-      }
-      
-      //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
-      //add the top-down Java service type to the list.
-      if (supportedTypes.isEmpty())
-      {
-        String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
-        for (int i=0; i<resourceTypes.length; i++)
-        {
-          if (resourceTypes[i]!=null)
-          {              
-            if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
-            {
-              String name = null;
-              IResource resource = null;
-
-              try
-              {                  
-                resource = ResourceUtils.getResourceFromSelection(initialObject);
-              }
-              catch( CoreException exc )
-              {
-                resource = null;
-              }
-
-              if (resource instanceof IContainer)
-              {
-                name = initialObject.getClass().getName();
-              }
-              else if( resource != null )
-              {
-                name = resource.getFullPath().toString();
-              }
-              else
-              {
-                name = initialObject.getClass().getName();
-              }
-              String[] extensions = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
-              if (acceptsName(name, extensions))
-              {
-                StringBuffer entrybuff = new StringBuffer();
-                entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
-                entrybuff.append("/");
-                entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
-                String entry = entrybuff.toString();                
-                supportedTypes.add(entry);
-              }
-            }
-            
-          }
-        }      
-      }
-      
-    }    
-  
-
-    
-    if (supportedTypes.isEmpty())
-    {
-      //It's not a registered implementation and its not WSDL so return null;
-      return null;
-    }
-    else
-    {
-      return (String[])supportedTypes.toArray(new String[0]);
-    }
-  }
-  //
-  // Checks if the given name is acceptable based upon its extension
-  //
-  private boolean acceptsName ( String name, String[] extensions)
-  {
-    //Return true if "all" extensions are supported.
-
-    if (extensions[0]!=null)
-    {
-      if (extensions[0].equals("all"))
-      {
-        return true;
-      }
-    }
-
-    for (int i=0; i<extensions.length; i++)
-    {
-      if (extensions[i]!=null)
-      {
-        if (name.endsWith(extensions[i]))
-          return true;
-      }
-    }
-    return false;
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
deleted file mode 100644
index 198c12dd3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
+++ /dev/null
@@ -1,80 +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.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
-  //
-  // This class holds the set of distinguishing factors in determining 
-  // the default Web service type.  The default Web Service type will be determined
-  // by pattern matching the initial selection with the supported extension 
-  // and the resource type metadata specified in the manifest file.
-  //
-  public class TypeSelectionMetadata
-  {
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-    public String[] extensionMeta;
-    public String[] resourceTypeMeta;
-
-    public TypeSelectionMetadata(String extensionMD, String resourceTypeMD)
-    {
-      setExtensionMetadata(extensionMD);
-      setResourceTypeMetadata(resourceTypeMD);
-    }
-    
-    public void setExtensionMetadata(String extensionMetadata)
-    {
-      StringTokenizer st = new StringTokenizer(extensionMetadata);
-      extensionMeta = new String[st.countTokens()];
-      int i=0;
-      while (st.hasMoreElements())
-      {
-        String exten = (String)st.nextToken();
-        if (exten!=null)
-        {
-          extensionMeta[i]=exten;
-        }
-        i++;
-      }
-
-    }
-
-    public String[] getExtensionMetadata()
-    {
-      return extensionMeta;
-    }
-    
-    public void setResourceTypeMetadata(String resourceTypeMetadata)
-    {
-      StringTokenizer st = new StringTokenizer(resourceTypeMetadata);
-      resourceTypeMeta = new String[st.countTokens()];
-      int i=0;
-      while (st.hasMoreElements())
-      {
-        String resourceType = (String)st.nextToken();
-        if (resourceType!=null)
-        {
-          resourceTypeMeta[i]=resourceType;
-        }
-        i++;
-      }
-    }
-
-    public String[] getResourceTypeMetadata()
-    {
-      return resourceTypeMeta;
-    }
-
-  }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
deleted file mode 100644
index 64bc552ba..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
+++ /dev/null
@@ -1,26 +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.consumption.ui.wizard;
-
-
-/**
-* This type is used to hold user or calculated 
-* data to be use by finsih tasks
-*/
-public interface WebServiceInfo
-{
-
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
deleted file mode 100644
index e1e8d3db2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistryIBM implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryIBM() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_IBM");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.ibm.com/ubr/inquiryapi";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.ibm.com/ubr/publishapi";
-    }
-
-    public String getRegistrationURL() {
-        return "http://uddi.ibm.com/ubr/registry.html";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
deleted file mode 100644
index 1df4395a5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistryIBMTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryIBMTest() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.ibm.com/testregistry/inquiryapi";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.ibm.com/testregistry/publishapi";
-    }
-
-    public String getRegistrationURL() {
-        return "http://uddi.ibm.com/testregistry/registry.html";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
deleted file mode 100644
index 89bdd3ea5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistryMicrosoft implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryMicrosoft() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.microsoft.com/inquire";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.microsoft.com/publish";
-    }
-
-    public String getRegistrationURL() {
-        return "https://uddi.microsoft.com/register.aspx";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
deleted file mode 100644
index 80fb5f6e2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistryMicrosoftTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryMicrosoftTest() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST");
-    }
-
-    public String getInquiryURL() {
-        return "http://test.uddi.microsoft.com/inquire";
-    }
-
-    public String getPublishURL() {
-        return "https://test.uddi.microsoft.com/publish";
-    }
-
-    public String getRegistrationURL() {
-        return "http://test.uddi.microsoft.com/register.aspx";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
deleted file mode 100644
index 0158b0ffc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryNTTComm() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM");
-    }
-
-    public String getInquiryURL() {
-        return "http://www.uddi.ne.jp/ubr/inquiryapi";
-    }
-
-    public String getPublishURL() {
-        return "https://www.uddi.ne.jp/ubr/publishapi";
-    }
-
-    public String getRegistrationURL() {
-        return "http://www.ntt.com/uddi/";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
deleted file mode 100644
index 04d6d1f13..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistrySAP() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_SAP");
-    }
-
-    public String getInquiryURL() {
-        return "http://uddi.sap.com/UDDI/api/inquiry/";
-    }
-
-    public String getPublishURL() {
-        return "https://uddi.sap.com/UDDI/api/publish/";
-    }
-
-    public String getRegistrationURL() {
-        return "http://uddi.sap.com/";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
deleted file mode 100644
index 31762a692..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistrySAPTest() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST");
-    }
-
-    public String getInquiryURL() {
-        return "http://udditest.sap.com/UDDI/api/inquiry/";
-    }
-
-    public String getPublishURL() {
-        return "https://udditest.sap.com/UDDI/api/publish/";
-    }
-
-    public String getRegistrationURL() {
-        return "http://udditest.sap.com/";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
deleted file mode 100644
index e4d9e6589..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-public interface PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public String getName();
-    public String getInquiryURL();
-    public String getPublishURL();
-    public String getRegistrationURL();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
deleted file mode 100644
index 0041287d5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.parser.plugin.ParserPlugin;
-
-public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType
-{
-
-    // Copyright
-    public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-    public PublicUDDIRegistryXMethods() {
-    }
-
-    public String getName() {
-        return ParserPlugin.getMessage("%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS");
-    }
-
-    public String getInquiryURL() {
-        //return "http://uddi.xmethods.net/inquire";
-        return "http://uddi.xmethods.net/inquire2";
-    }
-
-    // Read-only registry. The publish and registration URLs don't exist.
-    public String getPublishURL() {
-        return "https://uddi.xmethods.net/publish2";
-    }
-
-    public String getRegistrationURL() {
-        return "http://www.xmethods.net/ve2/Register.po?event=registerOrg";
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
deleted file mode 100644
index 9db02e7d6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
+++ /dev/null
@@ -1,65 +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.consumption.ui.wsil;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-
-
-public class AddWSDLToWSILWrapperCommand extends AbstractDataModelOperation
-{
-  private AddWSDLToWSILCommand command;
-  private Arguments args;
-
-  public AddWSDLToWSILWrapperCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    if (command == null)
-      command = new AddWSDLToWSILCommand();
-    if (!args.isEmpty())
-    {
-      command.setArguments(args.getStringArguments());
-      command.setWWWAuthenticationHandler(new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
-      command.setEnvironment( env );
-      return command.execute( null, null);
-    }
-    return Status.OK_STATUS;
-  }
-  /**
-   * @param args The args to set.
-   */
-  public void setArgs(Arguments args)
-  {
-    this.args = args;
-  }
-
-  /**
-   * @param command The command to set.
-   */
-  public void setCommand(AddWSDLToWSILCommand command)
-  {
-    this.command = command;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
deleted file mode 100644
index 7a177c5a8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
+++ /dev/null
@@ -1,75 +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.consumption.ui.wsil;
-
-import java.util.Vector;
-
-public class Arguments
-{
-  private Vector args_;
-
-  public Arguments()
-  {
-    args_ = new Vector();
-  }
-
-  public void add(String key, Object value)
-  {
-    args_.add(key);
-    if (value != null)
-      args_.add(value);
-  }
-
-  public void remove(String key)
-  {
-    int index = args_.indexOf(key);
-    if (index >= 0)
-    {
-      args_.remove(index);
-      args_.remove(index+1);
-    }
-  }
-
-  public Object get(String key)
-  {
-    int index = args_.indexOf(key);
-    if (index >= 0)
-      return args_.get(index+1);
-    else
-      return null;
-  }
-
-  public void clear()
-  {
-    args_.clear();
-  }
-
-  public Object[] getArguments()
-  {
-    Object[] args = new Object[args_.size()];
-    args_.copyInto(args);
-    return args;
-  }
-
-  public String[] getStringArguments()
-  {
-    String[] args = new String[args_.size()];
-    for (int i = 0; i < args.length; i++)
-      args[i] = args_.get(i).toString();
-    return args;
-  }
-
-  public boolean isEmpty()
-  {
-    return args_.isEmpty();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
deleted file mode 100644
index 61f9d5491..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
+++ /dev/null
@@ -1,157 +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.consumption.ui.wsil;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler;
-
-
-public class DialogWWWAuthentication extends Dialog implements WWWAuthenticationHandler
-{
-
-  /*CONTEXT_ID DBAS0001 for the HTTP basic authentication user name*/
-  private final String INFOPOP_DBAS_USERNAME = WebServiceConsumptionUIPlugin.ID + ".DBAS0001";
-
-  /*CONTEXT_ID DBAS0002 for the HTTP basic authentication password*/
-  private final String INFOPOP_DBAS_PASSWORD = WebServiceConsumptionUIPlugin.ID + ".DBAS0002";
-
-  private String usernameString_;
-  private String passwordString_;
-
-  private Text username_;
-  private Text password_;
-
-  private WWWAuthenticationException wwwae_;
-
-  public DialogWWWAuthentication(Shell shell)
-  {
-    super(shell);
-    usernameString_ = null;
-    passwordString_ = null;
-    wwwae_ = null;
-  }
-
-  /**
-  * Called when the Cancel button is pressed.
-  */
-  protected void cancelPressed()
-  {
-    usernameString_ = null;
-    passwordString_ = null;
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  */
-  protected void okPressed()
-  {
-    String usernameString = username_.getText();
-    usernameString_ = (usernameString.length() > 0) ? usernameString : null;
-    String passwordString = password_.getText();
-    passwordString_ = (passwordString.length() > 0) ? passwordString : null;
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(getMessage("%DIALOG_TITLE_HTTP_BASIC_AUTH"));
-  }
-
-  /** 
-  * Creates the dialog area.
-  * @param parent The parent composite.
-  * @return The control area.
-  */
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = (Composite)super.createDialogArea(parent);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.widthHint = 400;
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.verticalSpacing = 15;
-    composite.setLayout(gl);
-
-    Label label = new Label(composite, SWT.WRAP);
-    label.setText(getMessage("%LABEL_URL"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(wwwae_.getURL());
-    label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_USERNAME"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    username_ = new Text(composite, SWT.BORDER);
-    username_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    username_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_USERNAME"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_USERNAME);
-
-    label = new Label(composite, SWT.WRAP);
-    label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_PASSWORD"));
-    label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
-    password_ = new Text(composite, SWT.BORDER);
-    password_.setEchoChar('*');
-    password_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    password_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_PASSWORD"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_PASSWORD);
-
-    return composite;
-  }
-
-  private String getMessage(String msgId)
-  {
-    return WebServiceConsumptionUIPlugin.getMessage(msgId);
-  }
-
-  public void handleWWWAuthentication(WWWAuthenticationException wwwae)
-  {
-    usernameString_ = null;
-    passwordString_ = null;
-    wwwae_ = wwwae;
-    open();
-  }
-
-  public String getUsername()
-  {
-    return usernameString_;
-  }
-
-  public String getPassword()
-  {
-    return passwordString_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
deleted file mode 100644
index aa98c1428..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
+++ /dev/null
@@ -1,525 +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.consumption.ui.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TableViewerEditor extends Composite
-{
-  private int DEFAULT_TABLE_HEIGHT_HINT = 100;
-  private int DEFAULT_COLUMN_WIDTH = 80;
-
-  private String[] columns_;
-  private TableViewer tableViewer_;
-  private Table table_;
-  private TableEditor editor_;
-  private TableEditorListener tableEditorListener_;
-  private Text text_;
-  private Button add_;
-  private Button remove_;
-
-  private List values_;
-  private Object defaultValue_;
-
-  public TableViewerEditor(Composite parent, String[] columns, List initValues, Object defaultValue)
-  {
-    super(parent, SWT.NONE);
-    columns_ = columns;
-    values_ = new ArrayList();
-    if (initValues != null && initValues.size() > 0)
-      values_.addAll(initValues);
-    defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
-    createPartControl(this);
-  }
-
-  private void createPartControl(Composite parent)
-  {
-    GridLayout gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    setLayout(gl);
-    setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    Composite composite = new Composite(parent, SWT.NONE);
-    gl = new GridLayout();
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    composite.setLayout(gl);
-    composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
-    table_.setLayoutData(gd);
-    table_.setHeaderVisible(true);
-    table_.setLinesVisible(true);
-    TableLayout tableLayout = new TableLayout();
-    int maxWidth = DEFAULT_COLUMN_WIDTH;
-    for (int i = 0; i < columns_.length; i++)
-    {
-      TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
-      tableColumn.setText(columns_[i]);
-      tableColumn.pack();
-      int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
-      maxWidth = Math.max(maxWidth, tableColumnWidth);
-      ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
-      tableLayout.addColumnData(columnData);
-    }
-    table_.setLayout(tableLayout);
-    // initialize the table editor
-    editor_ = new TableEditor(table_);
-    // The editor must have the same size as the cell and must
-    // not be any smaller than 50 pixels.
-    editor_.horizontalAlignment = SWT.LEFT;
-    editor_.grabHorizontal = true;
-    editor_.minimumWidth = maxWidth;
-    tableEditorListener_ = new TableEditorListener();
-    table_.addMouseListener(tableEditorListener_);
-    tableViewer_ = new TableViewer(table_);
-    tableViewer_.getControl().addKeyListener(
-      new KeyListener()
-      {
-        public void keyPressed(KeyEvent e)
-        {
-          // Del
-          if (((int)e.character) == 127) 
-            handleDeleteKeyPressed();
-          // Enter or space
-          if (((int)e.character) == 13 || ((int)e.character) == 32)
-            tableEditorListener_.editSelection();
-        }
-        public void keyReleased(KeyEvent e)
-        {
-        }
-      }
-    );
-    tableViewer_.setContentProvider(new ListContentProvider());
-    tableViewer_.setLabelProvider(new ListLabelProvider());
-    tableViewer_.setInput(values_);
-    tableViewer_.addSelectionChangedListener(
-      new ISelectionChangedListener()
-      {
-        public void selectionChanged(SelectionChangedEvent event)
-        {
-          enableRemove(true);
-        }
-      }
-    );
-
-    Composite buttonComposite = new Composite(composite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.makeColumnsEqualWidth = true;
-    buttonComposite.setLayout(gl);
-    buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
-    add_ = new Button(buttonComposite, SWT.PUSH);
-    add_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_ADD"));
-    add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    add_.addSelectionListener(
-      new SelectionListener()
-      {
-        public void widgetSelected(SelectionEvent event)
-        {
-          handleAddButtonSelected(event);
-        }
-        public void widgetDefaultSelected(SelectionEvent event)
-        {
-        }
-      }
-    );
-
-    remove_ = new Button(buttonComposite, SWT.PUSH);
-    remove_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_REMOVE"));
-    remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    remove_.addSelectionListener(
-      new SelectionListener()
-      {
-        public void widgetSelected(SelectionEvent event)
-        {
-          handleRemoveButtonSelected(event);
-        }
-        public void widgetDefaultSelected(SelectionEvent event)
-        {
-        }
-      }
-    );
-    enableRemove(false);
-  }
-
-  private void enableRemove(boolean enabled)
-  {
-    remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
-  }
-
-  private void handleAddButtonSelected(SelectionEvent event)
-  {
-    values_.add(defaultValue_);
-    refresh();
-    setSelectionAsObject(values_.get(table_.getItemCount()-1));
-    tableEditorListener_.editSelection();
-  }
-
-  private void handleRemoveButtonSelected(SelectionEvent event)
-  {
-    handleDeleteKeyPressed();
-  }
-
-  private void handleDeleteKeyPressed()
-  {
-    internalDispose();
-    ISelection selection = tableViewer_.getSelection();
-    if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
-    {
-      int selectionIndex = table_.getSelectionIndex();
-      int selectionCount = table_.getItemCount();
-      values_.remove(selectionIndex);
-      if (selectionIndex < selectionCount-1)
-        setSelectionAsObject(values_.get(selectionIndex));
-      else if (selectionCount -2 >= 0)
-        setSelectionAsObject(values_.get(selectionCount-2));
-      refresh();
-    }
-  }
-
-  private void internalRefresh()
-  {
-    // synchronize text field, previously selected table cell and model (inputObject)
-    if (text_ != null)
-    {
-      TableItem oldTableItem = editor_.getItem();
-      int oldColumnIndex = editor_.getColumn();
-      if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
-      {
-        String oldText = text_.getText();
-        oldTableItem.setText(oldColumnIndex, oldText);
-        int oldRowIndex = table_.indexOf(oldTableItem);
-        values_.set(oldRowIndex, oldText);
-      }
-    }
-  }
-
-  private void setSelectionAsObject(Object object)
-  {
-    tableViewer_.setSelection(new StructuredSelection(object), true);
-  }
-
-  public void setToolTipText(String string)
-  {
-    table_.setToolTipText(string);
-  }
-
-  public void setInfopop(String string)
-  {
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp(table_, string);
-  }
-  
-  public void setInput(List list)
-  {
-    values_.clear();
-    values_.addAll(list);
-  }
-
-  public void refresh()
-  {
-    internalRefresh();
-    tableViewer_.refresh();
-  }
-
-  public TableItem[] getItems()
-  {
-    internalRefresh();
-    return table_.getItems();
-  }
-
-  public void setEnabled(boolean enabled)
-  {
-    super.setEnabled(enabled);
-    add_.setEnabled(enabled);
-    enableRemove(enabled);
-  }
-
-  public void dispose()
-  {
-    super.dispose();
-    internalDispose();
-    if (editor_ != null)
-      editor_.dispose();
-    if (table_ != null)
-      table_.dispose();
-    if (add_ != null)
-      add_.dispose();
-    if (remove_ != null)
-      remove_.dispose();
-  }
-
-  private void internalDispose()
-  {
-    if (text_ != null)
-      text_.dispose();
-    text_ = null;
-  }
-
-  protected class TableEditorListener implements MouseListener
-  {
-    private int currSelectionIndex_;
-    private int editRow_;
-    private int editColumn_;
-
-    public TableEditorListener()
-    {
-      super();
-      currSelectionIndex_ = -1;
-      editRow_ = -1;
-      editColumn_ = -1;
-    }
-
-    public void mouseDoubleClick(MouseEvent e)
-    {
-      mouseDown(e);
-    }
-
-    public void mouseDown(MouseEvent e)
-    {
-      // refresh table
-      internalRefresh();
-      // Clean up previous text editor control
-      internalDispose();
-      // update table
-      if (table_.isFocusControl())
-      {
-        int selectedRowIndex = getSelectedRow(table_, e.y);
-        if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
-        {
-          TableItem tableItem = table_.getItem(selectedRowIndex);
-          int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
-          if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
-            editSelection(selectedRowIndex, selectedColumnIndex);
-        }
-        currSelectionIndex_ = selectedRowIndex;
-      }
-    }
-
-    public void mouseUp(MouseEvent e)
-    {
-    }
-
-    private int getSelectedRow(Table table, int y)
-    {
-      TableItem[] tableItems = table.getItems();
-      for (int i = 0; i < tableItems.length; i++)
-      {
-        Rectangle rectangle = tableItems[i].getBounds(0);
-        if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
-          return i;
-      }
-      return -1;
-    }
-
-    private int getSelectedColumn(TableItem tableItem, int x, int y)
-    {
-      for (int i = 0; i < columns_.length; i++)
-      {
-        if (tableItem.getBounds(i).contains(x, y))
-          return i;
-      }
-      return -1;
-    }
-
-    private void editSelection(int row, int column)
-    {
-      editRow_ = row;
-      editColumn_ = column;
-      TableItem tableItem = table_.getItem(row);
-      // Setup adapter for the new selection
-      text_ = new Text(table_, SWT.NONE);
-      String text = tableItem.getText(column);
-      text_.setText((text != null) ? text : "");
-      text_.addKeyListener(new KeyListener()
-        {
-          public void keyPressed(KeyEvent e)
-          {
-            // Esc
-            if (((int)e.character) == 27)
-              cancelSelection();
-          }
-          public void keyReleased(KeyEvent e)
-          {
-          }
-        }
-      );
-      text_.addTraverseListener(new TraverseListener()
-        {
-          public void keyTraversed(TraverseEvent e)
-          {
-            if (e.detail == SWT.TRAVERSE_TAB_NEXT)
-              traverseTabNext();
-            else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
-              traverseTabPrevious();
-          }
-        }
-      );
-      editor_.setEditor(text_, tableItem, column);
-      text_.setFocus();
-      text_.selectAll();
-    }
-
-    protected void traverseTabNext()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
-      {
-        if (editColumn_ < columns_.length-1)
-          editColumn_++;
-        else
-        {
-          editColumn_ = 0;
-          editRow_++;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    protected void traverseTabPrevious()
-    {
-      internalRefresh();
-      internalDispose();
-      if (!(editRow_ == 0 && editColumn_ == 0))
-      {
-        if (editColumn_ > 0)
-          editColumn_--;
-        else
-        {
-          editColumn_ = columns_.length-1;
-          editRow_--;
-          table_.select(editRow_);
-        }
-        editSelection(editRow_, editColumn_);
-      }
-    }
-
-    public void cancelSelection()
-    {
-      internalDispose();
-      internalRefresh();
-    }
-
-    public void editSelection()
-    {
-      int selectedRowIndex = table_.getSelectionIndex();
-      if (selectedRowIndex != -1 && columns_.length > 0)
-      {
-        // refresh table
-        internalRefresh();
-        // Clean up any previous editor control
-        internalDispose();
-        editSelection(selectedRowIndex, 0);
-      }
-      currSelectionIndex_ = selectedRowIndex;
-    }
-  }
-
-  protected class ListContentProvider implements IStructuredContentProvider
-  {
-    public void dispose()
-    {
-    }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      tableViewer_.add(getElements(newInput));
-    }
-
-    public Object[] getElements(Object inputElement)
-    {
-      if (inputElement instanceof List)
-      {
-        List list = (List)inputElement;
-        Object[] objects = new Object[list.size()];
-        for (int i = 0; i < objects.length; i++)
-          objects[i] = list.get(i);
-        return objects;
-      }
-      else
-        return new Object[0];
-    }
-  }
-
-  protected class ListLabelProvider implements ITableLabelProvider
-  {
-    public Image getColumnImage(Object element, int columnIndex)
-    {
-      return null;
-    }
-
-    public String getColumnText(Object element, int columnIndex)
-    {
-      return element.toString();
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return true;
-    }
-
-    public void dispose()
-    {
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
deleted file mode 100644
index 41e17c363..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-
-public class Utils
-{
-  public Utils()
-  {
-  }
-
-  public String toFileSystemURI(String relativePlatformURI)
-  {
-    if (relativePlatformURI != null)
-      return toFileSystemURI(ResourceUtils.findResource(relativePlatformURI));
-    else
-      return null;
-  }
-
-  public String toFileSystemURI(IResource res)
-  {
-    if (res != null)
-    {
-      IPath path = res.getLocation();
-      if (path != null)
-      {
-        try
-        {
-          return path.toFile().toURL().toString();
-        }
-        catch (MalformedURLException murle)
-        {
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
deleted file mode 100644
index 808a1afc9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
+++ /dev/null
@@ -1,118 +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.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class ClientType {
-
-  private IConfigurationElement elem_;
-  private Hashtable webServiceClientImpls_;
-    
-	private String id;
-	private WebServiceClientImpl webServiceClientImpl;
-	private String[] moduleTypesInclude;
-  private String[] moduleTypesExclude;
-	
-  
-  
-	public ClientType(IConfigurationElement elem_, Hashtable webServiceClientImpls_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.webServiceClientImpls_ = webServiceClientImpls_;
-  }
-
-
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-
-
-  public String[] getModuleTypesExclude()
-  {
-    if (moduleTypesExclude==null)
-    {
-      String attr = elem_.getAttribute("moduleTypesExclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        moduleTypesExclude = new String[size];
-        for (int i = 0; i < moduleTypesExclude.length; i++)
-          moduleTypesExclude[i] = st.nextToken();
-      }
-    }
-    return moduleTypesExclude;
-  }
-  
-
-
-
-  public String[] getModuleTypesInclude()
-  {
-    if (moduleTypesInclude==null)
-    {
-      String attr = elem_.getAttribute("moduleTypesInclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        moduleTypesInclude = new String[size];
-        for (int i = 0; i < moduleTypesInclude.length; i++)
-          moduleTypesInclude[i] = st.nextToken();
-      }
-    }
-    return moduleTypesInclude;
-  }
-  
-
-
-
-  public WebServiceClientImpl getWebServiceClientImpl()
-  {
-    if (webServiceClientImpl==null)
-    {
-      String wscimplId = elem_.getAttribute("implId");
-      webServiceClientImpl = (WebServiceClientImpl)webServiceClientImpls_.get(wscimplId);
-    }
-    return webServiceClientImpl;
-  }
-  
-
-
-  /*
-  public String getWebServiceClientTypeId()
-  {
-    if (webServiceClientTypeId==null)
-    {
-      webServiceClientTypeId = elem_.getAttribute("webServiceClientTypeId");
-    }
-    return webServiceClientTypeId;
-  }
-  */
-
-
-	
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
deleted file mode 100644
index 3abfb4489..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
+++ /dev/null
@@ -1,143 +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.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class Context implements IContext {	
-	private WebServiceScenario scenario;
-	private boolean develop;
-	private boolean assemble;
-	private boolean deploy;
-	private boolean install;
-	private boolean run;
-	private boolean client;
-	private boolean test;
-	private boolean publish;
-	private boolean overWriteFiles;
-	private boolean createFolders;
-	private boolean checkOutFiles;
-	
-	public boolean getAssemble() {
-		return assemble;
-	}
-	
-	public boolean getCheckOutFiles() {
-		return checkOutFiles;
-	}
-	
-	public boolean getClient() {
-		return client;
-	}
-	
-	public boolean getCreateFolders() {
-		return createFolders;
-	}
-	
-	public boolean getDeploy() {
-		return deploy;
-	}
-	
-	public boolean getDevelop() {
-		return develop;
-	}
-	
-	public boolean getInstall() {
-		return install;
-	}
-	
-	public boolean getOverWriteFiles() {
-		return overWriteFiles;
-	}
-	
-	public boolean getPublish() {
-		return publish;
-	}
-	
-	public boolean getRun() {
-		return run;
-	}
-	
-	public WebServiceScenario getScenario() {
-		return scenario;
-	}
-	
-	public boolean getTest() {
-		return test;
-	}
-
-	public void setAssemble(boolean assemble) {
-		this.assemble = assemble;
-	}
-	
-
-	public void setCheckOutFiles(boolean checkOutFiles) {
-		this.checkOutFiles = checkOutFiles;
-	}
-	
-
-	public void setClient(boolean client) {
-		this.client = client;
-	}
-	
-
-	public void setCreateFolders(boolean createFolders) {
-		this.createFolders = createFolders;
-	}
-	
-
-	public void setDeploy(boolean deploy) {
-		this.deploy = deploy;
-	}
-	
-
-	public void setDevelop(boolean develop) {
-		this.develop = develop;
-	}
-	
-
-	public void setInstall(boolean install) {
-		this.install = install;
-	}
-	
-
-	public void setOverWriteFiles(boolean overWriteFiles) {
-		this.overWriteFiles = overWriteFiles;
-	}
-	
-
-	public void setPublish(boolean publish) {
-		this.publish = publish;
-	}
-	
-
-	public void setRun(boolean run) {
-		this.run = run;
-	}
-	
-
-	public void setScenario(WebServiceScenario scenario) {
-		this.scenario = scenario;
-	}
-	
-
-	public void setTest(boolean test) {
-		this.test = test;
-	}		
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
deleted file mode 100644
index ec4640339..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
+++ /dev/null
@@ -1,30 +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.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-
-public class Selection implements ISelection {
-
-	private Object[] selection;
-	
-	public Object[] getSelection() 
-	{
-		return selection;
-	}
-	
-	public void setSelection(Object[] selection)
-	{
-		this.selection = selection;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
deleted file mode 100644
index ec311b949..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
+++ /dev/null
@@ -1,199 +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.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class ServiceType {
-
-  private IConfigurationElement elem_;
-  private Hashtable webServiceImpls_;
-  private String id;
-  private WebServiceImpl webServiceImpl;
-  private String[] bottomUpModuleTypesInclude;
-  private String[] topDownModuleTypesInclude;
-  private String[] bottomUpModuleTypesExclude;
-  private String[] topDownModuleTypesExclude;
-
-  
-
-  
-  public ServiceType(IConfigurationElement elem_, Hashtable webServiceImpls_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.webServiceImpls_ = webServiceImpls_;
-  }
-
-  public String[] getBottomUpModuleTypesExclude()
-  {
-    if (bottomUpModuleTypesExclude==null)
-    {
-      String attr = elem_.getAttribute("buModuleTypesExclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        bottomUpModuleTypesExclude = new String[size];
-        for (int i = 0; i < bottomUpModuleTypesExclude.length; i++)
-          bottomUpModuleTypesExclude[i] = st.nextToken();
-      }
-    }
-    return bottomUpModuleTypesExclude;
-  }
-  
-  public void setBottomUpModuleTypesExclude(String[] bottomUpModuleTypesExclude)
-  {
-    this.bottomUpModuleTypesExclude = bottomUpModuleTypesExclude;
-  }
-  
-  public String[] getBottomUpModuleTypesInclude()
-  {
-    if (bottomUpModuleTypesInclude==null)
-    {
-      String attr = elem_.getAttribute("buModuleTypesInclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        bottomUpModuleTypesInclude = new String[size];
-        for (int i = 0; i < bottomUpModuleTypesInclude.length; i++)
-          bottomUpModuleTypesInclude[i] = st.nextToken();
-      }
-    }
-    return bottomUpModuleTypesInclude;
-  }
-  
-  public void setBottomUpModuleTypesInclude(String[] bottomUpModuleTypesInclude)
-  {
-    this.bottomUpModuleTypesInclude = bottomUpModuleTypesInclude;
-  }
-  
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-  
-  public String[] getTopDownModuleTypesExclude()
-  {
-    if (topDownModuleTypesExclude==null)
-    {
-      String attr = elem_.getAttribute("tdModuleTypesExclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        topDownModuleTypesExclude = new String[size];
-        for (int i = 0; i < topDownModuleTypesExclude.length; i++)
-          topDownModuleTypesExclude[i] = st.nextToken();
-      }
-    }
-    return topDownModuleTypesExclude;
-  }
-  
-  public void setTopDownModuleTypesExclude(String[] topDownModuleTypesExclude)
-  {
-    this.topDownModuleTypesExclude = topDownModuleTypesExclude;
-  }
-  
-  public String[] getTopDownModuleTypesInclude()
-  {
-    if (topDownModuleTypesInclude==null)
-    {
-      String attr = elem_.getAttribute("tdModuleTypesInclude");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        topDownModuleTypesInclude = new String[size];
-        for (int i = 0; i < topDownModuleTypesInclude.length; i++)
-          topDownModuleTypesInclude[i] = st.nextToken();
-      }
-    }
-    return topDownModuleTypesInclude;
-  }
-  
-  public void setTopDownModuleTypesInclude(String[] topDownModuleTypesInclude)
-  {
-    this.topDownModuleTypesInclude = topDownModuleTypesInclude;
-  }
-  
-  public WebServiceImpl getWebServiceImpl()
-  {
-    if (webServiceImpl == null)
-    {
-      String wsimplId = elem_.getAttribute("implId");
-      webServiceImpl = (WebServiceImpl)webServiceImpls_.get(wsimplId);
-    }
-    return webServiceImpl;
-  }
-  
-  public void setWebServiceImpl1(WebServiceImpl webServiceImpl)
-  {
-    this.webServiceImpl = webServiceImpl;
-  }
-  
-  public boolean supportsScenario(int scenario)
-  {
-    switch(scenario)
-    {
-    case WebServiceScenario.BOTTOMUP:
-      String[] bus = getBottomUpModuleTypesInclude();
-      if (bus!=null && bus.length>0)
-      {
-        return true;
-      }
-      break;
-    case WebServiceScenario.TOPDOWN:
-      String[] tds = getTopDownModuleTypesInclude();
-      if (tds!=null && tds.length>0)
-      {
-        return true;
-      }
-      break;
-    default:
-     
-    }
-    
-    return false;
-  }
-  
-	public String[] getModuleTypesInclude(int scenario)
-  {
-    switch(scenario)
-    {
-    case WebServiceScenario.BOTTOMUP:
-      return getBottomUpModuleTypesInclude();
-    case WebServiceScenario.TOPDOWN:
-      return getTopDownModuleTypesInclude();
-    default:     
-    }
-    
-    return null;    
-  }
-  
-	
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
deleted file mode 100644
index d187b3a6a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
+++ /dev/null
@@ -1,45 +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.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceClientImpl {
-
-  private IConfigurationElement elem_; 
-	private String id;
-	private String label;
-  
-  public WebServiceClientImpl(IConfigurationElement elem_)
-  {
-    super();
-    this.elem_ = elem_;
-  }
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-  public String getLabel()
-  {
-    if (label==null)
-    {
-      label = elem_.getAttribute("label");
-    }
-    return label;
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
deleted file mode 100644
index 971875ca1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.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.consumption.ui.wsrt;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceImpl {
-	
-  private IConfigurationElement elem_;
-	private String id;
-	private String label;
-	private String[] resourceTypeMetadata;
-	private String[] extensionMetadata;
-  private String objectSelectionWidget;
-  
-  public WebServiceImpl(IConfigurationElement elem_)
-  {
-    super();
-    this.elem_ = elem_;
-  }
-
-  public String[] getExtensionMetadata()
-  {
-    if (extensionMetadata==null)
-    {
-      String attr = elem_.getAttribute("extensionMetadata");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        extensionMetadata = new String[size];
-        for (int i = 0; i < extensionMetadata.length; i++)
-          extensionMetadata[i] = st.nextToken();
-      }      
-    }
-    return extensionMetadata;
-  }
-  
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-  public String getLabel()
-  {
-    if (label==null)
-    {
-      label = elem_.getAttribute("label");
-    }
-    return label;
-  } 
-  
-
-  public String[] getResourceTypeMetadata()
-  {
-    if (resourceTypeMetadata==null)
-    {
-      String attr = elem_.getAttribute("resourceTypeMetadata");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        resourceTypeMetadata = new String[size];
-        for (int i = 0; i < resourceTypeMetadata.length; i++)
-          resourceTypeMetadata[i] = st.nextToken();
-      }      
-    }
-    return resourceTypeMetadata;
-  }
-
-  public String getObjectSelectionWidget()
-  {
-    if (objectSelectionWidget==null)
-    {
-      objectSelectionWidget = elem_.getAttribute("objectSelectionWidget");
-    }
-    return objectSelectionWidget;
-  }
-  
-	
-  
-  
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
deleted file mode 100644
index 3347379db..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
+++ /dev/null
@@ -1,217 +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.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry
-{
-
-  private static WebServiceRuntimeExtensionRegistry instance_;
-
-  HashMap webServiceTypes_;
-  
-  ArrayList webServiceTypesList_;
-  
-  ArrayList webServiceClientTypesList_;
-
-  Hashtable webServiceImpls_;
-
-  Hashtable webServiceClientImpls_;
-
-  Hashtable serviceTypes_;
-
-  Hashtable clientTypes_;
-
-  Hashtable webServiceRuntimes_;
-
-  /**
-   * Returns a singleton instance of this class.
-   * 
-   * @return A singleton WebServiceRuntimeExtensionRegistry object.
-   */
-  public static WebServiceRuntimeExtensionRegistry getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceRuntimeExtensionRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  private void load()
-  {
-    // Can't get rid of webServiceTypes in M4
-    webServiceTypes_ = new HashMap();
-    webServiceTypesList_ = new ArrayList();
-    webServiceClientTypesList_ = new ArrayList();
-    webServiceImpls_ = new Hashtable();
-    webServiceClientImpls_ = new Hashtable();
-    serviceTypes_ = new Hashtable();
-    clientTypes_ = new Hashtable();
-    webServiceRuntimes_ = new Hashtable();
-
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    
-    //Load WebServiceImpls
-    IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-    
-    for(int idx=0; idx<wsImplExts.length; idx++) 
-    {
-      IConfigurationElement elem = wsImplExts[idx];
-
-        if (elem.getName().equals("webServiceImpl"))
-        {
-          WebServiceImpl wsimpl = new WebServiceImpl(elem);
-          webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
-        }        
-    }
-    
-    //Load WebServiceClientImpls
-    IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-    
-    for(int idx=0; idx<wsClientImplExts.length; idx++) 
-    {
-      IConfigurationElement elem = wsClientImplExts[idx];
-
-        if (elem.getName().equals("webServiceClientImpl"))
-        {
-          WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
-          webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
-        }        
-    }
-    
-    //Load ServiceTypes
-    IConfigurationElement[] serviceTypeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "serviceType");
-    
-    for(int idx=0; idx<serviceTypeExts.length; idx++) 
-    {
-      IConfigurationElement elem = serviceTypeExts[idx];
-
-        if (elem.getName().equals("serviceType"))
-        {
-          ServiceType st = new ServiceType(elem,webServiceImpls_);
-          serviceTypes_.put(elem.getAttribute("id"), st);
-        }        
-    }
-    
-    //Load ClientTypes
-    IConfigurationElement[] clientTypeExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "clientType");
-    
-    for(int idx=0; idx<clientTypeExts.length; idx++) 
-    {
-      IConfigurationElement elem = clientTypeExts[idx];
-
-        if (elem.getName().equals("clientType"))
-        {
-          ClientType ct = new ClientType(elem,webServiceClientImpls_);
-          clientTypes_.put(elem.getAttribute("id"), ct);
-        }        
-    }
-    
-    //Load WebSerivceRuntimes
-    IConfigurationElement[] wsrtExts = reg.getConfigurationElementsFor(
-        "org.eclipse.jst.ws.consumption.ui", "webServiceRuntime");
-    
-    for(int idx=0; idx<wsrtExts.length; idx++) 
-    {
-      IConfigurationElement elem = wsrtExts[idx];
-
-        if (elem.getName().equals("webServiceRuntime"))
-        {
-          WebServiceRuntimeInfo wsrtInfo = new WebServiceRuntimeInfo(elem, serviceTypes_, clientTypes_);
-          webServiceRuntimes_.put(elem.getAttribute("id"), wsrtInfo);
-          
-          //Update the type lists
-          updateWebServiceTypeList(wsrtInfo);
-          updateWebServiceClientTypeList(wsrtInfo);
-          
-        }        
-    }
-  }  
-    
-  private void updateWebServiceTypeList(WebServiceRuntimeInfo wsrtInfo)
-  {
-    ServiceType[] sts = wsrtInfo.getServiceTypes();
-    if (sts != null)
-    {
-      for (int j = 0; j < sts.length; j++)
-      {
-        String implId = sts[j].getWebServiceImpl().getId();
-        String[] bus = sts[j].getBottomUpModuleTypesInclude();
-        String[] tds = sts[j].getTopDownModuleTypesInclude();
-        if (bus != null)
-        {
-          StringBuffer entrybuff = new StringBuffer();
-          entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
-          entrybuff.append("/");
-          entrybuff.append(implId);
-          String entry = entrybuff.toString();
-          if (!webServiceTypesList_.contains(entry))
-          {
-            webServiceTypesList_.add(entry);
-          }
-        }
-        if (tds != null)
-        {
-          StringBuffer entrybuff = new StringBuffer();
-          entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
-          entrybuff.append("/");
-          entrybuff.append(implId);
-          String entry = entrybuff.toString();
-          if (!webServiceTypesList_.contains(entry))
-          {
-            webServiceTypesList_.add(entry);
-          }
-        }
-      }
-    }
-  }
-  
-  private void updateWebServiceClientTypeList(WebServiceRuntimeInfo wsrtInfo)
-  {
-    ClientType[] cts = wsrtInfo.getClientTypes();
-    if (cts != null)
-    {
-      for (int j = 0; j < cts.length; j++)
-      {
-        String implId = cts[j].getWebServiceClientImpl().getId();
-        String[] mods = cts[j].getModuleTypesInclude();
-        if (mods != null)
-        {
-          StringBuffer entrybuff = new StringBuffer();
-          entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
-          entrybuff.append("/");
-          entrybuff.append(implId);
-          String entry = entrybuff.toString();
-          if (!webServiceClientTypesList_.contains(entry))
-          {
-            webServiceClientTypesList_.add(entry);
-          }
-        }
-      }
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
deleted file mode 100644
index c0a22a6ea..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
+++ /dev/null
@@ -1,957 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionUtils
-{
-  private static WebServiceRuntimeExtensionRegistry registry = WebServiceRuntimeExtensionRegistry.getInstance();
-  private static SelectionListChoices serverToRuntimeToJ2EE_;
-  private static Hashtable serverFactoryIdByLabel_;
-  private static Hashtable runtimeIdByLabel_;
-  
-  public static IWebServiceRuntime getWebServiceRuntime( String runtimeId )
-  {
-	WebServiceRuntimeInfo wsrtInfo       		= getWebServiceRuntimeById(runtimeId);
-	IWebServiceRuntime    webserviceRuntime     = null;
-	if (wsrtInfo != null)
-	{
-		webserviceRuntime = wsrtInfo.getWebServiceRuntime();
-	}
-	
-	return webserviceRuntime;
-  }  
-  
-  public static WebServiceImpl getWebServiceImplById(String id)
-  {
-    Object result = registry.webServiceImpls_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceImpl)result;
-    }
-    return null;    
-  }
-  
-  public static int getScenarioFromTypeId(String typeId)
-  {
-    return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
-  }
-  
-  public static String getImplIdFromTypeId(String typeId)
-  {
-    return typeId.substring(typeId.indexOf("/")+1);
-  }
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */  
-  public static ServiceType getServiceType(String runtimeId, String typeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt!=null)
-    {
-      int scenario = getScenarioFromTypeId(typeId);
-      String implId = getImplIdFromTypeId(typeId);
-      //Return the first service type that supports the impl and scenario
-      ServiceType[] sts = wsrt.getServiceTypes();
-      if (sts != null)
-      {
-        for (int i = 0; i < sts.length; i++)
-        {
-          String thisImplId = sts[i].getWebServiceImpl().getId();
-          if (implId.equals(thisImplId))
-          {
-            // Check if scenario is supported
-            if (sts[i].supportsScenario(scenario))
-            {
-              return sts[i];
-            }
-          }
-        }
-      }
-    }
-    
-    return null;
-  }
-  
-  public static WebServiceRuntimeInfo getWebServiceRuntimeById(String id)
-  {
-    Object result = registry.webServiceRuntimes_.get(id);
-    if (result!=null)
-    {
-      return (WebServiceRuntimeInfo)result;
-    }
-    return null;
-  }  
-  
-  public static WebServiceRuntimeInfo getWebServiceRuntimeByLabel(String label)
-  {
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      if (wsr!=null) {
-        if (label.equals(wsr.getLabel()))
-          return wsr;
-      }
-    }
-    return null;      
-  }  
-
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static String[] getRuntimesByType(String typeId) 
-  {
-    int scenario = getScenarioFromTypeId(typeId);
-    String implId = getImplIdFromTypeId(typeId);    
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ServiceType[] sts = wsr.getServiceTypes();
-      if (sts != null)
-      {
-        for (int i = 0; i < sts.length; i++)
-        {
-          String thisImplId = sts[i].getWebServiceImpl().getId();
-          if (implId.equals(thisImplId))
-          {
-            // Check if scenario is supported
-            if (sts[i].supportsScenario(scenario))
-            {
-              ids.add(wsr.getId());
-              break;
-            }
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */  
-  public static boolean isRuntimeSupportedForType(String typeId, String runtimeId)
-  {
-    String[] runtimeIds = getRuntimesByType(typeId);
-    if (runtimeIds!=null)
-    {
-      for (int i=0; i < runtimeIds.length; i++)
-      {
-        if (runtimeIds[i].equals(runtimeId))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;
-  }
-  
-  public static String[] getServerFactoryIdsByType(String typeId) 
-  {
-    String[] wsrts = getRuntimesByType(typeId);
-    if (wsrts == null )
-    {
-      return null;
-    }
-      
-    ArrayList ids = new ArrayList();
-    for (int i=0; i<wsrts.length ;i++)
-    {
-      String[] fIds = getWebServiceRuntimeById(wsrts[i]).getServerFactoryIds();
-      if (fIds != null)
-      {
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (!ids.contains(fIds[j]))
-          {
-            ids.add(fIds[j]);
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;    
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static boolean isServerSupportedForChosenType(String typeId, String serverFactoryId)
-  {
-    String[] fIds = getServerFactoryIdsByType(typeId);
-    if (fIds == null)
-    {
-      return false;
-    }
-
-    for (int i=0;i<fIds.length;i++)
-    {
-      if (serverFactoryId.equals(fIds[i]))
-      {
-        return true;
-      }      
-    }
-    
-    return false;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */    
-  public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)  
-  {
-    String[] rIds = getRuntimesByType(typeId);
-    if (rIds == null)
-    {
-      return false;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
-        if (fIds != null)
-        {
-          for (int j = 0; j < fIds.length; j++)
-          {
-            if (serverFactoryId.equals(fIds[j]))
-            {
-              // Found it!
-              return true;
-            }
-          }
-        }
-      }
-    }  
-    
-    return false;
-  }
-  
-  public static boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt==null)
-      return false;
-    
-    String[] j2eeVersions = wsrt.getJ2eeLevels();
-    if (j2eeVersions==null || j2eeVersions.length==0) 
-      return true;
-    
-    for(int i=0; i<j2eeVersions.length; i++)
-    {
-      if (j2eeVersions[i].equals(j2eeVersionId))
-      {
-        return true;
-      }
-    }
-    return false;        
-  }
-  
-  public static boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt==null)
-      return false;
-    
-    String[] fIds = wsrt.getServerFactoryIds();
-    for(int i=0;i<fIds.length;i++)
-    {
-      IServerType serverType = ServerCore.findServerType(fIds[i]);
-      if (serverType == null)
-        continue;
-      
-      String thisServerTargetId = serverType.getRuntimeType().getId(); 
-      if (thisServerTargetId.equals(serverTargetId))
-        return true;
-    }
-    
-    return false;
-  }
-
-  /**
-   * Returns a list of valid projects for the Web service type with an id of typeId.
-   * In the case where the Web service type extension does not specify which project
-   * natures are included, a array of all Web and EJB projects in the workspace will
-   * be returned.
-   * @param typeId
-   * @return IProject[] an array of valid projects
-   */
-  public static IProject[] getAllProjects()
-  {
-    IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-    ArrayList validProjects = new ArrayList();
-    for (int i = 0; i < projects.length; i++)
-    {
-      if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
-      {
-        validProjects.add(projects[i]);
-      }
-    }
-    
-    return (IProject[])validProjects.toArray(new IProject[0]); 
-    // rsktodo
-    /*
-    IWebServiceType wst = getWebServiceTypeById(typeId);
-    if (wst != null)
-    {
-      IConfigurationElement elem = wst.getConfigurationElement();
-      String includedNatures = elem.getAttribute("includeNatures");
-      String excludedNatures = elem.getAttribute("excludeNatures");
-      if (includedNatures!=null && includedNatures.length()>0)
-      {
-        for (int i = 0; i < projects.length; i++)
-        {
-          if (include(projects[i], includedNatures) && exclude(projects[i], excludedNatures))
-            validProjects.add(projects[i]);
-        }
-        return (IProject[])validProjects.toArray(new IProject[0]);
-      }
-    }
-    
-    //If wst was null or the extension didn't specify which project natures are
-    // to be included, revert to the old behaviour
-    for (int j = 0; j < projects.length; j++)
-    {
-      if (ResourceUtils.isWebProject(projects[j]) || ResourceUtils.isEJBProject(projects[j]))
-        validProjects.add(projects[j]);
-    }    
-    return (IProject[])validProjects.toArray(new IProject[0]);
-    */
-    // rsktodo
-  }
-  
-  public static LabelsAndIds getServiceTypeLabels()
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", registry );
-    
-    LabelsAndIds labelIds = new LabelsAndIds();
-    Iterator     iterator = registry.webServiceTypesList_.iterator();
-    int          size     = registry.webServiceTypesList_.size();
-    String[]     labels   = new String[size];
-    String[]     ids      = new String[size];
-    int          index    = 0;
-    
-    labelIds.setLabels_( labels );
-    labelIds.setIds_( ids );
-    
-    while( iterator.hasNext() ) 
-    {
-      String wst = (String)iterator.next();
-      int scenario = getScenarioFromTypeId(wst);
-      String implId = getImplIdFromTypeId(wst);
-      WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-      String impllabel = wsimpl.getLabel();
-      ids[index]    = wst;
-      String scenLabel = "";
-      switch(scenario)
-      {
-      case WebServiceScenario.BOTTOMUP:
-        scenLabel = msgUtils.getMessage(WebServiceScenario.BOTTOMUP_LABEL);
-        break;
-      case WebServiceScenario.TOPDOWN:
-        scenLabel = msgUtils.getMessage(WebServiceScenario.TOPDOWN_LABEL);
-        break; 
-      default:
-      }
-      labels[index] = msgUtils.getMessage( "COMBINED_TYPE_AND_RUNTIME_LABEL", new String[]{ scenLabel, impllabel } );
-      index++;
-    }    
-    
-    return labelIds;
-  }
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static String getDefaultRuntimeValueFor(String typeId)
-  {
-    String[] rIds = getRuntimesByType(typeId);
-    if (rIds == null)
-    {
-      return null;
-    }
-    
-    return rIds[0];
-  }    
-  
-  
-  public static String getDefaultServerValueFor(String typeId)
-  {
-    String[] fIds = getServerFactoryIdsByType(typeId);
-    if (fIds==null)
-      return null;
-    
-    return fIds[0];
-  }  
-  
-  public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
-  {
-    TypeSelectionFilter tsf = new TypeSelectionFilter();
-    String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
-    return wst == null ? null : wst;
-  }    
-  /**
-   * Returns true if an EJB project is needed to host a Web service
-   * of the type identified by typeId. If multiple natureIds are specified in the 
-   * "includeNatures" attribute, only the first one is checked. If no natureIds are specified, 
-   * false is returned.
-   * 
-   * @deprecated  
-   * 	Should be refactored in future 
-   */
-//  public static boolean requiresEJBProject(String typeId)
-//  {
-//    IWebServiceType wst = getWebServiceTypeById(typeId);
-//    if (wst != null)
-//    {
-//      IConfigurationElement elem = wst.getConfigurationElement();
-//      String includedNatures = elem.getAttribute("includeNatures");
-//      if (includedNatures==null || includedNatures.length()==0)
-//      {
-//        return false;
-//      }
-//      else
-//      {
-//        StringTokenizer st = new StringTokenizer(includedNatures);
-//        if(st.hasMoreTokens())
-//        {
-//          String firstIncludedNature = st.nextToken();
-//          if (firstIncludedNature.equals(IEJBNatureConstants.NATURE_ID))
-//            return true;
-//        }
-//      }
-//    }
-//    return false;
-//  }  
-  
-  /*
-   * @param typeId will be a String of the format "0/implId"
-   * where the digit before the "/" represents the scenario
-   * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
-   * of the WebServiceImpl
-   */
-  public static boolean requiresEJBProject(String runtimeId, String typeId)
-  {
-    ServiceType st = getServiceType(runtimeId, typeId);
-    if (st!=null)
-    {
-      String[] includedNatures = st.getModuleTypesInclude(getScenarioFromTypeId(typeId));
-      if (includedNatures!=null && includedNatures.length>0)
-      {
-        if (includedNatures[0].equals(IModuleConstants.JST_EJB_MODULE))
-        {
-          return true;
-        }
-      }
-    }
-    
-    return false;
-  }  
-  
-  public static boolean requiresEJBModuleFor(String serverFactoryId, String runtimeId, String typeId)
-  {
-	  // rsktodo
-	  return false;
-  }  
-  
-  //Ported from the former WebServiceClientRegistry
-  
-  public static String getRuntimeLabelById(String runtimeId) 
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt == null)
-      return null;
-    
-    return wsrt.getLabel();
-  }  
-  
-  public static String getServerLabelById(String serverFactoryId)
-  {
-    IServerType serverType = ServerCore.findServerType(serverFactoryId);
-    if (serverType == null)
-      return null;
-    
-    String serverLabel = ServerUICore.getLabelProvider().getText(serverType);   
-    return serverLabel;
-  }
-  
-  public static String getServerInstanceLabelFromInstanceId( String instanceId )
-  {
-    IServer server = ServerCore.findServer( instanceId );    
-    return server.getName();
-  }  
-  
-  public static boolean doesRuntimeSupportServer(String runtimeId, String factoryId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    if (wsrt != null)
-    {
-      String[] fids = wsrt.getServerFactoryIds();
-      if (fids!=null)
-      {
-        for (int i=0; i<fids.length; i++)
-        {
-          if (fids[i].equals(factoryId))
-          {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }
-  
-  public static String getFirstSupportedServer(String runtimeId)
-  {
-    WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-    
-    if (wsrt != null)
-    {
-      String[] fids = wsrt.getServerFactoryIds();
-      if (fids!=null && fids.length>0)
-      {
-        return fids[0];
-      }
-    }
-    
-    return null;    
-  }
-
-
-  public static String[] getRuntimesByClientType(String clientImplId) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ClientType[] cts = wsr.getClientTypes();
-      if (cts != null)
-      {
-        for (int i = 0; i < cts.length; i++)
-        {
-          String wsClientImplId = cts[i].getWebServiceClientImpl().getId();
-          if (wsClientImplId.equals(clientImplId))
-          {
-            ids.add(wsr.getId());
-            break;
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;    
-  }
-  
-
-  
-  public static boolean webServiceClientRuntimeTypeExists(String serverFactoryId, String runtimeId, String clientTypeId) 
-  {
-    String[] rIds = getRuntimesByClientType(clientTypeId);
-    if (rIds == null)
-    {
-      return false;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
-        if (fIds != null)
-        {
-          for (int j = 0; j < fIds.length; j++)
-          {
-            if (serverFactoryId.equals(fIds[j]))
-            {
-              // Found it!
-              return true;
-            }
-          }
-        }
-      }
-    }  
-    
-    return false;
-  }
-  
-  public static String[] getAllClientRuntimes() 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      ClientType[] cts = wsr.getClientTypes();
-      if (cts!=null && cts.length>0)
-      {
-        //this runtime supports the client scenario
-        ids.add(wsr.getId());
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;
-  }
-  
-
-  public static String[] getAllClientServerFactoryIds() 
-  {    
-    String[] rIds = getAllClientRuntimes();
-    if (rIds==null)
-      return null;
-    
-    ArrayList ids = new ArrayList();
-    for (int i=0; i<rIds.length ;i++)
-    {
-      String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
-      if (fIds != null)
-      {
-        for (int j=0; j<fIds.length; j++)
-        {
-          if (!ids.contains(fIds[j]))
-          {
-            ids.add(fIds[j]);
-          }
-        }
-      }
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;
-  }
-  
-
-  
-  public static String[] getClientProjectTypes(String clientImplId, String runtimeId)
-  {
-    String[] rIds = getRuntimesByClientType(clientImplId);
-    if (rIds == null)
-    {
-      return null;
-    }
-    
-    for (int i = 0; i < rIds.length; i++)
-    {
-      if (runtimeId.equals(rIds[i]))
-      {
-        ClientType[] cts = getWebServiceRuntimeById(rIds[i]).getClientTypes();
-        if (cts != null)
-        {
-          for (int j = 0; j < cts.length; j++)
-          {
-            String thisClientImplId = cts[j].getWebServiceClientImpl().getId();
-            if (clientImplId.equals(thisClientImplId))
-            {
-              // Found the one!
-              String[] projectTypes = cts[j].getModuleTypesInclude();
-              return projectTypes;
-            }
-          }
-        }
-      }
-    }  
-    
-    return null;    
-  }
-  
-  public static boolean doesRuntimeSupportComponentType(String clientImplId, String runtimeId, String componentTypeId)
-  {
-    String[] compTypeIds = getClientProjectTypes(clientImplId, runtimeId);
-    if (compTypeIds!=null)
-    {
-      for (int i=0; i<compTypeIds.length; i++)
-      {
-       if (compTypeIds[i].equals(componentTypeId))
-       {
-         return true;
-       }
-      }
-    }
-    
-    return false;
-  }
-  
-  public static LabelsAndIds getClientTypeLabels()
-  {
-    
-    LabelsAndIds labelIds = new LabelsAndIds();
-    String[] idsArray = new String[0];
-    String[] labelsArray = new String[0];
-    labelIds.setIds_(idsArray);
-    labelIds.setLabels_(labelsArray);
-  
-    String[] rIds = getAllClientRuntimes();
-    if (rIds == null)
-    {
-      return labelIds;
-    }
-  
-    ArrayList ids = new ArrayList();
-    ArrayList labels = new ArrayList();
-  
-    for (int i=0; i < rIds.length; i++)
-    {
-      WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(rIds[i]);
-      ClientType[] cts = wsrt.getClientTypes();
-      if (cts != null)
-      {
-        for (int j = 0; j < cts.length; j++)
-        {
-          ClientType ct = cts[j];
-          // String id = ct.getWebServiceClientTypeId();
-          String id = ct.getWebServiceClientImpl().getId();
-          if (!ids.contains(id))
-          {
-            ids.add(id);
-            labels.add(ct.getWebServiceClientImpl().getLabel());
-          }
-        }
-      }
-
-    }
-
-    if (ids.size() > 0)
-    {
-      idsArray = (String[]) ids.toArray(new String[0]);
-      labelsArray = (String[]) labels.toArray(new String[0]);
-      labelIds.setIds_(idsArray);
-      labelIds.setLabels_(labelsArray);
-    }
-
-    return labelIds;
-
-  }  
-  
-  //Utilities used by the ServerRuntimePreferencePage
-  
-  public static SelectionListChoices getServerToRuntimeToJ2EE()
-  {
-    if (serverToRuntimeToJ2EE_!=null)
-    {
-      return serverToRuntimeToJ2EE_;
-    }
-    
-    //String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
-    String[] servers = getAllServerFactoryIds();
-    SelectionList serversList = new SelectionList(servers, 0);
-    Vector choices = new Vector();
-    for (int i=0; i<servers.length; i++)
-    {
-      choices.add(getRuntimeChoices(servers[i]));
-    }
-    serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
-    return serverToRuntimeToJ2EE_;
-    
-  }
-
-  private static SelectionListChoices getRuntimeChoices(String serverFactoryId)
-  {
-    
-    String[] runtimes = getRuntimeIDsByServerFactoryID(serverFactoryId);
-    SelectionList runtimesList = new SelectionList(runtimes, 0);
-    Vector choices = new Vector();
-    for (int i=0; i<runtimes.length; i++)
-    {
-      choices.add(getJ2EEChoices(runtimes[i]));
-    }
-    return new SelectionListChoices(runtimesList, choices);    
-  }  
-  
-  private static SelectionListChoices getJ2EEChoices(String runtimeId)
-  {
-    //String[] serviceJ2EEVersions = getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
-    //String[] clientJ2EEVersions = WebServiceClientTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
-    //String[] j2eeVersions = getStringArrayIntersection(serviceJ2EEVersions, clientJ2EEVersions);
-    WebServiceRuntimeInfo wsr = getWebServiceRuntimeById(runtimeId);
-    if (wsr==null)
-    {
-      return null;
-    }
-    
-    String[] j2eeVersions = wsr.getJ2eeLevels();
-    SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
-    return new SelectionListChoices(j2eeVersionsList, null);
-  }  
-  
-  private static String[] getAllServerFactoryIds()
-  {
-    ArrayList ids = new ArrayList();
-    if (serverFactoryIdByLabel_ == null)
-    {
-      serverFactoryIdByLabel_ = new Hashtable();
-      Iterator iter = registry.webServiceRuntimes_.values().iterator();
-      while (iter.hasNext())
-      {
-        WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo) iter.next();
-        String[] sfids = wsr.getServerFactoryIds();
-        for (int i = 0; i < sfids.length; i++)
-        {
-          if (!ids.contains(sfids[i]))
-          {
-            String label = getServerLabelById(sfids[i]);
-            if (label != null)
-            {
-              ids.add(sfids[i]);
-              serverFactoryIdByLabel_.put(label, sfids[i]);
-            }
-          }
-        }
-      }
-    }
-    else
-    {
-      Iterator fids =  serverFactoryIdByLabel_.values().iterator();
-      while (fids.hasNext())
-      {
-        String fid = (String)fids.next();
-        ids.add(fid);
-      }           
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
-      return serverFactoryIds;
-    }
-    
-    return null;
-  }  
-  
-  private static String[] getRuntimeIDsByServerFactoryID(String serverFactoryID) 
-  {
-    ArrayList ids = new ArrayList();
-    Iterator iter = registry.webServiceRuntimes_.values().iterator();
-    while (iter.hasNext())
-    {
-      WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-      if (doesRuntimeSupportServer(wsr.getId(), serverFactoryID))
-      {
-        ids.add(wsr.getId());
-      }
-      
-    }
-    
-    if (ids.size() > 0)
-    {
-      String[] runtimeIds = (String[])ids.toArray(new String[0]);
-      return runtimeIds;
-    }
-    
-    return null;    
-    
-    
-  }
-  
-  public static String getServerFactoryId(String label)
-  {
-    if (label==null || label.length()==0)
-      return null;
-    
-    if (serverFactoryIdByLabel_ == null)
-    {
-      getAllServerFactoryIds();
-    }
-    
-    if (serverFactoryIdByLabel_.containsKey(label))
-    {
-      return (String)serverFactoryIdByLabel_.get(label);  
-    }
-    else
-    {
-      return null;
-    }       
-  }  
-  
-  public static String getRuntimeId(String label)
-  {
-    
-    if (label==null || label.length()==0)
-      return null;
-    
-    if (runtimeIdByLabel_ == null)
-    {
-      runtimeIdByLabel_ = new Hashtable();
-      Iterator iter = registry.webServiceRuntimes_.values().iterator();
-      while (iter.hasNext())
-      {
-        WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
-        runtimeIdByLabel_.put(wsr.getLabel(), wsr.getId());        
-      }      
-    }
-    
-    return (String)runtimeIdByLabel_.get(label);    
-  }    
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
deleted file mode 100644
index 0c880bc98..000000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,209 +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.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-
-
-public class WebServiceRuntimeInfo {
-
-  private IConfigurationElement elem_;
-  private Hashtable allServiceTypes_;
-  private Hashtable allClientTypes_;
-  
-  private String id;
-  private String label;
-	private ServiceType[] serviceTypes;
-	private ClientType[] clientTypes;
-	private java.lang.String[] servletLevels;
-	private java.lang.String[] j2eeLevels;
-	private java.lang.String[] runtimeIds;
-	private java.lang.String[] serverFactoryIds;
-	private String className;
-	private IWebServiceRuntime webServiceRuntime_;
-  
-  public WebServiceRuntimeInfo(IConfigurationElement elem_, Hashtable allServiceTypes_, Hashtable allClientTypes_)
-  {
-    super();
-    this.elem_ = elem_;
-    this.allServiceTypes_ = allServiceTypes_;
-    this.allClientTypes_ = allClientTypes_;
-  }
-
-  public String getClassName()
-  {
-    if (className==null)
-    {
-      className=elem_.getAttribute("class");
-    }
-    return className;
-  }
-  
-
-  public ClientType[] getClientTypes()
-  {
-    if (clientTypes==null)
-    {
-      String attr = elem_.getAttribute("clientTypes");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        clientTypes = new ClientType[size];
-        for (int i = 0; i < clientTypes.length; i++)
-        {
-          String ctid = st.nextToken();          
-          clientTypes[i] = (ClientType)allClientTypes_.get(ctid);
-        }
-      }
-    }
-    return clientTypes;
-  }
-  
-
-  public String getId()
-  {
-    if (id==null)
-    {
-      id = elem_.getAttribute("id");
-    }
-    return id;
-  }
-  
-
-  public String getLabel()
-  {
-    if (label==null)
-    {
-      label = elem_.getAttribute("label");
-    }
-    return label;
-  }   
-
-  
-  public java.lang.String[] getJ2eeLevels()
-  {
-    if (j2eeLevels == null)
-    {
-      String attr = elem_.getAttribute("j2eeLevels");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        j2eeLevels = new String[size];
-        for (int i = 0; i < j2eeLevels.length; i++)
-          j2eeLevels[i] = st.nextToken();
-      }
-    }      
-    
-    return j2eeLevels;
-  }
-  
-
-  public java.lang.String[] getRuntimeIds()
-  {
-    if (runtimeIds == null)
-    {
-      String attr = elem_.getAttribute("runtimes");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        runtimeIds = new String[size];
-        for (int i = 0; i < runtimeIds.length; i++)
-          runtimeIds[i] = st.nextToken();
-      }
-    }      
-    
-    return runtimeIds;
-  }
-  
-
-  public java.lang.String[] getServerFactoryIds()
-  {
-    if (serverFactoryIds == null)
-    {
-      String attr = elem_.getAttribute("servers");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        serverFactoryIds = new String[size];
-        for (int i = 0; i < serverFactoryIds.length; i++)
-          serverFactoryIds[i] = st.nextToken();
-      }      
-    }
-    return serverFactoryIds;
-  }
-  
-
-  public ServiceType[] getServiceTypes()
-  {
-    if (serviceTypes==null)
-    {
-      String attr = elem_.getAttribute("serviceTypes");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        serviceTypes = new ServiceType[size];
-        for (int i = 0; i < serviceTypes.length; i++)
-        {
-          String ctid = st.nextToken();          
-          serviceTypes[i] = (ServiceType)allServiceTypes_.get(ctid);
-        }
-      }
-    }
-    return serviceTypes;
-  }
-  
-
-  public java.lang.String[] getServletLevels()
-  {
-    if (servletLevels==null)
-    {
-      String attr = elem_.getAttribute("servletLevels");
-      if (attr != null && attr.length()>0)
-      {
-        StringTokenizer st = new StringTokenizer(attr, " ");
-        int size = st.countTokens();
-        servletLevels = new String[size];
-        for (int i = 0; i < servletLevels.length; i++)
-          servletLevels[i] = st.nextToken();
-      }      
-    }
-    return servletLevels;
-  }
-  
-  public IWebServiceRuntime getWebServiceRuntime()
-  {
-	if (webServiceRuntime_ == null)
-	{
-		try
-		{
-			webServiceRuntime_ = (IWebServiceRuntime)elem_.createExecutableExtension("class");
-		}
-		catch(CoreException ce)
-		{
-			ce.printStackTrace();
-		}
-	}
-	
-	return webServiceRuntime_;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/.classpath b/bundles/org.eclipse.jst.ws.consumption/.classpath
deleted file mode 100644
index 7c69b4f1a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="webserviceutils"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.cvsignore b/bundles/org.eclipse.jst.ws.consumption/.cvsignore
deleted file mode 100644
index 0a24de61b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 2a89cfa56..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.consumption</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.wst.wsdl</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.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
deleted file mode 100644
index 2c6ad348f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,59 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc.jar,
- webserviceutils.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.internal.consumption.codegen,
- org.eclipse.jst.ws.internal.consumption.codegen.bean,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors,
- org.eclipse.jst.ws.internal.consumption.command.common,
- org.eclipse.jst.ws.internal.consumption.common,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel,
- org.eclipse.jst.ws.internal.consumption.fragments,
- org.eclipse.jst.ws.internal.consumption.plugin,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common,
- org.eclipse.jst.ws.internal.consumption.wsfinder,
- org.eclipse.jst.ws.util
-Require-Bundle: org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.xsd,
- org.eclipse.debug.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.launching,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.jem.workbench,
- org.eclipse.jface,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.wsdl4j,
- org.eclipse.jem.util,
- org.eclipse.ui,
- org.eclipse.wst.common.uriresolver,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption/about.html b/bundles/org.eclipse.jst.ws.consumption/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
deleted file mode 100644
index c47ab5729..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.wsc.jar = src/
-source.webserviceutils.jar = webserviceutils/
-jars.compile.order = wsc.jar,\
-                     webserviceutils.jar
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               wsc.jar,\
-               webserviceutils.jar,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
deleted file mode 100644
index f484e2606..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption
-PLUGIN_PROVIDER=Eclipse.org
-XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
-XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
-XP_SERVER_DEFAULTER=Server Defaulter
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.xml b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
deleted file mode 100644
index e3da89c64..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension-point
-      id="wsfinder"
-      name="%XP_WSFINDER"/>
-
-   <!-- The following extension point will be removed. -->
-   <extension-point
-      id="webServiceStartServerType"
-      name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
-   <extension-point
-      id="serverDefaulter"
-      name="%XP_SERVER_DEFAULTER"/>
-
-   
-   <extension
-         point="org.eclipse.jst.ws.consumption.webServiceStartServerType">
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.32"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT32_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.40"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT40_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.41"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT41_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.tomcat.50"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_TOMCAT50_LOCAL">
-      </webServiceStartServerType>
-      <webServiceStartServerType
-            factoryId="org.eclipse.jst.server.geronimo.10"
-            class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
-            id="SERVER_ID_GERONIMO10_LOCAL">
-       </webServiceStartServerType> 
-   </extension>
-   
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
deleted file mode 100644
index 19576895d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
+++ /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
-###############################################################################
-
-#
-# Sample messages
-#
-MSG_ERROR_JTS_PROXY_HAS_NO_METHODS=IWAB0179E Unable to create a sample to the proxy because the proxy does not contain methods.
-MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT=IWAB0180E Unable to create a sample to the proxy because the proxy is not a bean (i.e.. the sample does not have public default constructor).
-MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED=IWAB0181E Unable to create a sample to the proxy because none of the methods in the proxy were processed.
-MSG_WARN_JTS_UNSUPPORTED_TYPE=IWAB0182W The Sample JSP client does not support the following type:
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties.
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays:
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans:
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans.
-MSG_WARN_JTS_PROXY_METHODS_OMITTED=IWAB0189W The Sample JSP client omitted some methods because they contained unsupported types.
-MSG_ERROR_SAMPLE_CREATION_CANCELED=IWAB0021E Sample creation was canceled
-MSG_WARN_UNABLE_TO_FIND_PROXY=IWAB0022W The Proxy Resource cound not not be found.
-
-MSG_ERROR_CANNOT_CREATE_COMPONENT=The Web service wizard cannot automatically create component "{0}". Cancel the wizard and create the component manually.
-
-#
-# Filters
-#
-FILTER_MSG_ERROR_NULL_OBJECT=IWAB0097E No object has been provided.
-FILTER_MSG_ERROR_NOT_FILE=IWAB0098E The object "{0}" is not a file.
-FILTER_MSG_ERROR_NOT_FOLDER=IWAB0137E The object "{0}" is not a folder.
-
-JAVA_FILTER_NAME=Java files
-JAVA_FILTER_DESC=Files with names ending in ".java" or ".class".
-JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0102E The file "{0}" does not end in ".java" or ".class".
-
-WSDL_FILTER_NAME=WSDL files
-WSDL_FILTER_DESC=Files with names ending in ".wsdl".
-WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0103E The file "{0}" does not end in ".wsdl".
-
-ISD_FILTER_NAME=ISD files
-ISD_FILTER_DESC=Files with names ending in ".isd".
-ISD_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0095E The file "{0}" does not end in ".isd".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-
-#
-# Common messages
-#
-
-
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0069E Web project was not found.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0070E Server was not found.
-
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0072I Publishing Web project.
-
-#
-# Deployment status
-#
-PROGRESS_INFO_COPY_WEBSERVICE_UTILS=IWAB0023I Copying the webservice utilities.
-PROGRESS_INFO_COPYING_FILE=IWAB0197I Copying SOAP run-time file.
-PROGRESS_INFO_START_WEB_PROJECT=IWAB0198I Starting Web project.
-PROGRESS_INFO_PUBLISHING_SERVER=IWAB0199I Publishing server.
-PROGRESS_INFO_STARTING_SERVER=IWAB0200I Starting server.
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0205I Publishing Web project.
-
-
-#
-# Deployment messages
-#
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0207E Web project was not found.
-MSG_ERROR_FILECOPY_WEBSERVICE_UTILS=IWAB0024E Error in copying Webservice Utility file.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0212E Server was not found.
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-MSG_ERROR_PUBLISH=IWAB0217E Error in publishing Web project.
-MSG_ERROR_ADD_MODULE=Error occured when adding the module, {0}, to the server
-
-MSG_WARN_NO_DB_DRIVER=IWAB0221W Unable to locate db2java.zip, please ensure db2java.zip is added to the server class path.
-
-MSG_ERROR_BAD_SERVER_CONFIG=IWAB0534E Unable to add EAR project to Server Configuration.
-MSG_ERROR_CREATE_SERVER=IWAB0025E Unable to create server.
-MSG_ERROR_STUB_ONLY=Unable to create server because only stub runtimes are available for the {0} server type. Go to Window > Preferences. Select Server > Installed Runtimes to install a non-stub runtime.
-
-
-
-#
-# EJB messages
-#
-TASK_LABEL_CREATE_EJB_PROJECT=CreateEJBProjectTask
-TASK_DESC_CREATE_EJB_PROJECT=Create an EJB Project.
-MSG_ERROR_CANNOT_CREATE_EJB_PROJECT=IWAB0432E Unable to create EJB project.
-MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT=IWAB0026E Unable to create application client project {0}.
-MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT=IWAB0027E Unable to create Java project {0}.
-MSG_ERROR_CANNOT_CREATE_EAR_PROJECT=IWAB0062E Unable to create EAR project {0}.
-
-#
-# WebServiceMappingPage Messages
-#
-
-#
-# Validator task descriptions
-#
-TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION=Disable validators.
-TASK_DESC_WEBSERVICE_DISABLE_VALIDATION=Temporarily disabling validators.
-TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION=Restore validators.
-TASK_DESC_WEBSERVICE_RESTORE_VALIDATION=Restoring states of validators.
-TASK_LABEL_WEBSERVICE_DISABLE_BUILD=Disable auto build.
-TASK_DESC_WEBSERVICE_DISABLE_BUILD=Temporarily disabling auto build.
-TASK_LABEL_WEBSERVICE_RESTORE_BUILD=Restore auto build.
-TASK_DESC_WEBSERVICE_RESTORE_BUILD=Restoring state of auto build.
-TASK_LABEL_WEBSERVICE_BUILD_PROJECT=Build project.
-TASK_DESC_WEBSERVICE_BUILD_PROJECT=Building project.
-
-#
-# MISC
-#
-TASK_DESC_CREATE_WEB_PROJECT=Create Web Project
-TASK_LABEL_CREATE_WEB_PROJECT=Create Web Project
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}.  Close it and restart the wizard.
-
-#
-# Default Proxy project messages
-#
-
-
-#
-#	DetectNonJavaCharsCommand
-#
-MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE=IWAB0129W Java method {0} in class {1} starts with an upper case letter. Method names should begin with lower case letters.
-MSG_WARN_METHOD_NAME_INVALID=IWAB0131W Java method {0} name contains underscore or numeric digits followed by a lower case letter.\
-Method names should not contain lower case letters after a numeric or underscore.
-MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS=IWAB0132W Boolean property accessor {0} in bean {1} begins with "get". Boolean getter methods should begin wth "is".
-MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE=IWAB0133W The package name {0} of class {1} includes upper case letters. Package names should consist of lower case letters only.
-
-#
-# JavaToModelCommand
-#
-LABEL_OK=OK
-DESCRIPTION_OK=Select OK to continue
-
-LABEL_CANCEL=Cancel
-DESCRIPTION_CANCEL=Select Cancel to cancel
-
-#
-# CreateMonitorCommand
-#
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-MSG_INFO_MONITORING_NOT_SUPPORTED=IWAB0002I {0} does not support port monitoring.
-
-#
-# CopyWSDLCommand
-#
-COMMAND_LABEL_COPY_WSDL=Copying WSDL
-COMMAND_DESC_COPY_WSDL=Copying WSDL into the workspace for Web service deployment
-MSG_ERROR_COPY_WSDL=IWAB0028E Failed to copy WSDL {0} to {1}
-
-#
-# AssociateModuleWithEARCommand
-#
-MSG_ERROR_UNABLE_TO_ASSOCIATE=Unable to associate component {0} to ear component {1}.
-
-#
-# CreateModuleCommand
-#
-MSG_ERROR_CREATE_FLEX_PROJET=An error occured during creation of flexible project {0}.
-MSG_ERROR_CREATE_WEB_COMPONENT=An error occured during creation of Web component {0}.
-MSG_ERROR_CREATE_EJB_COMPONENT=An error occured during creation of EJB component {0}.
-MSG_ERROR_CREATE_APPCLIENT_COMPONENT=An error occured during creation of Application Client component {0}.
-MSG_ERROR_CREATE_EAR_COMPONENT=An error occured during creation of EAR component {0}. 
-MSG_ERROR_COMPONENT_CREATION=Unable to create project {0} and/or component {1}.
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
deleted file mode 100644
index a260ac085..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,235 +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.consumption.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-
-
-/**
-* Objects of this class represent a generator.
-* */
-public class Generator implements VisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /**
-  * The StringBuffer that holds the codegen 
-  * */
-  protected StringBuffer fbuffer; 
-
-  /**
-  * The Visitor that calls the visit method 
-  * */
-  protected Visitor fVisitor; 
-
-  /**
-  * Vector that holds state data for this  generator 
-  * */
-  protected Vector fResidentVector;
- 
-  /*
-  * This int holds the current number 
-  */
-  protected int fUniqueNumber =0;
- 
-
-  protected String fClientFolderPath;
-
-  public static final String FACTORY = "Factory"; 
-
-  public static final String TAB = "    ";
-  public static final String DOUBLE_TAB = "        ";
-  public static final String SPACE = " ";
-  
-  /**
-  * Constructor.
-  * 
-  */
-  public Generator ()
-  {
-      fbuffer = new StringBuffer();
-      fResidentVector = new Vector(); 
-    
-  }
-
-  /**
-  * Constructor.
-  * @param StringBuffer Takes the buffer it will write code to
-  */
-  public Generator (StringBuffer buffer)
-  {
-      fbuffer = buffer;
-      fResidentVector = new Vector(); 
-  }
-  
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-  
-  public String getClientFolderPath()
-  {
-    return fClientFolderPath;
-  }
-
-  public void setClientFolderPath(String fClientFolderPath_)
-  {
-    fClientFolderPath = fClientFolderPath_;
-  }
-
-  protected String serviceName = "";
-  protected String portName = "";
-  protected String packageName = "";
-  protected String proxyBaseName = "";
-
-  public void setInfo(String service, String port, String packageName, String proxyBase)
-  {
-    serviceName = service;
-    portName = port;
-    this.packageName = packageName; 
-    proxyBaseName = proxyBase;  
-  }
-
-  private static final char[] BAD_SYMBOLS = {'-', ' '}; // symbols that can appear in the folder name but it is not allowed in a java bean name
-  private static final char UNDERSCORE = '_';	// replace the above ones by underscore
-  public String getSessionBeanId()
-  {
-    String name = getClientFolderPath();
-    int index = name.lastIndexOf("/");
-    index++;
-    String newName = name.substring(index);
-    for ( int i = 0; i < BAD_SYMBOLS.length; i++ ) {
-    	newName = newName.replace ( BAD_SYMBOLS[i], UNDERSCORE );
-    }
-    return newName+ "id";
-  }
-
-  /*
-  * The Number Factory is here for naming purposes. In 
-  * this way we insure no names we create in a piece of
-  * code gen are the same. We keep track of the numbers
-  * used and we hand back the next one. Like take a number 
-  * buddy
-  * @param int number we are at as the state data has to be settable
-  */
-  public void setNumberFactory(int number)
-  {
-     fUniqueNumber = number;
-  }
-
-
-  /*
-  * This is a unique number for state purposes
-  * @return int 
-  */
-  public int getNumberFactory()
-  {
-     return fUniqueNumber; 
-  }
-  /*
-  * This is a unique number for naming purposes
-  * @return int 
-  */
-  public int getUniqueNumber()
-  {
-     return fUniqueNumber++;
-  }
-
-
-  /**
-  * returns the current StringBuffer
-  * @return StringBuffer Takes the buffer it will write code too
-  */
-  public StringBuffer getStringBuffer ()
-  {
-      return fbuffer;
-  }
-
-  
-  /**
-  * returns the Visitor that called this generator
-  * @return Visitor 
-  */
-  public Visitor getVisitor ()
-  {
-      return fVisitor;
-  }
-  
-
-
-
-  /**
-  * vector used to hold state data 
-  * @parameter Visitor 
-  */
-  public void putResidentVector (Object object)
-  {
-      fResidentVector.addElement(object);
-  }
-  
-
-  /**
-  * vector used to hold state data 
-  * @parameter Visitor 
-  */
-  public void setResidentVector (Vector vector)
-  {
-      fResidentVector = vector;
-  }
-  
-
-  /**
-  * returns the resident vector
-  * @return Visitor 
-  */
-  public Vector getResidentVector ()
-  {
-      return fResidentVector;
-  }
-  
-
-  /**
-  * This function is used to initialize any state a generator may have
-  *
-  **/
-
-  public void initialize()
-  {
-     //to be implemented in sublasses
-  }
-
-
-   /**
-  * sets the visitor that calls the visit
-  * @parameter Visitor 
-  */
-
-  public void setVisitor(Visitor visitor)
-  {
-      fVisitor = visitor;
-  }
-
-
-  public IStatus visit (Object object)
-  {
-   //implemented by subclasses
-  	return Status.OK_STATUS;
-  }
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
deleted file mode 100644
index fac00ac9b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
+++ /dev/null
@@ -1,88 +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.consumption.codegen;
-      
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-
-
-/**
-* Objects of this class represent a visitor.
-* This vistor will visit elements in a model given a 
-* particular rel
-* */
-public class RelVisitor implements Visitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private int fElementCounter;
-  private int fTotalElements;
-  private String frelName;
-
-  /**
-  * Constructor.
-  * 
-  */
-
-  public RelVisitor (String relName)
-  {
-     frelName = relName;
-  }
-  
-  public int getTotalElementsToVisit()
-  {
-     return fTotalElements;
-  }
-
-  public boolean isLastElement()
-  {
-     if(getTotalElementsToVisit() - presentElement() == 0) return true;
-     return false;
-  }
-
-  public int presentElement()
-  {
-     return fElementCounter;
-  }
-  
-  public void initialize(VisitorAction va)
-  {
-    //implemented by subclasses
-  }  
-  public IStatus run (Object sourceElement,VisitorAction vAction)
-  {
-  	    IStatus status = Status.OK_STATUS;
-        initialize(vAction);
-  
-        vAction.setVisitor(this);
-        Rel rel = ((BasicElement)sourceElement).getRel(frelName);
-        //set some state data
-        fTotalElements = rel.getNumberOfTargetElements();
-        fElementCounter = 0;  
-        
-        Enumeration e = rel.getTargetElements();
-        while (e.hasMoreElements()){
-           BasicElement targetElement = (BasicElement)e.nextElement(); 
-           fElementCounter++;
-           initialize(vAction);
-           status = vAction.visit(targetElement);
-        }
-        return status;
-  } 
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
deleted file mode 100644
index c68cdadb0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
+++ /dev/null
@@ -1,30 +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.consumption.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public interface Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public IStatus run (Object object, VisitorAction vAction);
-        
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
deleted file mode 100644
index 9a3d6537f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
+++ /dev/null
@@ -1,31 +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.consumption.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* The visitor walks the model and the VisitorAction 
-* does the action
-* */
-public interface VisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public IStatus visit (Object object);
-  public void setVisitor(Visitor visitor);
-  public void initialize(String residentString);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
deleted file mode 100644
index a01a64112..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
+++ /dev/null
@@ -1,77 +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.consumption.codegen.bean;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class AttributeVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private Vector fResidentVector1;
-  private Vector fResidentVector2;
-
-   /**
-  * Constructor.
-  * 
-  */
-
-  public AttributeVisitor ()
-  {
-    super(TypeElement.REL_ATTRIBUTES);
-  }
-
-  public AttributeVisitor (String rel)
-  {
-    super(rel);
-  }
-  
-  public void setResidentString(String resident)
-  {
-  }
-
-  public void setResidentVector1(Vector resident)
-  {
-    fResidentVector1 = resident;
-  }
-
-  public void setResidentVector2(Vector resident)
-  {
-    fResidentVector2 = resident;
-  }
-
-  
-  public void initialize(VisitorAction vAction)
-  {
-     //hack for 197726
-
-     if(vAction instanceof InputFileAttributeGenerator){
-       if(fResidentVector1 == null) fResidentVector1=new Vector();
-       if(fResidentVector2 == null) fResidentVector2=new Vector();
-       ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
-     }
-  }
- 
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
deleted file mode 100644
index 5a9ad690a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
+++ /dev/null
@@ -1,71 +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.consumption.codegen.bean;
-
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class FieldVisitor extends AttributeVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  private Vector fResidentVector1;
-  private Vector fResidentVector2;
-
-   /**
-  * Constructor.
-  * 
-  */
-
-  public FieldVisitor ()
-  {
-    super(TypeElement.REL_FIELDS);
-  }
-  
-  public void setResidentString(String resident)
-  {
-  }
-
-  public void setResidentVector1(Vector resident)
-  {
-    fResidentVector1 = resident;
-  }
-
-  public void setResidentVector2(Vector resident)
-  {
-    fResidentVector2 = resident;
-  }
-
-  
-  public void initialize(VisitorAction vAction)
-  {
-     //hack for 197726
-
-     if(vAction instanceof InputFileAttributeGenerator){
-       if(fResidentVector1 == null) fResidentVector1=new Vector();
-       if(fResidentVector2 == null) fResidentVector2=new Vector();
-       ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
-     }
-  }
- 
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
deleted file mode 100644
index 34664622f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
+++ /dev/null
@@ -1,40 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class MethodVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public MethodVisitor ()
-  {
-     super(BeanElement.REL_METHODS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
deleted file mode 100644
index 0749312d4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
+++ /dev/null
@@ -1,40 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ParameterVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public ParameterVisitor ()
-  {
-     super(MethodElement.REL_PARAMETERS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
deleted file mode 100644
index 1f6207072..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
+++ /dev/null
@@ -1,40 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ReturnParameterVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public ReturnParameterVisitor ()
-  {
-     super(MethodElement.REL_RETURN_PARAMETERS);
-  }
-  
-   
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
deleted file mode 100644
index d254615d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
+++ /dev/null
@@ -1,38 +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.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class TypeVisitor extends RelVisitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor.
-  * 
-  */
-
-  public TypeVisitor ()
-  {
-    super(TypeElement.REL_TYPE);
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
deleted file mode 100644
index d167c8951..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
+++ /dev/null
@@ -1,89 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsBeanVisitorAction extends VisitorActionImpl
-{
-  private static char UNDERSCORE = '_';
-
-  public DetectNonJavaCharsBeanVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  	}
-
-  /**
-  * The visit will create the bean
-  * Walk the methods
-  * @param JavaClass the class to be used to create the bean model
-  **/
-  public IStatus visit (Object javaclass)
-  {
-    JavaClass javaClass = (JavaClass)javaclass;
-    String packageName = javaClass.getJavaPackage().getPackageName();
-    String beanName = javaClass.getName();
-
-    if (!isBeanVisited(javaClass)) {
-      	addVisitedBean(javaClass);
-		// check the bean name
-		checkBeanName(beanName);
-		checkPackageName(packageName, beanName);
-	  	DetectNonJavaCharsMethodVisitorAction methodVisitorAction = new DetectNonJavaCharsMethodVisitorAction(getMessages(), getBeansVisited());
-      	JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
-    	methodVisitor.run(javaClass,methodVisitorAction);
-     }
-    
-    return Status.OK_STATUS;
-   }
-
-   private void checkBeanName(String beanName)
-   	{
-	 
-	 // check if the bean starts with a lower case
-	 if ( Character.isLowerCase(beanName.charAt(0)))
-    	addMessage("WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE", new String[]{beanName});  
-
-	
-     //check if the name has an underscore, then next letter should be upper case
-     int underScoreIndex = beanName.indexOf(UNDERSCORE);
-	 String tempName = beanName;
-	 while(underScoreIndex !=-1) {
-		tempName = tempName.substring(underScoreIndex+1);
-		if ( Character.isLowerCase(tempName.charAt(0))) {
-      		addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[] { beanName });  
-      		break;
-			}
-		else
-			underScoreIndex = tempName.indexOf(UNDERSCORE);
-		}
-	}
-
-	private void checkPackageName(String packageName, String beanName)
-		{
-			if (!packageName.equals(packageName.toLowerCase()))
-				addMessage("MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE", new String[] { packageName, beanName });
-		}
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
deleted file mode 100644
index 53f249b34..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
+++ /dev/null
@@ -1,115 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsMethodVisitorAction extends VisitorActionImpl 
-{
-  private static char UNDERSCORE = '_';
-  private boolean serviceBean = false;
-
-   public DetectNonJavaCharsMethodVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  		if ( beans.size() == 1)
-  			serviceBean = true;
-  	}
-
-  /**
-  * Create a method element from the method 
-  * @param Method the class to be used to create the method
-  **/
-  public IStatus visit (Object imethod)
-  {
-    
-    Method method = (Method)imethod;
-    String  className = method.getContainingJavaClass().getName();
-    String name = method.getName();
-
-	if ( serviceBean && !method.isConstructor() )
-		checkUpperCase(name, className);
-	
-	// for service bean or any referenced bean property accessors
-	 if ( serviceBean || name.startsWith("get") || name.startsWith("set") || name.startsWith("is")) 
-	 {
-	    checkUnderScore(name, className);
-	    checkNumericDigits(name, className);
-	    checkBooleanProperties(method, className);
-		  	
-	 	DetectNonJavaCharsParameterVisitorAction parameterVisitorAction = new DetectNonJavaCharsParameterVisitorAction(getMessages(), getBeansVisited());
-	 	// rsk Passing in null for the environment. DetectNonJavaCharsParameterVisitorAction always returns an OK status.
-    	JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(null);
-    	parameterVisitor.run(method, parameterVisitorAction);   
-	  }
-	 
-	 return Status.OK_STATUS;
-	}
-
-  private void checkUpperCase(String name, String className)
-  {
-  	 // in a service bean check if any method starts with upper case letter
-	 if ( Character.isUpperCase(name.charAt(0)))
-    		addMessage("MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE", new String[]{name, className});  
-
-  }
-
-  private void checkUnderScore(String name, String className)
-  {
-     //check if the name has an underscore, then next letter should be upper case
-     int underScoreIndex = name.indexOf(UNDERSCORE);
-	 String tempName = name;
-	 while(underScoreIndex !=-1) {
-		tempName = tempName.substring(underScoreIndex+1);
-		if ( Character.isLowerCase(tempName.charAt(0))) {
-    		addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[]{name, className});  
-     		break;
-		}
-		else
-			underScoreIndex = tempName.indexOf(UNDERSCORE);
-	   }
-  }
-
-  private void checkNumericDigits(String name, String className)
-  {
-     //check if the name has a numeric, then next letter should be upper case
-     for ( int i = 0; i < name.length(); i++)
-     	{
-     		if ( Character.isDigit(name.charAt(i)))
-     			{
-     				if (Character.isLowerCase(name.charAt(i+1))) {
-			    		addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[]{name, className});  
-			     		break;
- 					}
-		}
-     }
-  }
-  private void checkBooleanProperties(Method method, String className)
-  	{
-  		if (!serviceBean && method.getName().startsWith("get") && 
-  			(method.getReturnType().getName().equals("boolean") ||
-  			 method.getReturnType().getName().equals("java.lang.Boolean")))
-  			addMessage("MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS", new String[]{method.getName(), className});  
-  	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
deleted file mode 100644
index 680c07964..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
+++ /dev/null
@@ -1,86 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsParameterVisitorAction extends VisitorActionImpl 
-{
-
-  public DetectNonJavaCharsParameterVisitorAction ( Vector messages, Vector beans)
-  	{
-  		super (messages, beans);
-  	}
-
-  /**
-  * Create a method element from the method 
-  * @param Method the class to be used to create the method
-  **/
-  public IStatus visit (Object ijavaParameter)
-  {
-    
-    JavaParameter javaParameter = (JavaParameter) ijavaParameter;
-    JavaClass javaClass = null;
-    if ( javaParameter.getJavaType() instanceof JavaClass) 
-    	{
-    	javaClass = (JavaClass) javaParameter.getJavaType();
-    	if (javaClass.isArray())
-    	  {
-    	    JavaHelpers componentType = ((ArrayType)javaClass).getComponentTypeAsHelper();
-    	    if (componentType instanceof JavaClass)
-    	      {
-    	        javaClass = (JavaClass)componentType;
-    	      }
-    	    else
-    	      {
-    	        javaClass = null; //The array contains primitive types, there is no need for further checking.
-    	      }
-    	  }
-    	}
-   	if (toBeVisited(javaClass))    {
-			DetectNonJavaCharsBeanVisitorAction beanVisitorAction = new DetectNonJavaCharsBeanVisitorAction(getMessages(), getBeansVisited());
-			JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-			beanVisitor.run(javaClass,beanVisitorAction);
-  	  	}
-   	
-   	return Status.OK_STATUS;
-  }
-  
-
-  private boolean toBeVisited (JavaClass javaClass)
-  {
-	//check for recognized types 
-	if( javaClass == null	||
-	   javaClass.isPrimitive() ||
-	   javaClass.getJavaName().startsWith("javax") ||
-       TypeFactory.recognizedBean(javaClass.getJavaName()))
-	    	return false;
-	else
-		  	return true;
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
deleted file mode 100644
index 31a7d05e3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofAttributeVisitorAction extends JavaMofBeanVisitorAction
-{
-	
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-
-  /*
-  *Constructor
-  **/
-  public JavaMofAttributeVisitorAction(Element parentElement, String project, Environment env)
-  {
-    super(parentElement,project, env);
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaParameter the mof element to be used to create the attribute
-  **/
-
-
-  //bean info code
-
-
-  public IStatus visit (Object propertyDecorator)
-  {
-  	IStatus status = Status.OK_STATUS;
-  	  	
-    //PropertyDecorator pd = (PropertyDecorator)propertyDecorator;
-    SamplePropertyDescriptor pd = (SamplePropertyDescriptor)propertyDecorator;  
-    
-    
-    try{
-       //if the type of this attribute is unsupported dont make an Attribute
-      if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)pd.getPropertyType())) 
-      	&& (TypeFactory.isUnSupportedType((JavaHelpers)pd.getPropertyType()))){
-      	  status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName() );
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	      //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName(),null));
-	      return status;
-	  }	
-
-      Method setMethod = pd.getWriteMethod();
-      Method getMethod = pd.getReadMethod();
-      if(setMethod != null){
-      	if(setMethod.isStatic()){
-          setMethod=null; 
-      	}
-      }
-      if(getMethod != null){
-      	if(getMethod.isStatic()){
-          getMethod=null;
-      	}
-      }
-      if(pd.isfStatic()){
-        return status;
-      }
-      
-      AttributeElement attributeElement = (AttributeElement)BeanModelElementsFactory.getBeanModelElement(propertyDecorator,fParentElement);
-
-      if(attributeElement != null){
-        
-        //lets check and see if the getter takes input params
-        //if so throw an error
-        //now the inputs
-        if(getMethod != null){
-	      JavaParameter javaParameter[] = getMethod.listParametersWithoutReturn();
-	        if(javaParameter.length > 0){
-	          if(getReturnParam()) return status;
-	          status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES") + getMethod.getName() );
-	          //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	          //		WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES" ) + getMethod.getName(),null));
-	          return status;
-	        }
-        }
-        if(setMethod != null) attributeElement.setSetterMethod(setMethod.getMethodElementSignature());
-        if(getMethod != null) attributeElement.setGetterMethod(getMethod.getMethodElementSignature());
-
-        JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(attributeElement,clientProject, env_);
-        typeVisitorAction.setStatusMonitor(getStatusMonitor());
-        typeVisitorAction.setBeansCreated(getBeansCreated());
-        typeVisitorAction.setReturnParam(getReturnParam()); 
-        JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
-        typeVisitor.setClientProject(getProject());
-        status = typeVisitor.run(pd,typeVisitorAction);
-       
-      }
-    
-      return status;
-    }catch(Exception e)
-    {
-    	env_.getLog().log(Log.WARNING, 5054, this, "visit", e);
-    	status = StatusUtils.warningStatus(	msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), e);
-    	try {
-			env_.getStatusHandler().report(status);
-		} catch (StatusException e1) {
-			status = StatusUtils.errorStatus(	msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN") );
-		}
-    	return status;
-    }
-    //env.Log.write(this,"visit",Log.OK,e);}
-
-  }
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
deleted file mode 100644
index 7e4960e69..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,436 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.command.NullStatusMonitor;
-import org.eclipse.jst.ws.internal.command.StatusMonitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofAttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofFieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofBeanVisitorAction implements VisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private MessageUtils msgUtils_;
-  protected Environment env_;
- // protected BeanElement fBeanElement;
-
-  protected Visitor fVisitor;
-
-  /*
-  * The project that defines the context
-  **/
-  protected String clientProject;
-
-  /*
-  * The Status monitor
-  **/
-  protected StatusMonitor monitor_;
-
-  /*
-  * The model that will be created
-  **/
-  protected Model fModel;
-
-  /*
-  * This is the parent element used when creating a
-  * new element
-  */
-  protected Element fParentElement;
-
-  /*
-  * Methods processed from proxy
-  */
-  protected Vector fBeansCreated;
-
-  private BooleanSelection[] fMethodsSelected;
-
-  /*
-  * this boolean tells wether the bean is a return parameter or an input parameter
-  * usually this should be set around the parametervisitoraction, and passed on from there
-  */
-  protected boolean fReturnParam=false;
-
-  public JavaMofBeanVisitorAction(String clientProject,BooleanSelection[] methods, Environment env)
-  {
-    this.clientProject = clientProject;
-    fMethodsSelected = methods;
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this); 
-	env_ = env;
-  }
-
-
-
-  /*
-  *Constructor
-  * @param Model model is the Model that this bean will be placed in
-  * @param IProject used in nature
-  **/
-  public JavaMofBeanVisitorAction(Model model, String clientProject, Environment env)
-  {
-    this.clientProject = clientProject;
-    fModel = model;
-    String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	env_ = env;
-  }
-
-  /*
-  *Constructor
-  * @param Element the parent element that this element will be added too
-  * @param IProject used in nature
-  **/
-  public JavaMofBeanVisitorAction(Element parentElement, String clientProject, Environment env )
-  {
-    fParentElement = parentElement;
-    this.clientProject = clientProject;
-    String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	env_ = env;
-  }
-
-  /**
-  * The visit will create the bean
-  * Walk the methods
-  * @param JavaClass the class to be used to create the bean model
-  **/
-  public IStatus visit (Object javaclass)
-  {
-  	Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
-  	IStatus status = Status.OK_STATUS;
-    JavaClass javaClass = (JavaClass)javaclass;
-    
-    
-    BeanElement beanElement = (BeanElement)BeanModelElementsFactory.getBeanModelElement(javaClass,fParentElement,fModel);
-    if(beanElement.isOwnerParameter()) {
-        resetBeansCreated();
-    }
-    fModel = beanElement.getModel();
-
-    //this for the subsequent beans that represent types
-    //first do the attributes
-    //if we are not on the root
-    if (!(beanElement == fModel.getRootElement())){
-       Enumeration e = getBeansCreated().elements();
-       while(e.hasMoreElements()){
-          String name = (String)e.nextElement();
-          if(name.equals(javaClass.getName())){
-          	status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_ERROR_JTS_CYCLIC_BEAN" ) );
-            //getStatusMonitor().reportStatus(new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-            			//WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_CYCLIC_BEAN" ),null));
-            return status;
-          }
-       }
-       
-       JavaMofAttributeVisitorAction attributeVisitorAction = new JavaMofAttributeVisitorAction(beanElement,clientProject, env_);
-       //attributeVisitorAction.setStatusMonitor(getStatusMonitor());
-       Vector childVector = ((Vector)getBeansCreated().clone());
-       childVector.addElement(javaClass.getName());  
-       attributeVisitorAction.setBeansCreated(childVector);
-       attributeVisitorAction.setReturnParam(getReturnParam());
-       JavaMofAttributeVisitor attributeVisitor = new JavaMofAttributeVisitor();
-       attributeVisitor.setReturnParameter(getReturnParam());
-       attributeVisitor.setProject(getProject());
-       attributeVisitor.setEnvironment(env_);
-       status = attributeVisitor.run(javaClass,attributeVisitorAction);
-       //
-       int severity = status.getSeverity(); 
-       if (severity==Status.ERROR)
-       	return status;
-       
-       if (severity==Status.WARNING)
-       {
-         Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-         if (result.getLabel().equals(CancelChoice.getLabel()))
-         {
-         	 //return an error status since the user canceled
-         	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-         }
-         	
-       }
-       //                           
-
-       JavaMofFieldVisitorAction fieldVisitorAction = new JavaMofFieldVisitorAction(beanElement,clientProject, env_);
-       //fieldVisitorAction.setStatusMonitor(getStatusMonitor());
-       Vector childVector2 = ((Vector)getBeansCreated().clone());
-       childVector2.addElement(javaClass.getName());  
-       fieldVisitorAction.setBeansCreated(childVector2);
-       fieldVisitorAction.setReturnParam(getReturnParam());
-       JavaMofFieldVisitor fieldVisitor = new JavaMofFieldVisitor();
-       fieldVisitor.setProject(getProject());
-       status = fieldVisitor.run(javaClass,fieldVisitorAction);
-       //
-       severity = status.getSeverity(); 
-       if (severity==Status.ERROR)
-       	return status;
-       
-       if (severity==Status.WARNING)
-       {
-         Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-         if (result.getLabel().equals(CancelChoice.getLabel()))
-         {
-         	 //return an error status since the user canceled
-         	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-         }
-         	
-       }
-       //       
-       
-   }
-
-    //this is to insure we are on the proxy
-    //now do the methods
-    if (beanElement == fModel.getRootElement()){
-      //first lets make sure the proxy is in good form
-      //-it has a default constructor
-      //-it has at least one method
-      //otherwise return the problem in the form of a status
-
-      if (!proxyCheck(javaClass, status)) return status;
-      JavaMofMethodVisitorAction methodVisitorAction = new JavaMofMethodVisitorAction(beanElement,clientProject, env_);
-      
-      //methodVisitorAction.setStatusMonitor(getStatusMonitor());
-      JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
-      methodVisitor.setMethodSelection(fMethodsSelected);
-      status = methodVisitor.run(javaClass,methodVisitorAction);
-
-      //
-      int severity = status.getSeverity(); 
-      if (severity==Status.ERROR)
-      	return status;
-      
-      if (severity==Status.WARNING)
-      {
-        Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-        if (result.getLabel().equals(CancelChoice.getLabel()))
-        {
-        	 //return an error status since the user canceled
-        	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-        }
-        	
-      }
-      //                      
-      //This is where we check for several things:
-      //-if no methods were processed because of unsupported types then we send back that result
-      //-if there were any methods omitted we should warn them
-
-      //first no methods
-      if (!methodVisitorAction.wereMethodsProcessed()){
-        //this has to be done to insure the dialog is an error
-      	status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED") );
-      	return status;
-        //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-        //		WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED" ),null));
-      }        	
-      //now methods omitted
-      else if(methodVisitorAction.wereMethodsOmitted()){
-        //The dialog is already a warning so we just need to set the overall message
-      	status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_PROXY_METHODS_OMITTED") );
-      	return status;
-        //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-        //		WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_PROXY_METHODS_OMITTED" ),null));
-      }	
-    }
-    return status;
-  }
-
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-
-
-  /*
-  * Return the model that was created
-  * @return Model the bean model that was created
-  */
-  public Model getModel()
-  {
-    return fModel;
-  }
-
-  /*
-  * The proxy check insures there is a default constructor and
-  * at Least one method
-  * @param JavaClass javaClass is used to traverse the methods on the proxy
-  */
-  public boolean proxyCheck(JavaClass javaClass, IStatus status)
-  {
-     // first check for a method
-     Iterator m=javaClass.getPublicMethods().iterator();
-     if (!m.hasNext()){
-     	status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_METHODS") );
-       //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-       //			WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_METHODS" ),null));
-       return false;
-     }	
-     //now check for a default constructor
-     while (m.hasNext()) {
-       Method method=(Method)m.next();
-       if (javaClass.getName().equals(method.getName())){
-          //now the inputs
-          JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-          if (javaParameter.length > 0){
-             //then we have no default constructor
-          	 status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT") );
-             //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
-             		//WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT" ),null));
-             return false;
-          }
-       }
-    }
-    return true;
-
-  }
-
- /**
-  * Sets the status monitor that this action will use to report status that occres while executing the Action.
-  */
-  public void setStatusMonitor ( StatusMonitor monitor )
-  {
-	monitor_ = monitor;
-  }
-
-  /**
-  * Returns the status monitor that this task is using to report status.
-  */
-  public StatusMonitor getStatusMonitor ()
-  {
-    if (monitor_ == null)
-    {
-      monitor_ = new NullStatusMonitor();
-    }
-    return monitor_;
-  }
-
-
-   /**
-  * check if the action has finished sucsessfully 
-  */
-  /*
-  public boolean isSuccessful ()
-  {
-   	return getStatusMonitor().canContinue();
-  }
-  */ 
-  public void resetBeansCreated()
-  {
-    fBeansCreated = new Vector();
-  }
-
-  public void setEnvironment(Environment env)
-  {
-  	env_ = env;
-  }
-  
-  /*
-  * The command that called this will get the results of the operation in the form
-  * of a status.
-  */
-  public Vector getBeansCreated ()
-  {
-    if(fBeansCreated == null) fBeansCreated = new Vector();
-    return fBeansCreated;
-  }
-
-  /*
-  * The command that called this will get the results of the operation in the form
-  * of a status.
-  */
-  public void setBeansCreated (Vector beansCreated)
-  {
-    fBeansCreated = beansCreated;
-  }
-
-   /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public boolean getReturnParam ()
-  {
-    return fReturnParam;
-  }
-
-  /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public void setReturnParam (boolean returnparam)
-  {
-    fReturnParam = returnparam;
-  }
-
-   /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public String getProject ()
-  {
-    return clientProject;
-  }
-
-  /*
-  * This boolean tells wether we are dealing with a return param 
-  */
-  public void setProject (String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-
-  /**
-  * sets the visitor that calls the visit
-  * @parameter Visitor
-  */
-
-  public void setVisitor(Visitor visitor)
-  {
-      fVisitor = visitor;
-  }
-
-  /*
-  * Sets the parent element the child then knows where to
-  * add itself to the model
-  * @param Element parent element
-  */
-  public void setParentElement(Element element)
-  {
-    fParentElement = element;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
deleted file mode 100644
index 75af12d66..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
+++ /dev/null
@@ -1,113 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.FieldElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofFieldVisitorAction extends JavaMofBeanVisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-
-
-  /*
-  *Constructor
-  **/
-  public JavaMofFieldVisitorAction(Element parentElement, String project, Environment env)
-  {
-    super(parentElement,project, env);
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaParameter the mof element to be used to create the attribute
-  **/
-
-
-  //bean info code
-
-
-  public IStatus visit (Object field_)
-  {
-  	IStatus status = Status.OK_STATUS;
-    Field field = (Field)field_;
-     
-    try{
-       //if the type of this attribute is unsupported dont make an Attribute
-      if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)field.getJavaClass())) 
-      	&& (TypeFactory.isUnSupportedType((JavaHelpers)field.getJavaClass()))){
-      	  status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName() );
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-	      //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName(),null));
-	      return status;
-	  }	
-
-
-      FieldElement fieldElement = (FieldElement)BeanModelElementsFactory.getBeanModelElement(field,fParentElement);
-
-      if(fieldElement != null){
-        //lets check and see if the getter takes input params
-        //if so throw an error
-        //now the inputs
-        
-        JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(fieldElement,clientProject, env_);
-        typeVisitorAction.setStatusMonitor(getStatusMonitor());
-        typeVisitorAction.setBeansCreated(getBeansCreated());
-        typeVisitorAction.setReturnParam(getReturnParam()); 
-        JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
-        typeVisitor.setClientProject(getProject());
-        status = typeVisitor.run(field,typeVisitorAction);
-       
-      }
-      return status;
-    
-    }catch(Exception e)
-	{
-    	env_.getLog().log(Log.WARNING, 5055, this, "visit", e);
-    	status = StatusUtils.warningStatus(	msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), e);
-    	try {
-    		env_.getStatusHandler().report(status);
-    	} 
-      catch (StatusException e1) 
-      {
-    		status = StatusUtils.errorStatus(	msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), e1 );
-    	}
-    	return status;
-	}
-
-  }
- 
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
deleted file mode 100644
index 6c04b2cac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
+++ /dev/null
@@ -1,224 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofMethodVisitorAction extends JavaMofBeanVisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private MessageUtils msgUtils_;
-  public String fUnsupportedParameterName;
-
- /*
-  * Methods omitted from the proxy
-  */
-  protected Vector fMethodsOmitted;
-
-  /*
-  * Methods processed from proxy
-  */
-  protected Vector fMethodsProcessed;
-
-     
-  /*
-  *Constructor
-  **/
-  public JavaMofMethodVisitorAction(Element parentElement,String project, Environment env)
-  {
-    super(parentElement,project, env);
-    String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    fMethodsOmitted = new Vector();
-    fMethodsProcessed = new Vector();
-
-  }
-   
-  /**
-  * Create a method element from the method 
-  * @param Method the class to be used to create the method
-  **/
-  public IStatus visit (Object imethod)
-  {
-  	IStatus status = Status.OK_STATUS;
-    Method method = (Method)imethod;
-           
-    if (methodCheck(method)){
-      //this is to check immediate input and return parameters
-      //if there is an unsupported type in these we can react immediately
-      //we add it to the omitted methods an go to the next one
-      if(!parameterCheck(method)){
-      	status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS") + fUnsupportedParameterName );
-        //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-        //		WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS" ) + fUnsupportedParameterName,null));
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        return status;
-      }
-      if(!nullConstructor(method)){
-      	status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS") + fUnsupportedParameterName );
-        //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-       	//	WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS" ) + fUnsupportedParameterName,null));
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        return status;
-      
-      }
-
-      //carry on all parameters supported
-      MethodElement methodElement = (MethodElement)BeanModelElementsFactory.getBeanModelElement(method,fParentElement);
-      JavaMofParameterVisitorAction parameterVisitorAction = new JavaMofParameterVisitorAction(methodElement,clientProject,env_);
-      parameterVisitorAction.setStatusMonitor(getStatusMonitor());
-      JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(env_);
-      status = parameterVisitor.run(method,parameterVisitorAction);   
-      //something may have gone wrong with an internal type
-      if (status.getSeverity()!=Status.OK){
-        //This method has to be omitted
-        fMethodsOmitted.addElement(method.getMethodElementSignature());
-        methodElement.setMethodOmmission(true);  
-      }	
-      else {
-        fMethodsProcessed.addElement(method.getMethodElementSignature());
-      }	
-    }
-    
-    return status;
-  }
- 
-  /*
-  * Tells wether any methods were processed 
-  * @return boolean true if any methods were processed 
-  */
-  public boolean wereMethodsProcessed()
-  {
-    if(fMethodsProcessed.isEmpty()) return false;
-    return true;
-  }
-
-  /*
-  * Tells wether there were methods omitted because of unsupported types
-  * @return boolean true if methods were omitted
-  */
-  public boolean wereMethodsOmitted()
-  {
-    if(fMethodsOmitted.isEmpty()) return false;
-    return true;
-  }
-  
-  /**
-  * There may be methods that we dont support
-  * and dont want in the model
-  * @param boolean true if all parameters are fine
-  **/
-  public boolean methodCheck(Method method)
-  {
-    boolean ok = true;
-    // if we have a constructor we return false
-    if (method.isConstructor()) return false;
-
-       
-    return ok;
-  }
-
-  /**
-  * There may be parameters of this method that have types
-  * not yet supported return false if we find any
-  * @param boolean true if all parameters are fine
-  **/
-  public boolean parameterCheck(Method method)
-  {
-
-    boolean ok = true;
-    
-    //now the inputs
-    JavaParameter javaParameter[] = method.listParametersWithoutReturn(); 
-    for (int i = 0;i<javaParameter.length;i++) {
-      JavaParameter param=javaParameter[i];
-      JavaHelpers javaHelper1 = param.getJavaType();
-      if(TypeFactory.isUnSupportedType(javaHelper1)) {
-        fUnsupportedParameterName = param.getName(); 
-    	return false;
-      }    
-    }
-  return ok;
-  }
-
- 
-  /**
-  * There may be parameters of this method that have types
-  * not yet supported return false if we find any
-  * @param boolean true if all parameters are fine
-  **/
-  public boolean nullConstructor(Method method)
-  {
-    
-    boolean ok = true;
-    //now the inputs
-    JavaParameter javaParameter[] = method.listParametersWithoutReturn(); 
-    for (int i = 0;i<javaParameter.length;i++) {
-      JavaParameter param=javaParameter[i];
-      JavaHelpers javaHelper1 = param.getJavaType();
-      if(javaHelper1 instanceof JavaClass){
-        JavaClass javaClass = (JavaClass)javaHelper1;
-        if(TypeFactory.recognizedBean(javaClass.getJavaName()))return true;
-          Iterator m=javaClass.getMethods().iterator();
-          while (m.hasNext()) {
-            Method method2=(Method)m.next();
-            if (javaClass.getName().equals(method2.getName())){
-              //now the inputs
-              JavaParameter javaParam[] = method2.listParametersWithoutReturn();
-              if (javaParam.length > 0){
-                //then we have no default constructor
-                fUnsupportedParameterName = param.getName(); 
-    	        ok = false;
-              }    
-              else return true;
-            } 
-          }
-        }
-      }
-  return ok;
-  }
-
- 
-
-
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
deleted file mode 100644
index 7680bf98a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
+++ /dev/null
@@ -1,85 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a parameterElement using the 
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk to its type
-* */
-public class JavaMofParameterVisitorAction extends JavaMofBeanVisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-    
-  /*
-  *Constructor
-  **/
-  public JavaMofParameterVisitorAction(Element parentElement,String project, Environment env)
-  {
-    super(parentElement,project, env);
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);    
-  }
-   
-  /**
-  * Create a parameter element from the method 
-  * @param JavaParameter the mof element to be used to create the Parameter
-  **/
-  public IStatus visit (Object ijavaParameter)
-  {
-  	IStatus status = Status.OK_STATUS;
-  	Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
-  	
-    ParameterElement parameterElement = (ParameterElement)BeanModelElementsFactory.getBeanModelElement(ijavaParameter,fParentElement);
-    JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(parameterElement,clientProject, env_);
-    //typeVisitorAction.setStatusMonitor(getStatusMonitor());
-    typeVisitorAction.setReturnParam(parameterElement.isReturn());
-    JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
-    typeVisitor.setClientProject(getProject());
-    status = typeVisitor.run(ijavaParameter,typeVisitorAction);
-    //
-    int severity = status.getSeverity(); 
-    if (severity==Status.ERROR)
-    	return status;
-    
-    if (severity==Status.WARNING)
-    {
-      Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-      if (result.getLabel().equals(CancelChoice.getLabel()))
-      {
-      	 //return an error status since the user canceled
-      	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-      }
-      	
-    }
-    //           
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
deleted file mode 100644
index 87e857734..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,120 +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.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a TypeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofTypeVisitorAction extends JavaMofBeanVisitorAction
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-
-  /*
-  *Constructor
-  **/
-  public JavaMofTypeVisitorAction(Element parentElement,String project, Environment env)
-  {
-    super(parentElement,project, env);
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);    
-  }
-
-  /**
-  * Create a type element from the JavaHelper
-  * @param JavaHelper the mof element to be used to create the Type
-  **/
-  public IStatus visit (Object typeNavigator)
-  {
-  	 IStatus status = Status.OK_STATUS;
-   	 Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	 Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));  	 
-
-     //if bean
-	 JavaClass javaClass = null;
-	 if(typeNavigator instanceof JavaClass){
-	    javaClass = (JavaClass)typeNavigator;
-	 }
-
-
-     /* If we are dealing with a return parameter then we need to treat this differently then if it is an input 
-     *  parameter.
-     *  We need to first see if it is a special case for return types if not we treat it the same as everything
-     *  else.
-     */
-     if(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)typeNavigator))
-     {
-       BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
-     }	
-     else{
-	    if(TypeFactory.isUnSupportedType((JavaHelpers)typeNavigator)){
-	      status = StatusUtils.warningStatus( msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)typeNavigator).getJavaName() );	    	
-	      //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
-              //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE" ) + ((JavaHelpers)typeNavigator).getJavaName(),null));
-	      return status;
-	    }	
-	    
-	    //if javaclass is null then we have a simple type 
-	    if((javaClass == null) || TypeFactory.recognizedBean(javaClass.getJavaName()))
-      {
-	      BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
-	    }
-	    else{
-	      JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(fParentElement,clientProject, env_);
-	      beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	      beanVisitorAction.setBeansCreated(getBeansCreated());
-          beanVisitorAction.setReturnParam(getReturnParam());
-		  JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-	      status = beanVisitor.run(javaClass,beanVisitorAction);
-	    }
-     }
-     
-     //
-     int severity = status.getSeverity(); 
-     if (severity==Status.ERROR)
-     	return status;
-     
-     if (severity==Status.WARNING)
-     {
-       Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-       if (result.getLabel().equals(CancelChoice.getLabel()))
-       {
-       	 //return an error status since the user canceled
-       	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-       }
-       	
-     }
-     //
-     return status;
-   }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
deleted file mode 100644
index ff80e0152..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
+++ /dev/null
@@ -1,95 +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.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* It will automatically walk the methods in the JavaClass
-* */
-public abstract class VisitorActionImpl implements VisitorAction 
-{
-
-  private Vector beansVisited = null;
-  private Vector messages = null;
-  private MessageUtils msgUtils_;
-
-  public VisitorActionImpl( Vector messages, Vector beansVisited)
-  	{
-  	 this.messages = messages;
-  	 this.beansVisited = beansVisited;
-     msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-  	}
-  
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-
- /**
-  * Returns the vector of all messages found
-  */
-  public Vector getMessages ()
-  {
-  	if (messages == null) 
-  		messages = new Vector();
-    return messages;
-  }
-
-  public Vector getBeansVisited()
-  	{
-		if ( beansVisited == null)
-  			beansVisited = new Vector(); 
-        return beansVisited;
-   }
-
-  public void addVisitedBean( JavaClass bean)
-  	{
-  		if ( beansVisited == null)
-  			beansVisited = new Vector();
-  		beansVisited.add(bean);
-  	}
-
-  public boolean isBeanVisited (JavaClass bean)
-  	{
-  		return (beansVisited != null && beansVisited.contains(bean));
-  	}
-
-  /**
-  * sets the visitor that calls the visit
-  * @parameter Visitor
-  */
-
-  public void setVisitor(Visitor visitor)
-  {
-  }
-
-  protected void addMessage ( String key )
-  {
-    getMessages().add(msgUtils_.getMessage(key));
-  }
-
-  protected void addMessage ( String key, Object[] args )
-  {
-    getMessages().add(msgUtils_.getMessage(key,args));
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
deleted file mode 100644
index c6f129d6c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,216 +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.consumption.codegen.javamofvisitors;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.common.environment.Environment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofAttributeVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private String clientProject;
-  private boolean returnParameter;
-  private Environment env;
-  
-  
-  public void setEnvironment(Environment env)
-  {
-  	this.env = env;
-  }
-  
-  /*
-  * Use this to reflect 
-  */
-  public void setProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public String getProject()
-  {
-    return clientProject;
-  }
-
-  public void setReturnParameter(boolean returnParameter)
-  {
-    this.returnParameter = returnParameter;
-  }
- 
-  
-  /*
-  * Get the attribute belonging to this complex type 
-  * @param JavaParameter javaParameter that owns the type
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public IStatus run ( Object javaclass, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    JavaClass javaClass = (JavaClass)javaclass;     
-
-    Hashtable spdMap = new Hashtable();  
-    for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
-      Method method=(Method)m.next();
-      if (((method.getMethodElementSignature().startsWith("get") 
-      	|| method.getMethodElementSignature().startsWith("is")) 
-        && method.listParametersWithoutReturn().length == 0 )
-        || (method.getMethodElementSignature().startsWith("set") 
-        && method.listParametersWithoutReturn().length > 0)) {
-        int sub = 3;
-        if(method.getMethodElementSignature().startsWith("is"))
-          sub = 2;	
-        String propertyName = method.getMethodElementSignature().substring(sub);    
-        String lower = propertyName.substring(0,1).toLowerCase();
-        String remainder = propertyName.substring(1); 
-        propertyName = lower + remainder;
-        int index = propertyName.lastIndexOf("(");
-        String temp = propertyName;
-        propertyName = temp.substring(0,index); 
-        
-        //find the propertydescriptor
-        SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdMap.get(propertyName); 
-        if(spd == null){
-          spd = new SamplePropertyDescriptor(propertyName);
-          spdMap.put(propertyName,spd); 
-        }
-        if(method.getMethodElementSignature().startsWith("set"))
-          spd.setWriteMethod(method);
-        else 
-          spd.setReadMethod(method);
-
-        FieldImpl field = (FieldImpl)javaClass.getFieldNamed(propertyName);
-        JavaHelpers propertyType = null; 
-        if(field != null){
-          propertyType = field.getJavaType();
-          spd.setfStatic(field.isStatic());
-        }
-        else{
-          if(method.getMethodElementSignature().startsWith("get") || method.getMethodElementSignature().startsWith("is"))
-          	propertyType = method.getReturnType();
-          else{
-             JavaParameter params[] = method.listParametersWithoutReturn(); 
-             propertyType = params[0].getJavaType();
-          }  
-        }
-          	
-        spd.setPropertyType(propertyType); 
-        
-      }
-    }
-    Enumeration spdEnum = spdMap.elements();
-    while(spdEnum.hasMoreElements()){
-      SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdEnum.nextElement();
-      if(spdCheck(spd))
-        status = vAction.visit(spd);   
-    } 
-   
-    return status;
-
-  }
-  
-  private boolean spdCheck(SamplePropertyDescriptor spd)
-  {  
-    //check for indexed properties
-  	Method writeMethod = spd.getWriteMethod();
-  	if(writeMethod != null)
-  	  if(writeMethod.listParametersWithoutReturn().length > 1) return false;
-  	
-  	if(spd.getPropertyType() == null) return false;
-    if(spd.getPropertyType().isPrimitive()) return true;
-    if(returnParameter && TypeFactory.isRecognizedReturnType(spd.getPropertyType())) return true;
-    if(!returnParameter && TypeFactory.isUnSupportedType(spd.getPropertyType())) return true;
-    if(!checkPolarity(spd)) return false;   
-       
-    // so its a bean make sure it has a default constructor       
-    JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-    javaMofRef.setClientProject(getProject());
-    javaMofRef.setProxyBean(((JavaHelpers)spd.getPropertyType()).getQualifiedName());
-    javaMofRef.setEnvironment( env );
-    javaMofRef.execute(null, null);
-    if(javaMofRef.getJavaClass() instanceof JavaClass){
-       if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
-       return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-               
-    }
-    return true;
-  
-  }
-  
-  private boolean checkPolarity(SamplePropertyDescriptor spd){
-    
-  	Method readMethod = spd.getReadMethod();
-  	Method writeMethod = spd.getWriteMethod();
-  	if((readMethod == null && writeMethod != null) || (readMethod != null && writeMethod == null))
-  	  return true;	
-  	if(readMethod == null && writeMethod == null)
-  	  return false;	
-  	  	
-  	JavaParameter javaParameter[] = writeMethod.listParametersWithoutReturn();
-    for(int i = 0;i< javaParameter.length;i++){
-      JavaParameter jp = javaParameter[i]; 	
-      jp.getJavaType().getJavaName();
-      readMethod.getReturnType().getJavaName();
-      if(jp.getJavaType().getJavaName().equals(readMethod.getReturnType().getJavaName()))
-        return true; 
-    }
-  	return false;
-  }
-  
-  private boolean defaultCheck(JavaClass javaClass){
-    
-       Iterator m=javaClass.getMethods().iterator();
-        //now check for a default constructor
-        boolean defaultConst = true;
-        while (m.hasNext()) {
-          Method method=(Method)m.next();
-          if (javaClass.getName().equals(method.getName())){
-                //now the inputs
-                JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-                if (javaParameter.length > 0){
-                      //then we have no default constructor
-                      defaultConst = false; 
-                }
-                else if(javaParameter.length == 0){
-                     if (method.getJavaVisibility().getValue() == 0)
-                       return true;
-                }
-          }
-       }
-    
-       return defaultConst;
-  }
-          
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
deleted file mode 100644
index 2b571f830..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
+++ /dev/null
@@ -1,45 +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.consumption.codegen.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofBeanVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /*
-  *Constructor
-  **/
-  public JavaMofBeanVisitor()
-  {
-  }
- 
-  public IStatus run ( Object javaClass, VisitorAction vAction)
-  {
-    return vAction.visit((JavaClass)javaClass);   
-  }
-        
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
deleted file mode 100644
index b79e238ea..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
+++ /dev/null
@@ -1,138 +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.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofFieldVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private String clientProject;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofFieldVisitor()
-  {
-  }
-
-  /*
-  * Use this to reflect 
-  */
-  public void setProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public String getProject()
-  {
-    return clientProject;
-  }
-
-  /*
-  * Get the attribute belonging to this complex type 
-  * @param JavaParameter javaParameter that owns the type
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public IStatus run ( Object javaclass, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    JavaClass javaClass = (JavaClass)javaclass;     
-
-    boolean holderClass = false;
-    EList implemented = javaClass.getImplementsInterfaces();
-	for (int i = 0; i < implemented.size(); i++) {
-	  JavaClass anInterface = (JavaClass) implemented.get(i);
-	  if (anInterface.getQualifiedName().equals("javax.xml.rpc.holders.Holder"))
-	    holderClass = true;
-	}      
-
-     //beaninfo code
-    if(holderClass){     
-      EList e  = javaClass.getFields();
-      ListIterator list = e.listIterator();
-      while(list.hasNext()){
-        Field field = (Field)list.next();     
-        if(field.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC && !field.isFinal() && !field.isStatic()){
-          if(fieldCheck((FieldImpl)field))
-            status = vAction.visit(field);
-        }
-      }
-    }
-    
-    return status;
-  }       
-  private boolean fieldCheck(FieldImpl field)
-  {
-    // so its a bean make sure it has a default constructor 
-    JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-    javaMofRef.setProxyBean(field.getJavaType().getQualifiedName());
-    javaMofRef.setClientProject(getProject());
-    javaMofRef.execute(null, null);
-    if(javaMofRef.getJavaClass() instanceof JavaClass){
-      if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
-      return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-    }
-    return true;
-  }
-        
- private boolean defaultCheck(JavaClass javaClass){
-    
-   Iterator m=javaClass.getMethods().iterator();
-   //now check for a default constructor
-   boolean defaultConst = true;
-   while (m.hasNext()) {
-    Method method=(Method)m.next();
-    if (javaClass.getName().equals(method.getName())){
-      //now the inputs
-      JavaParameter javaParameter[] = method.listParametersWithoutReturn();
-      if (javaParameter.length > 0){
-        //then we have no default constructor
-        defaultConst = false; 
-      }
-      else if(javaParameter.length == 0){
-        if (method.getJavaVisibility().getValue() == 0)
-          return true;
-        else if(method.getJavaVisibility().getValue() == 1) 
-          defaultConst = false;
-      }
-    }
-  }
-    
-  return defaultConst;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
deleted file mode 100644
index 756abb953..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
+++ /dev/null
@@ -1,84 +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.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofMethodVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public String SET_ENDPOINT = "setEndPoint";
-  public String GET_ENDPOINT = "getEndPoint";
-  private BooleanSelection[] fMethodsSelected;
-
-
-  /*
-  * Constructor
-  **/
-  public JavaMofMethodVisitor()
-  {
-  }
- 
-  public String UNDER_SCORE = "_";
-
-  /*
-  * Run through all the methods in this bean
-  * @param JavaClass javaclass that holds the methods
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public IStatus run ( Object javaclass, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    JavaClass javaClass = (JavaClass)javaclass;
-    for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
-      Method method=(Method)m.next();
-      if(fMethodsSelected != null)  {
-        boolean methodSelected = false;
-      	for(int i =0;i < fMethodsSelected.length;i++){
-          if(fMethodsSelected[i] == null) continue;
-          if ( fMethodsSelected[i].getValue().equals(method.getMethodElementSignature()))
-            methodSelected = (boolean) fMethodsSelected[i].isSelected();
-        }
-        
-        method.getName();
-        
-        if(methodSelected)
-          status = vAction.visit(method);  
-        
-      }
-      else {
-        status = vAction.visit(method);   
-      }
-
-    }
-    return status;
-  }
-
-  public void setMethodSelection(BooleanSelection[] methodSelected)
-  {
-    fMethodsSelected = methodSelected;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
deleted file mode 100644
index 42c11a527..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
+++ /dev/null
@@ -1,113 +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.consumption.codegen.javamofvisitors;
-
-import java.util.List;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.Environment;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofParameterVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private MessageUtils msgUtils_;
-  private Environment env_;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofParameterVisitor(Environment env)
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);  	
-  	env_ = env;
-  }
-  
-  /*
-  * Run through all the parameters in this method
-  * @param JavaClass javaclass that holds the parameters
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public IStatus run ( Object imethod, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-  	Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));  	
-    Method method = (Method)imethod;
-   
-    JavaHelpers javaReturnParameter = method.getReturnType();
-    //pgm This visitor used to take a JavaParameter type and now it is being called
-    //    with a JavaHelpers type.  Gil, please ensure that this is Ok.
-    status = vAction.visit(javaReturnParameter);
-    //
-    int severity = status.getSeverity(); 
-    if (severity==Status.ERROR)
-    	return status;
-    
-    if (severity==Status.WARNING)
-    {
-      Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-      if (result.getLabel().equals(CancelChoice.getLabel()))
-      {
-      	 //return an error status since the user canceled
-      	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-      }
-      	
-    }
-    //           
-
-    //now the inputs
-    List parameters = method.getParameters(); 
-    
-    for (int index = 0; index < parameters.size(); index++) 
-    {
-      JavaParameter param=(JavaParameter)parameters.get(index);
-      status = vAction.visit(param);
-      //
-      severity = status.getSeverity(); 
-      if (severity==Status.ERROR)
-      	return status;
-      
-      if (severity==Status.WARNING)
-      {
-        Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-        if (result.getLabel().equals(CancelChoice.getLabel()))
-        {
-        	 //return an error status since the user canceled
-        	  return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-        }
-        	
-      }
-      //      
-    }
-    
-    return status;
-    
-  }
-  
-        
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
deleted file mode 100644
index d14b3fcb5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
+++ /dev/null
@@ -1,113 +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.consumption.codegen.javamofvisitors;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.common.environment.Environment;
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofTypeVisitor implements Visitor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private Environment env_;
-
-  private String clientProject;
-
-  /*
-  * Constructor
-  **/
-  public JavaMofTypeVisitor(Environment env)
-  {
-  	env_ = env;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public void setClientProject(String clientProject)
-  {
-    this.clientProject = clientProject;
-  }
-
-   /*
-  * Use this to reflect 
-  */
-  public String getClientProject()
-  {
-    return clientProject;
-  }
-  
-  /*
-  * Get the type belonging to the parameter
-  * @param JavaParameter javaParameter that owns the type
-  * @param VisitorAction Action to be performed on each method
-  **/
-  public IStatus run ( Object typeNavigator, VisitorAction vAction)
-  {
-  	IStatus status = Status.OK_STATUS;
-    if (typeNavigator instanceof JavaParameter){
-
-      JavaParameter javaParameter = (JavaParameter)typeNavigator;
-      JavaHelpers javaHelpers = javaParameter.getJavaType();
-      status = vAction.visit(javaHelpers);
-    }
-    else if (typeNavigator instanceof JavaHelpers){
-    	status = vAction.visit(typeNavigator);	
-    }
-    else if (typeNavigator instanceof SamplePropertyDescriptor){
-      SamplePropertyDescriptor pd = (SamplePropertyDescriptor)typeNavigator;
-      JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-      javaMofRef.setClientProject(clientProject);
-      javaMofRef.setProxyBean(((JavaHelpers)pd.getPropertyType()).getQualifiedName());
-      javaMofRef.setEnvironment( env_ );
-      status = javaMofRef.execute( null, null );
-      if (status.getSeverity()==Status.ERROR)
-      	return status;
-      
-      status = vAction.visit(javaMofRef.getJavaClass());
-    }
-    else if (typeNavigator instanceof Field){
-      FieldImpl field = (FieldImpl)typeNavigator;
-      JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
-      javaMofRef.setClientProject(clientProject);
-      javaMofRef.setProxyBean(field.getJavaType().getQualifiedName());
-      javaMofRef.setEnvironment( env_ );
-     
-      status = javaMofRef.execute( null, null );
-      if (status.getSeverity()==Status.ERROR)
-      	return status;
-      
-      status = vAction.visit(javaMofRef.getJavaClass());
-    }
-    
-    return status;
-  }
-  
-        
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
deleted file mode 100644
index 315687db1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
+++ /dev/null
@@ -1,141 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class AbstractStartServer {
- 
-protected IProgressMonitor monitor;
-private Log log_;
-private MessageUtils msgUtils_;
-
-public AbstractStartServer()
-{
-	log_ = EnvironmentService.getEclipseLog();
-    msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-}
-
-/**
- * Execute the command
- */
-public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException
-{
-	this.monitor = monitor;
-
-   try
-  {
-   	
-//    IJavaServer javaServer = (IJavaServer) server.getDelegate();
-//    addJarsToClassPath(javaServer);
-    validateRemoteServerPath(server);
-
-    if (server.getServerState() != IServer.STATE_STOPPED)  // The Server is running
-    { 
-      if (server.getServerRestartState())
-      {    
-      	
-        server.synchronousStop(false);
-        log_.log(Log.INFO, 5050, this, "StartServer", "project="+project+", Stop command completed, restart needed");
-        publishProject(server);
-    	startProject(server);
-      }
-      else
-      {
-      	
-        if (restart) // WEB-INF\lib need to be reloaded
-        {
-          publishProject(server);      
-          restartProject(project, server);
-        }         
-      }
-    }
-    else {
-   	
-    		publishProject(server);
-    		startProject(server);
-    	}
-}
-
-  catch (CoreException ce) {
-  	throw ce;
-  	}
-  catch (Exception e) {
-    throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
-  }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
-      monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_PUBLISHING_SERVER" ) );
-      IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
-      if (status.getSeverity() != IStatus.OK)
-      	throw new CoreException(status);
-      log_.log(Log.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed");
- }
-
-protected void startProject(IServer server) throws CoreException
-{
-  try
-  {
-    monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_STARTING_SERVER" ) );    
-    server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
-    log_.log(Log.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed");
-    
-  }
-  catch (Exception e) {
-    throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
-  }  
-}
-
-protected void restartProject(IProject project, IServer server) throws CoreException
-{
-  //Do nothing
-}
-
-public void runPreServerConfig(IServer server, IProject EARProject){
-
-	return;
-	
-}
-
-public void runPostServerConfig(IServer server, IProject EARProject){
-
-	return;
-}
-
-
-protected abstract void addJarsToClassPath(IServer server) throws CoreException;
-protected abstract void validateRemoteServerPath(IServer server) throws CoreException;
-
-public void stopServer(IServer server) throws CoreException {
-
-	if (server != null) {
-
-		if (server.getServerState() != IServer.STATE_STOPPED) {
-			server.synchronousStop(false);
-		}
-	}	
-	
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
deleted file mode 100644
index c9d1b447b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class AddModuleToServerCommand extends AbstractDataModelOperation
-{
-  private MessageUtils msgUtils_;
-	  
-  private String serverInstanceId;
-	private String project;
-	private String module;
-	
-	public AddModuleToServerCommand()
-	{
-	  String pluginId = "org.eclipse.jst.ws.consumption";
-	  msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	}
-	
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	{
-      Environment env = getEnvironment();
-      
-	    IStatus status = Status.OK_STATUS;	    
-	    
-	    IServer server = ServerCore.findServer(serverInstanceId);
-	    if (server == null)
-	    {
-	      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
-	      env.getStatusHandler().reportError(status);
-	      return status;
-	    }
-	   
-	    IServerWorkingCopy serverwc = null;
-	    
-	    try
-	    {
-	    //Ensure the module is not a Java utility
-	    IProject iproject = ProjectUtilities.getProject(project);
-	    if (!J2EEUtils.isJavaComponent(iproject, module))
-	    {      
-	      IModule imodule = ServerUtils.getModule(iproject, module);
-	      if (!ServerUtil.containsModule(server, imodule, null))
-	      {
-	        IModule[] imodules = new IModule[]{imodule};
-	        serverwc = server.createWorkingCopy();
-	        ServerUtil.modifyModules(serverwc, imodules, null, null);
-	      }
-
-	    }
-	    } catch (CoreException e)
-	    {
-	      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_ADD_MODULE", new String[]{module}) );
-	      env.getStatusHandler().reportError(status);
-	      return status;      
-	    } finally
-	    {
-	      try
-	      {
-	        if (serverwc != null)
-	        {
-	          serverwc.save(true, null);
-	        }
-	      } catch (CoreException ce)
-	      {
-	        status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_ADD_MODULE", new String[] { module }) );
-	        env.getStatusHandler().reportError(status);
-	        return status;
-	      }      
-	    }
-	    
-		return status;
-	    
-		
-	}
-
-	public void setModule(String module)
-	{
-		this.module = module;
-	}
-
-	public void setProject(String project)
-	{
-		this.project = project;
-	}
-
-	public void setServerInstanceId(String serverInstanceId)
-	{
-		this.serverInstanceId = serverInstanceId;
-	}	
-
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
deleted file mode 100644
index 605984184..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-public class AssociateModuleWithEARCommand extends AbstractDataModelOperation
-{
-	private String project_;
-	private String module_;
-	private String earProject_;
-	private String ear_;
-	
-	private MessageUtils msgUtils_;
-  
-  public AssociateModuleWithEARCommand(){
-	    msgUtils_ = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-  }
-  
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-	{
-    Environment env = getEnvironment();
-    
-		IStatus status = Status.OK_STATUS;
-		IProject moduleProject = null;
-		IProject earProject = null;
-
-		// get projects
-		if (project_!=null)
-			moduleProject = ProjectUtilities.getProject(project_);
-		if (earProject_!=null)
-			earProject = ProjectUtilities.getProject(earProject_);
-		
-		// associate modules if not already associated
-		if (moduleProject!=null && earProject!=null) {
-			if (!J2EEUtils.isComponentAssociated(earProject, ear_, moduleProject, module_))
-				J2EEUtils.associateComponentToEAR(moduleProject, module_, earProject, ear_);
-		}
-		
-		// ensure modules are associated otherwise report error
-		if (!J2EEUtils.isComponentAssociated(earProject, ear_, moduleProject, module_)){
-			status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_UNABLE_TO_ASSOCIATE", new String[]{module_, ear_}) );
-			if (env!=null)
-				env.getStatusHandler().reportError(status);
-		    return status; 
-		}
-		
-		return status;
-	}
-	
-  public void setProject( String project )
-  {
-	  project_ = project;
-  }
-	  
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }	
-	
-  public void setEARProject( String earProject )
-  {
-	  earProject_ = earProject;
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
deleted file mode 100644
index 18996a560..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,98 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-public class BuildProjectCommand extends AbstractDataModelOperation 
-{
-  private ValidationManager validationManager;
-  private IProject project_;
-  private boolean forceBuild_;
-  // rm private Model model;
-
-  /**
-   * Default CTOR;
-   */
-  public BuildProjectCommand()
-  {
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    try
-    {
-      if (forceBuild_)
-        project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-      else if (validationManager == null)
-        project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-      else if (validationManager.getWorkspaceAutoBuildPreference())
-        project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
-    }
-    catch (Exception e)
-    {
-    }
-    
-    try
-    {
-      Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());   
-    }
-    catch (InterruptedException ie)
-    {
-      // continue execution
-    }
-    catch (OperationCanceledException oce)
-    {
-      // continue execution
-    }
-    
-    return Status.OK_STATUS;
-  }
-  /**
-   * @param forceBuild The forceBuild to set.
-   */
-  public void setForceBuild(boolean forceBuild) {
-    this.forceBuild_ = forceBuild;
-  }
-
-  /**
-   * @param project The project to set.
-   */
-  public void setProject(IProject project) {
-    this.project_ = project;
-  }
-
-  /**
-   * @param validationManager The validationManager to set.
-   */
-  public void setValidationManager(ValidationManager validationManager) {
-    this.validationManager = validationManager;
-  }
-
-  
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
deleted file mode 100644
index af291d9f5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
+++ /dev/null
@@ -1,79 +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.consumption.command.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CheckProjectOKCommand extends AbstractDataModelOperation 
-{
-
-  private String serviceServerTypeId_;
-
-  private MessageUtils msgUtils_;
-
-  /**
-   * Default CTOR
-   */
-  public CheckProjectOKCommand() {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  { 
-    IStatus status = Status.OK_STATUS;
-    
-    String typeid = serviceServerTypeId_;
-    IServer[] servers = ServerCore.getServers();
-//    Iterator iterator = servers.iterator();
-    boolean viewOpen = false;
-    String serverName = null;
-
-    for (int i=0;i<servers.length;i++) {
-      IServer server = (IServer) servers[i];
-
-      // If the configuration editor is open for the server that we are
-      // deploying
-      // to we will prompt the user to close it.
-      if (server != null && server.getServerType().getId().equals(typeid)) {
-        viewOpen = true;
-        serverName = server.getName();
-        break;
-      }
-    }
-
-    if (viewOpen) {
-      String errorMessage = msgUtils_.getMessage("MSG_ERROR_SERVER_VIEW_OPEN", new String[] { serverName});
-      return StatusUtils.errorStatus( errorMessage );
-      
-    }
-    
-    return status;
-  }
-
-  /**
-   * @param serviceServerId
-   *            The serviceServer factory Id to set.
-   */
-  public void setServiceServerTypeID(String serviceServerId) {
-    this.serviceServerTypeId_ = serviceServerId;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
deleted file mode 100644
index a562dce68..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
+++ /dev/null
@@ -1,127 +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.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ComputeEndpointCommand extends AbstractDataModelOperation
-{
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private Boolean monitorService;
-  private Integer monitoredPort;
-
-  public ComputeEndpointCommand()
-  {
-  }
-
-  /**
-   * @param monitoredPort The monitoredPort to set.
-   */
-  public void setMonitoredPort(Integer monitoredPort)
-  {
-    this.monitoredPort = monitoredPort;
-  }
-  /**
-   * @param monitorService The monitorService to set.
-   */
-  public void setMonitorService(Boolean monitorService)
-  {
-    this.monitorService = monitorService;
-  }
-  /**
-   * @param webServicesParser The webServicesParser to set.
-   */
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  /**
-   * @param wsdlURI The wsdlURI to set.
-   */
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-  
-  public String getEndpoint()
-  {
-    if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
-    {
-      Definition def = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (def != null)
-      {
-        for (Iterator it = def.getServices().values().iterator(); it.hasNext();)
-        {
-          Service service = (Service)it.next();
-          for (Iterator it2 = service.getPorts().values().iterator(); it2.hasNext();)
-          {
-            Port port = (Port)it2.next();
-            for (Iterator it3 = port.getExtensibilityElements().iterator(); it3.hasNext();)
-            {
-              ExtensibilityElement ext = (ExtensibilityElement)it3.next();
-              if (ext instanceof SOAPAddress)
-              {
-                String location = ((SOAPAddress)ext).getLocationURI();
-                try
-                {
-                  URL url = new URL(location);
-                  url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
-                  return url.toString();
-                }
-                catch (MalformedURLException murle)
-                {
-                  int protocolIndex = location.indexOf("://");
-                  if (protocolIndex != -1)
-                  {
-                    String protocol = location.substring(0, protocolIndex+3);
-                    int hostPortIndex = location.indexOf('/', protocolIndex+3);
-                    String file;
-                    if (hostPortIndex == -1)
-                    {
-                      hostPortIndex = location.length();
-                      file = "";
-                    }
-                    else
-                      file = location.substring(hostPortIndex, location.length());
-                    String hostPort = location.substring(protocolIndex+3, hostPortIndex);
-                    int hostIndex = hostPort.indexOf(':');
-                    String host;
-                    if (hostIndex != -1)
-                      host = hostPort.substring(0, hostIndex+1);
-                    else
-                      host = hostPort + ':';
-                    String newPort = String.valueOf(monitoredPort.intValue());
-                    StringBuffer endpoint = new StringBuffer(protocol);
-                    endpoint.append(host);
-                    endpoint.append(newPort);
-                    endpoint.append(file);
-                    return endpoint.toString();
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return null;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
deleted file mode 100644
index ad82ad691..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,330 +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.consumption.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.uri.URIException;
-import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.w3c.dom.Element;
-
-public class CopyWSDLCommand extends AbstractDataModelOperation
-{
-  private String wsdlURI;
-  private WebServicesParser webServicesParser;
-  private String destinationURI;
-  private Definition def;
-  private Vector ignoreList;
-
-  public CopyWSDLCommand()
-  {
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    try
-    {
-      ignoreList = new Vector();
-      if (def == null)
-        def = webServicesParser.getWSDLDefinition(wsdlURI);
-      copyWSDL(env, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
-      return Status.OK_STATUS;
-    }
-    catch (Throwable t)
-    {
-      t.printStackTrace();
-      IStatus status = StatusUtils.errorStatus( WebServiceConsumptionPlugin.getMessage("MSG_ERROR_COPY_WSDL", new String[]{wsdlURI, destinationURI}), t);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-  }
-
-  private void copyWSDL(Environment env, String uri, String destURI, String destLocalname) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
-  {
-  	Definition definition;
-	
-	try {
-		definition = webServicesParser.getWSDLDefinitionVerbose(uri);
-		copyWSDL(env, uri, destURI, destLocalname, definition);	
-	} catch (WSDLException e) {
-		copyXMLSchema(env, uri, destURI);
-	}
-  }
-
-  private void copyWSDL(Environment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
-  {
-	if (!needToCopy(uri)) {
-	   	return;
-	}
-    
-    String baseURI = getBaseURI(uri);
-    if (destLocalname == null || destLocalname.length() <= 0)
-      destLocalname = getLocalname(uri);
-    
-    // copy WSDL
-    StringBuffer destinationFileURI = new StringBuffer(addTrailingSeparator(destURI));
-    destinationFileURI.append(destLocalname);
-    WSDLFactory wsdlFactory = new WSDLFactoryImpl();
-    WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-    OutputStream os = env.getURIFactory().newURI(destinationFileURI.toString()).getOutputStream();
-    wsdlWriter.writeWSDL(definition, os);
-    os.close();
-    // copy <wsdl:import>s
-    Map imports = definition.getImports();
-    for (Iterator it = imports.values().iterator(); it.hasNext();)
-    {
-      List list = (List)it.next();
-      for (Iterator listIt = list.iterator(); listIt.hasNext();)
-      {
-        Import wsdlImport = (Import)listIt.next();
-        String wsdlImportURI = wsdlImport.getLocationURI();
-        if (isRelative(wsdlImportURI))
-        {
-          String importBaseURI = (new StringBuffer(baseURI)).append(wsdlImportURI).toString();
-          String wsdlImportBaseURI = getBaseURI(wsdlImportURI);
-          StringBuffer importDestURI = new StringBuffer(destURI);
-          if (wsdlImportBaseURI != null)
-            importDestURI.append(wsdlImportBaseURI);
-          copyWSDL(env, importBaseURI, importDestURI.toString(), getLocalname(wsdlImportURI));
-        }
-      }
-    }
-    Types types = definition.getTypes();
-    if (types != null)
-    {
-      List schemas = types.getExtensibilityElements();
-      for (Iterator it = schemas.iterator(); it.hasNext();)
-      {
-        ExtensibilityElement extElement = (ExtensibilityElement)it.next();
-        if (extElement instanceof UnknownExtensibilityElement)
-        {
-          UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)extElement;
-          XSDSchema xsdSchema = null;
-          try
-          {
-            xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-          }
-          catch (Throwable t)
-          {
-            // ignore any extensibility elements that cannot be parsed into a
-            // XSDSchema instance
-          }
-          copyXMLSchema(env, xsdSchema, baseURI, destURI);
-        }
-        else if (extElement instanceof XSDSchemaExtensibilityElementImpl)
-        {
-          XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)extElement;
-          XSDSchema xsdSchema = null;
-          try
-          {
-            xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-          }
-          catch (Throwable t)
-          {
-            // ignore any extensibility elements that cannot be parsed into a
-            // XSDSchema instance
-          }
-          copyXMLSchema(env, xsdSchema, baseURI, destURI);
-        }
-      }
-    }
-  }
-
-  private String getBaseURI(String uri)
-  {
-    int index = uri.lastIndexOf('/');
-    if (index == -1)
-      index = uri.lastIndexOf('\\');
-    if (index != -1)
-      return uri.substring(0, index + 1);
-    else
-      return null;
-  }
-
-  private String getLocalname(String uri)
-  {
-    int index = uri.lastIndexOf('/');
-    if (index == -1)
-      index = uri.lastIndexOf('\\');
-    if (index != -1)
-      return uri.substring(index + 1);
-    else
-      return uri;
-  }
-
-  private String addTrailingSeparator(String s)
-  {
-    if (!(s.endsWith("/") || s.endsWith("\\")))
-    {
-      StringBuffer sb = new StringBuffer(s);
-      sb.append('/');
-      return sb.toString();
-    }
-    else
-      return s;
-  }
-
-  private boolean isRelative(String uri)
-  {
-    return (uri.indexOf(':') == -1);
-  }
-
-  private void copyXMLSchema(Environment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
-  {
-	  if (!needToCopy(uri)) {
-	    	return;
-	    }
-	
-    // load as a cached schema
-    XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(uri);
-    // if schema is not cached, parse it
-    if (xsdSchema == null)
-    {
-      XSDParser p = new XSDParser();
-      InputStream is = NetUtils.getURLInputStream(uri);
-      if (is != null)
-      {
-        p.parse(is);
-        xsdSchema = p.getSchema();
-      }
-    }
-    if (xsdSchema != null)
-    {
-      // copy schema
-      Element e = xsdSchema.getElement();
-      DOMSource domSource = new DOMSource(e);
-      Transformer serializer = TransformerFactory.newInstance().newTransformer();
-      serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-      serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-      serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-      OutputStream os = env.getURIFactory().newURI((new StringBuffer(destURI)).append(getLocalname(uri)).toString()).getOutputStream();
-      serializer.transform(domSource, new StreamResult(os));
-      os.close();
-      // copy <xsd:import>s and <xsd:include>s
-      copyXMLSchema(env, xsdSchema, getBaseURI(uri), destURI);
-    }
-  }
-
-  private void copyXMLSchema(Environment env, XSDSchema xsdSchema, String baseURI, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
-  {
-    if (xsdSchema != null)
-    {
-      // copy <xsd:import>s and <xsd:include>s
-      EList xsdSchemaContents = xsdSchema.getContents();
-      for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
-      {
-        Object content = it.next();
-        if (content instanceof XSDSchemaDirective)
-        {
-          XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
-          String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
-          if (xsdSchemaDirectiveLocation != null && isRelative(xsdSchemaDirectiveLocation))
-          {
-            String directiveURI = (new StringBuffer(baseURI)).append(xsdSchemaDirectiveLocation).toString();
-            String directiveBaseURI = getBaseURI(xsdSchemaDirectiveLocation);
-            StringBuffer directiveDestURI = new StringBuffer(destURI);
-            if (directiveBaseURI != null)
-              directiveDestURI.append(directiveBaseURI);
-            copyXMLSchema(env, directiveURI, directiveDestURI.toString());
-          }
-        }
-      }
-    }
-  }
-
-  private boolean needToCopy (String uri) {
-	  String normalizedURI = normalize(uri);	
-	  if (ignoreList.contains(normalizedURI))
-		  return false;
-	  ignoreList.add(normalizedURI);
-	  return true;
-  }
-  
-  private String normalize(String uri )
-  {
-	  try {
-		  String encodedURI = URIEncoder.encode(uri,"UTF-8");
-		  URI normalizedURI = new URI(encodedURI);
-		  normalizedURI = normalizedURI.normalize();
-		  return normalizedURI.toString();
-	  } catch (URISyntaxException e) {
-		  return uri;
-	  } catch (UnsupportedEncodingException e) {
-		  return uri;
-	  }
-  }
-	  
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-
-  public void setDestinationURI(String destinationURI)
-  {
-    this.destinationURI = destinationURI;
-  }
-
-  public void setDefinition(Definition def)
-  {
-    this.def = def;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
deleted file mode 100644
index aba4f45e6..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
+++ /dev/null
@@ -1,109 +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.consumption.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class CreateEARProjectCommand extends AbstractDataModelOperation
-{
-  private String earProjectName_;
-  private String serverFactoryId_;
-  private String j2eeVersion_;  
-
-  /**
-   * Constructor
-   */
-  public CreateEARProjectCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment  env       = getEnvironment();
-	  MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-	
-    try
-    {
-      IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_);
-      if (project != null && !project.exists())
-      {
-        IDataModel info = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
-        info.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
-        
-        //Set the J2EE version
-        if (j2eeVersion_ != null && j2eeVersion_.length()>0)
-        {
-          info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
-        }
-        else
-        {
-          info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
-        }
-        
-        //Set the server target
-        if (serverFactoryId_!=null && serverFactoryId_.length()>0)
-        {
-//			TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-//          String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EAR_TYPE, finalJ2EEVersion); 
-//          info.setProperty(EARComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-//          info.setProperty(EARComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
-        }
-
-        //Create the EAR
-        IDataModelOperation operation = info.getDefaultOperation();
-        operation.execute(new NullProgressMonitor(), null);
-      }
-    }
-    catch (ExecutionException ite)
-    {
-      IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_EAR_PROJECT", new String[] {earProjectName_}), ite);
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-    return Status.OK_STATUS;
-  }
-  /**
-   * @param earProjectName_ The earProjectName_ to set.
-   */
-  public void setEarProjectName(String earProjectName)
-  {
-    this.earProjectName_ = earProjectName;
-  }
-
-  public void setServerFactoryId(String serverFactoryId)
-  {
-  	serverFactoryId_ = serverFactoryId;
-  }
-  
-  public void setJ2EEVersion(String j2eeVersion)
-  {
-  	j2eeVersion_ = j2eeVersion;	
-  }  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
deleted file mode 100644
index bb67db9f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,81 +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.consumption.command.common;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-
-
-
-public class CreateJavaProjectCommand extends AbstractDataModelOperation
-{
-  private String projectName_;
-
-  /**
-   * Default CTOR
-   */
-  public CreateJavaProjectCommand()
-  {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_);
-    
-    if (project != null && !project.exists())
-    {
-      try
-      {
-        project.create(ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()), monitor);
-        project.open(monitor);
-        IProjectDescription desc = project.getDescription();
-        desc.setNatureIds(new String[] {JavaCore.NATURE_ID});
-        ICommand cmd = desc.newCommand();
-        cmd.setBuilderName(JavaCore.BUILDER_ID);
-        desc.setBuildSpec(new ICommand[] {cmd});
-        project.setDescription(desc, monitor);
-        IJavaProject javaProject = JavaCore.create(project);
-        Path projectRoot = new Path(Path.ROOT.append(new Path(project.getName())).toString());
-        javaProject.setRawClasspath(new IClasspathEntry[] {JavaCore.newSourceEntry(projectRoot), JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER))}, monitor);
-        javaProject.setOutputLocation(projectRoot, monitor);
-      }
-      catch (CoreException ce)
-      {
-        IStatus status = StatusUtils.errorStatus( WebServiceConsumptionPlugin.getMessage("MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT", new String[] {projectName_}), ce);
-        env.getStatusHandler().reportError(status);
-        return status;
-      }
-    }
-    return Status.OK_STATUS;
-  }
-  
-  public void setProjectName(String projectName)
-  {
-    projectName_ = projectName;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
deleted file mode 100644
index 6ad516c79..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateModuleCommand extends AbstractDataModelOperation
-{
-	
-	public final static int WEB = J2EEUtils.WEB;
-	public final static int EJB = J2EEUtils.EJB;
-	public final static int APPCLIENT = J2EEUtils.APPCLIENT;
-	public final static int EAR = J2EEUtils.EAR;
-	
-	private String   projectName;
-	private String   moduleName;  // may be null for non-flexible project
-	private int      moduleType;;
-	private String   j2eeLevel;
-	private String   serverFactoryId;
-	private String   serverInstanceId_;
-	private Environment env;
-    private IProgressMonitor monitor_;
-	
-	private MessageUtils msgUtils;
-	
-	public CreateModuleCommand(){
-		msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-	}
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    monitor_ = monitor;
-		this.env = getEnvironment();
-		IStatus status = Status.OK_STATUS;
-		
-		// check if data ready
-		status = checkDataReady();
-		if (status.getSeverity()==Status.ERROR){
-			return status;
-		}	
-		
-		// check if flexible project exists
-		IProject project = ProjectUtilities.getProject(projectName);
-		if (project==null || !project.exists()){
-			status = createFlexibleJavaProject();
-			if (status.getSeverity()==Status.ERROR){
-				return status;
-			}			
-		}
-
-		// check if project and/or component exists
-        if (projectName!=null) {
-          if (moduleName==null){
-            if (project.exists())
-              return status;
-          }
-          else {
-			if (J2EEUtils.exists(projectName, moduleName))
-				return status;
-          }
-        }
-		else {
-			return StatusUtils.errorStatus(msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{projectName, moduleName}) );
-		}        
-        
-		// create the component according to the component type specified
-		int type = getModuleType();
-		switch (type) {
-		case WEB:
-			status = createWebComponent();
-			break;
-		case EJB:
-			status = createEJBComponent();
-			break;
-		case APPCLIENT:
-			status = createAppClientComponent();
-			break;
-		case EAR:
-			status = createEARComponent();
-			break;
-
-		default:
-			return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{moduleName}) );			
-		}
-		
-	
-		return status;
-	}
-
-	private IStatus checkDataReady(){
-		
-		if (projectName==null || serverFactoryId==null){
-			return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{projectName, moduleName}) );
-		}
-		
-		return Status.OK_STATUS;
-	}
-	
-	
-	/**
-	 * Create a Web component
-	 * @return
-	 */
-	public IStatus createWebComponent(){
-		IStatus status = Status.OK_STATUS;
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider());
-
-		  projectInfo.setProperty(IWebComponentCreationDataModelProperties.PROJECT_NAME,projectName);
-          if (moduleName!=null)
-            projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-          
-          // get the Web servlet level
-          Integer servletLevel = J2EEUtils.getServletVersionForJ2EEVersion(j2eeLevel);
-          
-		  if (j2eeLevel!=null)
-			  projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, servletLevel);
-		  IDataModelOperation op = projectInfo.getDefaultOperation();
-			op.execute(monitor_, null);
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( e );
-		}
-		return status;		
-	}
-	
-	/**
-	 * Create an EAR component
-	 * @return
-	 */
-	public IStatus createEARComponent(){
-		IStatus status = Status.OK_STATUS;
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
-		  projectInfo.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME,projectName);
-          if (moduleName!=null)
-              projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-		  if (j2eeLevel!=null)
-			  projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
-		  IDataModelOperation op =projectInfo.getDefaultOperation();
-			op.execute(monitor_, null);
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( e );
-		}
-		return status;				
-	}
-	
-	/**
-	 * Create an EJB Component
-	 * @return
-	 */
-	public IStatus createEJBComponent(){
-		IStatus status = Status.OK_STATUS;
-    
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
-		  projectInfo.setProperty(IEjbComponentCreationDataModelProperties.PROJECT_NAME,projectName);
-          if (moduleName!=null)  
-              projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-          
-          // get the EJB spec level
-          Integer ejbLevel = J2EEUtils.getEJBVersionForJ2EEVersion(j2eeLevel);
-         
-		  if (j2eeLevel!=null)
-			  projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, ejbLevel);
-		  
-		  //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects.
-		  projectInfo.setProperty(IEjbComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
-		  
-		  IDataModelOperation op = projectInfo.getDefaultOperation();
-			op.execute( monitor_, null);
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_EJB_COMPONENT", new String[]{projectName}), e);
-		}
-		return status;		
-	}
-	
-	/**
-	 * Create an Application Client component
-	 * @return
-	 */
-	public IStatus createAppClientComponent()
-  {
-		IStatus status = Status.OK_STATUS;
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider());
-		  projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.PROJECT_NAME,projectName);
-          if (moduleName!=null)      
-		      projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-		  if (j2eeLevel!=null)		  
-			  projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
-		  
-		  //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects.
-		  projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
-		  
-		  IDataModelOperation op = projectInfo.getDefaultOperation();
-
-			op.execute( monitor_, null);
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_APPCIENT_PROJET", new String[]{projectName}), e);
-		}
-		return status;		
-	}
-	
-	/**
-	 * Creates Flexible Java Project structure
-	 * This project is required if it doesn't already exist in order to create the component 
-	 * @return
-	 * 
-	 * Note: This call may not be necessary once J2EE implements creating a flex project automatically
-	 * 		with the creation of components.
-	 */
-	public IStatus createFlexibleJavaProject(){
-		IStatus status = Status.OK_STATUS;
-		try
-		{
-		  IDataModel projectInfo = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
-		  projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.PROJECT_NAME,projectName);
-  
-		  String runtimeTargetId = null;
-		  if( serverInstanceId_ == null )
-		  {
-			// We don't have a server instance so we will get the first runtimeTarget from the factory ID.
-			runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId, ServerUtils.getServerTargetModuleType(moduleType), j2eeLevel);		
-		  }
-		  else
-		  {
-			// We have a server instance so we will just get it's runtimeTargetId.
-			IServer server = ServerCore.findServer( serverInstanceId_ );
-			runtimeTargetId = server.getRuntime().getId();  
-		  }
-		  
-		  projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID,runtimeTargetId);
-		  projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.ADD_SERVER_TARGET,Boolean.TRUE);
-		  IDataModelOperation op = projectInfo.getDefaultOperation();
-		  if (env!=null)
-			  op.execute( monitor_, null);
-		  else 
-			  op.execute(new NullProgressMonitor(), null);
-
-		}
-		catch (Exception e)
-		{
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_FLEX_PROJET", new String[]{projectName}), e);
-		}
-		return status;		
-	}
-	
-	public void setModuleName(String moduleName)
-	{
-		this.moduleName = moduleName;
-	}	
-
-	public int getModuleType()
-	{
-		return moduleType;
-	}
-
-	public void setModuleType(int moduleType)
-	{
-		this.moduleType = moduleType;
-	}
-
-	public void setProjectName(String projectName)
-	{
-		this.projectName = projectName;
-	}
-
-	/**
-	 * Expecting 12,13,14 etc.
-	 * @param level
-	 */
-	public void setJ2eeLevel(String level)
-	{
-		if (level !=null && level.indexOf(".")!=-1)
-			j2eeLevel = J2EEUtils.getJ2EEIntVersionAsString(level);
-		else
-			j2eeLevel = level;
-	}
-
-	public void setServerFactoryId(String serverFactoryId)
-	{
-		this.serverFactoryId = serverFactoryId;
-	}
-	
-	public void setServerInstanceId( String serverInstanceId )
-	{
-	  serverInstanceId_ = serverInstanceId;
-	}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
deleted file mode 100644
index f5ae400b3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
+++ /dev/null
@@ -1,140 +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.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.internal.IMonitoredServerPort;
-import org.eclipse.wst.server.core.internal.IServerMonitorManager;
-import org.eclipse.wst.server.core.internal.ServerMonitorManager;
-
-public class CreateMonitorCommand extends AbstractDataModelOperation
-{
-
-  private static final String WEB_SERVICES = "Web services";
-
-  private Boolean monitorService;
-
-  private String serviceServerInstanceId;
-
-  private Integer monitoredPort;
-
-  public CreateMonitorCommand() {
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    if (monitorService != null && monitorService.booleanValue()) {
-      IServer server = ServerCore.findServer(serviceServerInstanceId);
-      if (server != null) {
-
-        // IMonitorableServer monitorableServer = (IMonitorableServer)
-        // serverDelegate;
-        ServerPort[] ports = server.getServerPorts(null);
-        ServerPort port = null;
-        for (int it = 0; it < ports.length; it++) {
-          ServerPort p = ports[it];
-          String protocol = p.getProtocol();
-          if (protocol != null && protocol.trim().toLowerCase().equals("http")) {
-            port = p;
-            break;
-          }
-        }
-        if (port != null) {
-          IServerMonitorManager serverMonitorManager = ServerMonitorManager.getInstance();
-          IMonitoredServerPort[] monitoredPorts = serverMonitorManager.getMonitoredPorts(server);
-          for (int it2 = 0; it2 < monitoredPorts.length; it2++) {
-            IMonitoredServerPort imsPort = monitoredPorts[it2];
-            if (port.getPort() == imsPort.getServerPort().getPort() && hasContentWebServices(imsPort)) // port
-            // already
-            // being
-            // monitored
-            {
-              if (!imsPort.isStarted()) {
-                try {
-                  serverMonitorManager.startMonitor(imsPort);
-                }
-                catch (CoreException ce) {
-                  MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-                  IStatus error = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR",
-                                                           new Object[] { String.valueOf(port.getPort()), server.getName()}), ce);
-                  env.getStatusHandler().reportError(error);
-                  return error;
-                }
-              }
-              monitoredPort = new Integer(imsPort.getMonitorPort());
-              return Status.OK_STATUS;
-            }
-          }
-          try {
-            IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES});
-            serverMonitorManager.startMonitor(imsPort);
-            monitoredPort = new Integer(imsPort.getMonitorPort());
-            return Status.OK_STATUS;
-          }
-          catch (CoreException ce) {
-            MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-            IStatus error = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[] {
-                                                     String.valueOf(port.getPort()), server.getName()}), ce);
-            env.getStatusHandler().reportError(error);
-            return error;
-          }
-        }
-
-        else {
-          MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-          IStatus info = StatusUtils.infoStatus( msgUtils.getMessage("MSG_INFO_MONITORING_NOT_SUPPORTED",
-                                                 new Object[] { server.getName()}) );
-          env.getStatusHandler().reportInfo(info);
-          return info;
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-
-  private boolean hasContentWebServices(IMonitoredServerPort imsPort) {
-    String[] contents = imsPort.getContentTypes();
-    for (int i = 0; i < contents.length; i++)
-      if (WEB_SERVICES.equals(contents[i])) return true;
-    return false;
-  }
-
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) {
-    this.serviceServerInstanceId = typeRuntimeServer.getServerInstanceId();
-  }
-
-  public void setServiceServerInstanceId(String serviceServerInstanceId) {
-    this.serviceServerInstanceId = serviceServerInstanceId;
-  }
-
-  public Integer getMonitoredPort() {
-    return monitoredPort;
-  }
-
-  public void setMonitorService(Boolean value) {
-    monitorService = value;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
deleted file mode 100644
index ec3f32848..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class CreateServerCommand extends AbstractDataModelOperation
-{
-	private String serverFactoryId;
-	private String serverInstanceId;
-	
-	private MessageUtils msgUtils;
-	
-	/**
-	 * Creates a server of the factory id
-	 * Note1: Checking for server instance == null is done in the PreService/ClientInstallCommands
-	 * Note2: Reporting of errors is done in PreService/ClientInstallCommands; simply return the status.
-	 */
-	public CreateServerCommand(){
-		msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-		
-	}
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-		IStatus status = Status.OK_STATUS;
-		
-		if (serverFactoryId==null){
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_SERVER") );
-			return status;			
-		}
-		
-		IServerWorkingCopy serverWC = null;
-		IServer server = null;
-		try {
-			IServerType serverType = ServerCore.findServerType(serverFactoryId);
-			if (serverType!=null) {
-				
-				//Choose a Runtime which is not a stub
-				IRuntime nonStubRuntime = null;
-				IRuntime[] runtimes = ServerUtil.getRuntimes(null, null);
-				String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-				for (int i = 0; i < runtimes.length; i++) {
-					IRuntime runtime = runtimes[i];
-					String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-					if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
-				        //Found an appropriate IRuntime that is not a stub
-						nonStubRuntime = runtime;
-						break;
-					}
-				}				
-				
-				if (nonStubRuntime==null)
-				{					
-					status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_STUB_ONLY",new String[]{serverFactoryId}) );
-					return status;					
-				}
-				
-				if (env!=null)
-				{
-					serverWC = serverType.createServer(null, null, nonStubRuntime, monitor );
-				}
-				else
-				{					
-					serverWC = serverType.createServer(null, null, nonStubRuntime, null);
-				}
-				
-				if (serverWC != null) {
-					if (env!=null)
-						server = serverWC.saveAll(true, monitor );
-					else
-						server = serverWC.saveAll(true, null);
-				}
-			}
-		} catch (CoreException ce) {
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_SERVER"), ce);
-			return status;
-		}
-		
-		// set serverInstanceId
-		if (server!=null)
-			serverInstanceId = server.getId();
-		else {
-			status = StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_CREATE_SERVER") );			
-		}
-		
-		return status;
-	}
-
-	public void setServerFactoryid(String serverFactoryId)
-	{
-		this.serverFactoryId = serverFactoryId;
-	}
-
-	public String getServerInstanceId()
-	{
-		return serverInstanceId;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
deleted file mode 100644
index 00da2f1d5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,69 +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.consumption.command.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DisableBuildCommand extends AbstractDataModelOperation 
-{
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  /**
-   * CTOR;
-   */
-  public DisableBuildCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    IStatus status = Status.OK_STATUS;
-
-    ProgressUtils.report( monitor, msgUtils_.getMessage("TASK_DESC_WEBSERVICE_DISABLE_BUILD"));
-
-    if (manager_!=null) {
-      manager_.disableAutoBuild();
-    }
-    return status;
-  }
-
-  /**
-   * Set the model
-   * 
-   * @param model
-   */
-  public void setModel(Model model) {
-  }  
-  
-  
-  /**
-   * @param manager_ The manager_ to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
deleted file mode 100644
index 29df06f97..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
+++ /dev/null
@@ -1,66 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-
-
-public class DisableValidationCommand extends AbstractDataModelOperation 
-{
-
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  private IProject serviceProject_;
-
-  /**
-   * CTOR;
-   */
-  public DisableValidationCommand() {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    IStatus status = Status.OK_STATUS;
-
-    ProgressUtils.report(monitor, msgUtils_.getMessage("TASK_DESC_WEBSERVICE_DISABLE_VALIDATION"));
-
-    IProject project = serviceProject_;
-    if (project != null) manager_.disableValidationForProject(project);
-
-    return status;
-  }
-
-  /**
-   * @param manager_
-   *            The manager_ to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-  
-  public void setServiceProject(IProject serviceProject){
-    this.serviceProject_ = serviceProject;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
deleted file mode 100644
index 8b0fe353d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
+++ /dev/null
@@ -1,206 +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.consumption.command.common;
-
-// TODO: Get rid of this. A replacement is in org.eclipse.wst.ws.
-
-import java.net.MalformedURLException;
-import java.net.URL;
-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.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends AbstractDataModelOperation
-{
-  private boolean monitorService;
-  private boolean create;
-  private WebServicesParser webServicesParser;
-  private String wsdlURI;
-  private List endpoints;
-
-  public GetMonitorCommand()
-  {
-    monitorService = true;
-    create = true;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-    endpoints = new Vector();
-    if (monitorService && webServicesParser != null && wsdlURI != null && wsdlURI.length() > 0)
-    {
-      Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
-      if (definition != null)
-      {
-        Map services = definition.getServices();
-        for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
-        {
-          Service service = (Service)servicesIt.next();
-          Map ports = service.getPorts();
-          for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
-          {
-            Port wsdlPort = (Port)portsIt.next();
-            List extElements = wsdlPort.getExtensibilityElements();
-            for (Iterator extElementsIt = extElements.iterator(); extElementsIt.hasNext();)
-            {
-              ExtensibilityElement extElement = (ExtensibilityElement)extElementsIt.next();
-              String endpoint = null;
-              URL endpointURL = null;
-              if (extElement instanceof SOAPAddress)
-                endpoint = ((SOAPAddress)extElement).getLocationURI();
-              else if (extElement instanceof HTTPAddress)
-                endpoint = ((HTTPAddress)extElement).getLocationURI();
-              if (endpoint != null)
-              {
-                try
-                {
-                  endpointURL = new URL(endpoint);
-                }
-                catch (MalformedURLException murle)
-                {
-                }
-              }
-              if (endpointURL != null)
-              {
-                String protocol = endpointURL.getProtocol();
-                String host = endpointURL.getHost();
-                int port = endpointURL.getPort();
-                if (port == -1)
-                {
-                  if ("http".equalsIgnoreCase(protocol))
-                    port = 80;
-                  else if ("https".equalsIgnoreCase(protocol))
-                    port = 443;
-                }
-                if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1)
-                {
-                  IMonitor m = null;
-                  IMonitor[] monitors = MonitorCore.getMonitors();
-                  for (int i=0; i<monitors.length; i++)
-                  {
-                    if (host.equalsIgnoreCase(monitors[i].getRemoteHost()) && port == monitors[i].getRemotePort())
-                    {
-                      m = monitors[i];
-                      break;
-                    }
-                  }
-                  if (m == null && create)
-                  {
-                    int monitoredPort = SocketUtil.findUnusedPort(5000, 15000);
-                    IMonitorWorkingCopy monitorWorkingCopy = MonitorCore.createMonitor();
-                    monitorWorkingCopy.setLocalPort(monitoredPort);
-                    monitorWorkingCopy.setRemoteHost(host);
-                    monitorWorkingCopy.setRemotePort(port);
-                    monitorWorkingCopy.setProtocol("HTTP");
-                    try
-                    {
-                      m = monitorWorkingCopy.save();
-                    }
-                    catch (Throwable t)
-                    {
-                      IStatus warning = StatusUtils.warningStatus( WebServiceConsumptionPlugin.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[]{String.valueOf(port), endpoint}), t);
-                      try
-                      {
-                        if (env != null)
-                          env.getStatusHandler().report(warning);
-                      }
-                      catch (StatusException se)
-                      {
-                      }
-                    }
-                  }
-                  if (m != null)
-                  {
-                    try
-                    {
-                      if (!m.isRunning())
-                        m.start();
-                      StringBuffer sb = new StringBuffer(endpointURL.getProtocol());
-                      sb.append("://localhost:");
-                      sb.append(String.valueOf(m.getLocalPort()));
-                      sb.append(endpointURL.getFile());
-                      endpoints.add(sb.toString());
-                    }
-                    catch (Throwable t)
-                    {
-                      IStatus warning = StatusUtils.warningStatus( WebServiceConsumptionPlugin.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[]{String.valueOf(port), endpoint}), t);
-                      try
-                      {
-                        if (env != null)
-                          env.getStatusHandler().report(warning);
-                      }
-                      catch (StatusException se)
-                      {
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return Status.OK_STATUS;
-  }
-
-  public void setMonitorService(boolean monitorService)
-  {
-    this.monitorService = monitorService;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-  }
-
-  public void setWebServicesParser(WebServicesParser webServicesParser)
-  {
-    this.webServicesParser = webServicesParser;
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-    this.wsdlURI = wsdlURI;
-  }
-
-  public void setCreate(boolean create)
-  {
-    this.create = create;
-  }
-
-  public List getEndpoints()
-  {
-    return endpoints;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
deleted file mode 100644
index 0c7c54b0c..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
+++ /dev/null
@@ -1,118 +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.consumption.command.common;
-
-
-//core stuff
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-
-
-/**
-* This class is to be used to Build the data model
-* first we get the java class and then build the model
-*/
-public class JavaMofReflectionCommand extends AbstractDataModelOperation
-{
-
-  public static String LABEL = "JavaMofReflectionCommand"; 
-  public static String DESCRIPTION = "reflection for a given class"; 
-  public static String OK_MESSAGE =  "The model has been built "; 
-  private static String JAVA_EXTENSION = ".java";
-  private static String CLASS_EXTENSION = ".class";
-  
-  private String clientProject;
-  private ResourceSet resourceSet;
-  private JavaHelpers javaClass;
-  private String qname;
-  private String proxyBean;
- 
-  /**
-  * Constructs a new JavaMofReflectionCommand with the given label and description
-  * 
-  */
-  public JavaMofReflectionCommand()
-  {
-  }
-  
-  // setters for this command
-  
-    
-  /**
-  * The end result of this whole process is to get the Java Class
-  */
-  public JavaHelpers getJavaClass()
-  {
-    return javaClass;
-  }
-
-  
-  private void processQName()
-  {
-      qname = proxyBean;
-	  if (qname.toLowerCase().endsWith(JAVA_EXTENSION)) {
-		  qname = qname.substring(0,(qname.length() -5));
-	  }
-	  if (qname.toLowerCase().endsWith(CLASS_EXTENSION)) {
-		  qname = qname.substring(0,(qname.length() -6));
-	  }
-   }
-      
-  /**
-  * Get the java model from the resource then 
-  * build the model from the mof
-  */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
- 	  //just make sure the project and qname are there
-  	//they are essential for this operation
-  	IStatus status = Status.OK_STATUS;
-  	IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject);
-  	processQName();
-  	if(clientProject == null || qname == null)
-  	  return StatusUtils.warningStatus( WebServiceConsumptionPlugin.getMessage("%MSG_WARN_UNABLE_TO_FIND_PROXY") );
-  	
-    JavaEMFNature nature = (JavaEMFNature)JavaEMFNature.getRuntime(clientIProject);
-    if(nature == null){
-      try{
-        nature = (JavaEMFNature)JavaEMFNature.createRuntime(clientIProject);  	
-      }catch(CoreException exc){}
-    }
-    resourceSet = nature.getResourceSet();
-    javaClass = JavaRefFactory.eINSTANCE.reflectType(qname,resourceSet);
-    
-    return status;
-  }
-  
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
deleted file mode 100644
index fbba7a6b5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
+++ /dev/null
@@ -1,151 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IServer;
-
-/**
- * @author sengpl
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ManageServerStartUpCommand extends AbstractDataModelOperation
-{
-
-	private MessageUtils msgUtils_;
-	
-	private Boolean isStartServiceEnabled_;
-	private Boolean isTestServiceEnabled_;
-	
-	private IProject serviceProject_;
-	private String serviceServerTypeId_;
-	private IServer serviceExistingServer_;
-	
-	private IProject sampleProject_;
-	private String sampleServerTypeId_;
-	private IServer sampleExistingServer_;
-	
-	private boolean isWebProjectStartupRequested_;
-	private String  moduleName_;
-
-	/**
-	 * Default CTOR;
-	 */
-	public ManageServerStartUpCommand( String moduleName ) {
-		String pluginId = "org.eclipse.jst.ws.consumption";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-		
-		moduleName_ = moduleName;
-	}
-	
-	/**
-	 * Execute the command
-	 */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      Environment env = getEnvironment();
-	    IStatus status = Status.OK_STATUS;
-	    ProgressUtils.report(monitor, msgUtils_.getMessage("PROGRESS_INFO_START_WEB_PROJECT"));
-	 
-	    if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){
-	    	//System.out.println("Calling service server start: "+serviceProject_+"  "+serviceServerTypeId_);
-	    	StartProjectCommand spc = new StartProjectCommand( moduleName_ );
-	    	spc.setServiceProject(serviceProject_);
-	    	spc.setServiceServerTypeID(serviceServerTypeId_);
-	    	spc.setServiceExistingServer(serviceExistingServer_);
-	    	spc.setIsWebProjectStartupRequested(isWebProjectStartupRequested_);
-        spc.setEnvironment( env );
-	    	spc.execute( null, null );
-	    }
-	    
-	    if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){
-	    	//System.out.println("Calling client server start: "+sampleProject_+"  "+sampleExistingServer__);
-	    	StartProjectCommand spc = new StartProjectCommand( moduleName_ );
-	    	spc.setSampleProject(sampleProject_);
-	    	spc.setSampleServerTypeID(sampleServerTypeId_);
-	    	spc.setSampleExistingServer(sampleExistingServer_);
-	    	spc.setCreationScenario(new Boolean("false"));
-        spc.setEnvironment( env );
-	    	spc.execute( null, null );	    	
-	    }
-	    
-	    return status;
-	}
-	
-	/**
-	 * @param isStartServiceEnabled The isStartServiceEnabled to set.
-	 */
-	public void setStartService(Boolean isStartServiceEnabled) {
-		this.isStartServiceEnabled_ = isStartServiceEnabled;
-	}
-	/**
-	 * @param isTestServiceEnabled The isTestServiceEnabled to set.
-	 */
-	public void setTestService(Boolean isTestServiceEnabled) {
-		this.isTestServiceEnabled_ = isTestServiceEnabled;
-	}
-	/**
-	 * @param serviceExistingServer The serviceExistingServer to set.
-	 */
-	public void setServiceExistingServer(IServer serviceExistingServer) {
-		this.serviceExistingServer_ = serviceExistingServer;
-	}
-
-	/**
-	 * @param serviceServerTypeId The serviceServerTypeId to set.
-	 */
-	public void setServiceServerTypeId(String serviceServerTypeId) {
-		this.serviceServerTypeId_ = serviceServerTypeId;
-	}
-	/**
-	 * @param serviceProject The serviceProject to set.
-	 */
-	public void setServiceProject(IProject serviceProject) {
-		this.serviceProject_ = serviceProject;
-	}
-	
-	/**
-	 * @param sampleExistingServer The sampleExistingServer to set.
-	 */
-	public void setSampleExistingServer(IServer sampleExistingServer) {
-		this.sampleExistingServer_ = sampleExistingServer;
-	}
-	/**
-	 * @param sampleProject The sampleProject to set.
-	 */
-	public void setSampleProject(IProject sampleProject) {
-		this.sampleProject_ = sampleProject;
-	}
-	/**
-	 * @param sampleServerTypeId The sampleServerTypeId to set.
-	 */
-	public void setSampleServerTypeId(String sampleServerTypeId) {
-		this.sampleServerTypeId_ = sampleServerTypeId;
-	}	
-	
-	/**
-	 * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
-	 */
-	public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
-		this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-	}	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
deleted file mode 100644
index 765a7c70d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
+++ /dev/null
@@ -1,108 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.server.core.IServer;
-
-public class PublishProjectCommand extends AbstractDataModelOperation 
-{
-
-private MessageUtils msgUtils_;
-
-private String project;
-private String serverTypeID;
-private IServer existingServer;
-
-
-/**
- * Default CTOR;
- */
-public PublishProjectCommand() {
-  String pluginId = "org.eclipse.jst.ws.consumption";
-  msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  Environment env = getEnvironment();
-  
-  IStatus status = Status.OK_STATUS;
-  try
-  {
-    ProgressUtils.report( monitor, msgUtils_.getMessage( "PROGRESS_INFO_PUBLISH_WEB_PROJECT" ) );
-    
-    if (project == null){
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND") ); 
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-	
-    IProject iProject = (IProject)ResourceUtils.findResource(project);
-    IServer instance = ServerUtils.getServerForModule(ResourceUtils.getModule(iProject), serverTypeID, existingServer, true, monitor);
-    if (instance == null)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-      IStatus returnedStatus = instance.publish(IServer.PUBLISH_INCREMENTAL, monitor);
-      status = returnedStatus;
-      
-      //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor()));
-      env.getLog().log(Log.OK, 5026, this, "execute", new String("project="+project+" successfully published"));
-      //Log.write(PublishProjectCommand.class,"execute",Log.OK,"project="+project+" successfully published");
-      return status;
-  }
-  catch (Exception e) {
-    status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PUBLISH"), e);
-    env.getStatusHandler().reportError(status);
-    return status;
-
-  }
-}
-
-
-public void setProject(String project)
-{
-  this.project = project;
-}
-
-public void setServerTypeID(String serverTypeID)
-{
-  this.serverTypeID = serverTypeID;
-}
-
-public void setExistingServer(IServer existingServer)
-{
-  this.existingServer = existingServer;
-}
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
deleted file mode 100644
index 1f4baa353..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
+++ /dev/null
@@ -1,59 +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.consumption.command.common;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-
-
-public class RestoreBuildStateCommand extends AbstractDataModelOperation
-{
-
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  
-  /**
-   * Default CTOR;
-   */
-  public RestoreBuildStateCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    ProgressUtils.report( monitor, msgUtils_.getMessage("TASK_DESC_WEBSERVICE_RESTORE_BUILD"));
-
-    manager_.restoreAutoBuild();
-
-    return Status.OK_STATUS;
-  }
-    
-  /**
-   * @param manager_ The manager_ to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
deleted file mode 100644
index f9b77c806..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
+++ /dev/null
@@ -1,62 +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.consumption.command.common;
-
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-
-
-public class RestoreValidationStateCommand extends AbstractDataModelOperation 
-{
-  private MessageUtils msgUtils_;
-  private ValidationManager manager_;
-  
-  private boolean runValidation_;
-
-  /**
-   * Default CTOR;
-   */
-  public RestoreValidationStateCommand( boolean runValidation )
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
-    runValidation_ = runValidation;
-  }
-
-  /**
-   * Execute the command
-   */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    ProgressUtils.report( monitor, msgUtils_.getMessage("TASK_DESC_WEBSERVICE_RESTORE_VALIDATION"));
-
-    manager_.restoreValidationForProjects( runValidation_ );    
-
-    return Status.OK_STATUS;
-  }
-    
-  /**
-   * @param manager The validation manager to set.
-   */
-  public void setValidationManager(ValidationManager manager) {
-    this.manager_ = manager;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
deleted file mode 100644
index dd47c623b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
+++ /dev/null
@@ -1,164 +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.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartProjectCommand extends AbstractDataModelOperation 
-{
-
-private MessageUtils msgUtils_;
-
-private Boolean creationScenario_ = Boolean.TRUE;
-
-private boolean isWebProjectStartupRequested_;
-private IProject serviceProject_;
-private IProject sampleProject_;
-private String serviceServerTypeID_;
-private String sampleServerTypeID_;
-private IServer serviceExistingServer_;
-private IServer sampleExistingServer_;
-private String  moduleName_;
-
-// rm private Model model_;
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand( String moduleName ) {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	moduleName_ = moduleName;
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	creationScenario_ = new Boolean(creationScenario);
-}
-
-/**
- * Execute the command
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-    Environment env = getEnvironment();    
-  
-    IStatus status = Status.OK_STATUS;
-    ProgressUtils.report( monitor, msgUtils_.getMessage("PROGRESS_INFO_START_WEB_PROJECT"));
-    
-    
-    IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
-    String serverTypeID = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
-    IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);   
-    if (serverTypeID == null && server!=null) {
-    	serverTypeID = server.getServerType().getId();
-    }
-    if (project == null)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND") );  
-      env.getStatusHandler().reportError(status);
-      return status;
-    }	
-    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project, moduleName_), serverTypeID, server, true, monitor );
-    if (instance == null)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-   try
-   	{
-   		AbstractStartServer startServerCommand = null;
-   		WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
-     	startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(instance.getServerType().getId());
-    	startServerCommand.StartServer(project, instance, monitor, isWebProjectStartupRequested_);
-    	return status;
-   	}
-  catch (CoreException ce )
-  	{
-    	IStatus embeddedStatus = ce.getStatus();
-    	status = embeddedStatus;
-    	env.getStatusHandler().reportError(status);
-  		return status;
-  	}
-   catch (Exception e)
-   	{
-       status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), e);
-       env.getStatusHandler().reportError(status);
-   	   return status;
-   	}
-   
-}
-
-public void setCreationScenario(Boolean creationScenario)
-{
-	creationScenario_ = creationScenario;
-}
-
-public void setServiceProject(IProject serviceProject)
-{
-  serviceProject_ = serviceProject;
-}
-
-public void setSampleProject(IProject sampleProject)
-{
-  sampleProject_ = sampleProject;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID)
-{
-  serviceServerTypeID_ = serviceServerTypeID;
-}
-
-public void setSampleServerTypeID(String sampleServerTypeID)
-{
-  sampleServerTypeID_ = sampleServerTypeID;
-}
-
-public void setServiceExistingServer(IServer serviceExistingServer)
-{
-  serviceExistingServer_ = serviceExistingServer;
-  if (serviceExistingServer_ != null)
-    setServiceServerTypeID(serviceExistingServer_.getServerType().getId());
-}
-
-public void setSampleExistingServer(IServer sampleExistingServer)
-{
-  sampleExistingServer_ = sampleExistingServer;
-  if (sampleExistingServer_ != null)
-    setSampleServerTypeID(sampleExistingServer_.getServerType().getId());
-}
-
-public void setIsWebProjectStartupRequested(boolean webProjectStartupRequested)
-{
-  isWebProjectStartupRequested_ = webProjectStartupRequested;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
deleted file mode 100644
index 54cd1a007..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
+++ /dev/null
@@ -1,252 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.adaptor.EclipseLog;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * (Re)Starts and publishes the server specifed by the serverInstanceId attribute.
- * 
- *
- */
-public class StartServerCommand extends AbstractDataModelOperation
-{
-  private MessageUtils msgUtils_;
-  private Log log;
-  private boolean forcePublish_;
-  private boolean doAsyncPublish_;
-  
-	private String serverInstanceId;
-	
-  
-	public StartServerCommand()
-  {
-    String pluginId = "org.eclipse.jst.ws.consumption";
-    msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-    log             = EnvironmentService.getEclipseLog();
-    forcePublish_   = false;
-    doAsyncPublish_ = true;
-  }
-	 
-  public StartServerCommand( boolean forcePublish, boolean doAsyncPublish )
-  {
-    this();
-    
-    forcePublish_   = forcePublish;
-    doAsyncPublish_ = doAsyncPublish;
-  }
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    IStatus status = Status.OK_STATUS;
-
-    IServer server = ServerCore.findServer(serverInstanceId);
-    if (server == null)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
-      env.getStatusHandler().reportError(status);
-      return status;
-    }
-
-    int serverState = server.getServerState();
-    int publishState = server.getServerPublishState();
-    
-    //Publish if required
-    switch (publishState)
-    {
-      case IServer.PUBLISH_STATE_INCREMENTAL:
-        if (server.canPublish().getSeverity() == IStatus.OK)
-        {
-          status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }
-        }    
-        break;
-      case IServer.PUBLISH_STATE_FULL:
-        if (server.canPublish().getSeverity() == IStatus.OK)
-        {
-          status = publish(server, IServer.PUBLISH_FULL, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }
-        }
-        break;
-        
-      case IServer.PUBLISH_STATE_UNKNOWN:
-        if (server.canPublish().getSeverity() == IStatus.OK)
-        {
-          status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }
-        }
-        break;  
-
-        //TODO: Reassess need for this, since Tomcat should know
-        // whether it needs to be published or not (or publish should
-        // simply always be driven by us.
-        case IServer.PUBLISH_STATE_NONE:
-        {
-          if( forcePublish_ )
-          {
-            status = publish(server, IServer.PUBLISH_INCREMENTAL, monitor );
-            
-            if (status.getSeverity() == Status.ERROR)
-            {
-              env.getStatusHandler().reportError(status);
-              return status;
-            }  
-          }
-          
-    	  break;  
-        }
-      
-        default:
-    }
-
-
-    switch (serverState)
-    {
-      case IServer.STATE_STOPPED:
-        if (server.canStart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
-        {
-          status = start(server, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }       
-        }
-        break;
-      case IServer.STATE_STARTED:    	
-    	boolean shouldRestart = server.getServerRestartState();    	
-    	//TODO Ideally getServerRestartState() returning true should be a sufficient
-    	//condition for us to restart. However, getServerRestartState() seems to 
-    	//sometimes pessimistically return true when it doesn't need to for Tomcat 
-    	//servers. In order to curb the number of restarts, we will only 
-    	//restart if a publish was required earlier in this execute method AND 
-    	//getServerRestartState() returns true. 
-    	//A publish is normally required when a module is added to the server.
-    	
-    	if (publishState != IServer.PUBLISH_STATE_NONE && shouldRestart && server.canRestart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)    	  
-        {
-          status = restart(server, monitor );
-          if (status.getSeverity() == Status.ERROR)
-          {
-            env.getStatusHandler().reportError(status);
-            return status;
-          }       
-        }
-    }
-    
-    return status;
-  }
-
-  private IStatus publish(final IServer server, final int kind, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;
-    final IStatus[] istatus = new IStatus[1]; 
-    monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_PUBLISHING_SERVER"));
-    IRunnableWithProgress runnable = new IRunnableWithProgress()
-	{
-  		public void run(IProgressMonitor shellMonitor) throws InvocationTargetException, InterruptedException
-		{
-  			istatus[0] = server.publish(kind, shellMonitor);
-		}  		
-	};
-	
-	try
-	{
-		if( doAsyncPublish_ )
-		{	
-		  PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
-		}
-		else
-		{
-		  runnable.run( monitor );
-		}
-		
-	}
-	catch(InvocationTargetException ite)
-	{
-	  istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ite.getMessage(), ite );
-	  ite.printStackTrace();
-	}
-	catch(InterruptedException ie)
-	{
-	  istatus[0] = new org.eclipse.core.runtime.Status( IStatus.ERROR, "id", 0, ie.getMessage(), ie );
-	  ie.printStackTrace();
-	}
-    
-    
-	if (istatus[0].getSeverity() != IStatus.OK)
-    {
-      status = istatus[0];
-      return status;
-    }
-    
-    log.log(Log.INFO, 5051, this, "publishProject", "IServer=" + server + ", Publish command completed");
-    return status;
-  }
-
-  private IStatus restart(IServer server, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;
-    try
-    {
-      monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_STARTING_SERVER"));
-      server.synchronousRestart(ILaunchManager.RUN_MODE, monitor);
-      log.log(Log.INFO, 5052, this, "execute", "IServer=" + server + ", Restart command completed");
-      return status;
-    } catch (CoreException e)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), e);
-      return status;
-    }
-
-  }
-
-  private IStatus start(IServer server, IProgressMonitor monitor )
-  {
-    IStatus status = Status.OK_STATUS;
-    try
-    {
-      monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_STARTING_SERVER"));
-      server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
-      log.log(Log.INFO, 5053, this, "execute", "IServer=" + server + ", Start command completed");
-      return status;
-    } catch (CoreException e)
-    {
-      status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), e);
-      return status;
-    }
-  }
-
-  public void setServerInstanceId(String serverInstanceId)
-  {
-    this.serverInstanceId = serverInstanceId;
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
deleted file mode 100644
index ead065dc7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,93 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class FolderResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" and "<code>.class</code>" objects.
-  * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
-  */
-  public FolderResourceFilter () { }
-
- /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_DESC");
-  }
-
- public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FOLDER)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FOLDER",new Object[] {name}),
-          null
-        );
-      }
-    }
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
deleted file mode 100644
index fc1f1d910..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
+++ /dev/null
@@ -1,36 +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.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * Implement this interface to provide logic that can be plugged into
- * the server defaulting algorithm. 
- * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point)  
- */
-public interface IServerDefaulter
-{
-  
-  /**
-   * @param project
-   * @return ServerInfo. 
-   * If no existing server or server type is recommended, return null.
-   * If a server type is recommended, return an instance of ServerInfo with a non-null
-   * non-empty String for the serverFactoryId and null for the serverInstanceId.
-   * If a server instance is recommended, return an instance of ServerInfo with a non-null
-   * non-empty String for the serverFactoryId and the serverInstanceId.
-   */
-  public ServerInfo recommendDefaultServer(IProject project);
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
deleted file mode 100644
index fc44f9161..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,169 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class JavaResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * A <code>JavaResourceFilter</code> constructed with this value will
-  * accept "<code>.java</code>", but not "<code>.class</code>", objects.
-  */
-  public static final byte JAVA_FILES = (byte)1;
-
-  /**
-  * A <code>JavaResourceFilter</code> constructed with this value will
-  * accept "<code>.class</code>", but not "<code>.java</code>", objects.
-  */
-  public static final byte CLASS_FILES = (byte)2;
-
-  /**
-  * A <code>JavaResourceFilter</code> constructed with this value will
-  * accept both "<code>.java</code>" and "<code>.class</code>" objects.
-  */
-  public static final byte ALL_FILES = (byte)255;
-
-  private byte extensions_;
-
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" and "<code>.class</code>" objects.
-  * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
-  */
-  public JavaResourceFilter ()
-  {
-    this(ALL_FILES);
-  }
-
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" objects, "<code>.class</code>" objects,
-  * or both if the value of <code>extensions</code> is
-  * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}
-  * respectively.
-  * @param extensions One of
-  * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}.
-  */
-  public JavaResourceFilter ( byte extensions )
-  {
-    extensions_ = extensions;
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * indicating whether or not if the given <code>object</code>
-  * represents a Java resource.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FILE)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
-          null
-        );
-      }
-    }
-
-    if (name == null)
-    {
-      name = object.toString();
-    }
-
-    if (!acceptsName(name))
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
-        null
-      );
-    }
-
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-
-  //
-  // Checks if the given name is acceptable based upon its extension
-  // and the value of the extensions_ bitmask.
-  //
-  private boolean acceptsName ( String name )
-  {
-    return ( 
-      (name.endsWith(".java") && ((extensions_ & JAVA_FILES) != 0)) ||
-      (name.endsWith(".class") && ((extensions_ & CLASS_FILES) != 0))
-    );
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
deleted file mode 100644
index 10650e5d7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
+++ /dev/null
@@ -1,84 +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.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-
-
-/**
-* This class contains useful methods for working with Server plugin functions
-*/
-public final class MappingUtils
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private static final String DEFAULT_SERVICE_EXT = "Service.wsdl";
-  private static final String DEFAULT_BINDING_EXT = "Binding.wsdl";
-  private static final String DEFAULT_V4_SERVICE_EXT = "-service.wsdl";
-  private static final String DEFAULT_V4_BINDING_EXT = "-binding.wsdl";
-  private static final String WSDL_EXTENSION = ".wsdl";
-  private static final String WSDL_FOLDER = "wsdl";
-  public static final String DEFAULT_SKELETON_PACKAGENAME = "service";
-
-  /**
-  * Returns the WSDL folder path
-  * @param project the project
-  */
-  public static IPath getWSDLFolderPath (IProject project, String componentName)
-  {
-    IPath wsdlFolder=null;
-//  	IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
-  	IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project, componentName);
-  	if (webModuleServerRoot != null )
-  		wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER);
-    return wsdlFolder;
-  }
-    
-
-   /**
-  * Returns the base name based on WSDL file name
-  * @param wsdlName WSDL file name
-  */
-  public static String getBaseName (String wsdlLocation )
-  {
-  	String wsdlName=wsdlLocation;
-  	
-  	int index = wsdlLocation.lastIndexOf('/');
-    if (index!= -1) {
-      wsdlName = wsdlLocation.substring(index+1,wsdlName.length());
-    }
-    
-    String baseName=wsdlName;
-    if ( wsdlName.endsWith(DEFAULT_SERVICE_EXT) ) {
-      baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_SERVICE_EXT.length()));
-    } else if ( wsdlName.toLowerCase().endsWith(DEFAULT_V4_SERVICE_EXT) ) {
-      baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_V4_SERVICE_EXT.length()));
-    } else if (wsdlName.endsWith(DEFAULT_BINDING_EXT)) {
-      baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_BINDING_EXT.length()));
-    } else if (wsdlName.toLowerCase().endsWith(DEFAULT_V4_BINDING_EXT)) {
-      baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_V4_BINDING_EXT.length()));
-    } else if (wsdlName.toLowerCase().endsWith(WSDL_EXTENSION)) {
-    	baseName = wsdlName.substring(0,(wsdlName.length() - WSDL_EXTENSION.length()));
-    } else {
-      // no recognizable suffix, just remove extension, if any
-      int index4 = baseName.lastIndexOf('.');
-      if (index4!=-1)
-        baseName = baseName.substring(0, index4);
-    }
-    return baseName;
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
deleted file mode 100644
index 146b2f1c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
+++ /dev/null
@@ -1,125 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class PropertiesResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  /**
-  * Constructs a new <code>JavaResourceFilter</code> that filters
-  * "<code>.java</code>" and "<code>.class</code>" objects.
-  * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
-  */
-  public PropertiesResourceFilter ()
-  {
-    
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * indicating whether or not if the given <code>object</code>
-  * represents a Java resource.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FILE)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
-          null
-        );
-      }
-    }
-
-    if (name == null)
-    {
-      name = object.toString();
-    }
-
-	if (!name.endsWith(".properties"))
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
-        null
-      );
-    }
-
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java
deleted file mode 100644
index 67bd29dcc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java
+++ /dev/null
@@ -1,45 +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.consumption.common;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
- *  This command is intended to clean up data after either the
- *  client or service wizards.  Currently is just resets the
- *  parser factory. 
- *
- */
-public class ScenarioCleanupCommand extends AbstractDataModelOperation
-{
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  WSDLParserFactory.killParser();
-	
-	  return Status.OK_STATUS;
-  }
-
-  
-  public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  // Even if the user cancels out of the wizard we want to
-	  // kill the parser.
-	  WSDLParserFactory.killParser();
-    
-    return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
deleted file mode 100644
index 0625cb2e3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
+++ /dev/null
@@ -1,54 +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
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.common;
-
-/**
- *
- */
-public class ServerInfo
-{
-  String serverFactoryId;
-  String serverInstanceId;
-  /**
-   * @return Returns the serverFactoryId.
-   */
-  public String getServerFactoryId()
-  {
-    return serverFactoryId;
-  }
-  /**
-   * @param serverFactoryId The serverFactoryId to set.
-   */
-  public void setServerFactoryId(String serverFactoryId)
-  {
-    this.serverFactoryId = serverFactoryId;
-  }
-  /**
-   * @return Returns the serverInstanceId.
-   */
-  public String getServerInstanceId()
-  {
-    return serverInstanceId;
-  }
-  /**
-   * @param serverInstanceId The serverInstanceId to set.
-   */
-  public void setServerInstanceId(String serverInstanceId)
-  {
-    this.serverInstanceId = serverInstanceId;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
deleted file mode 100644
index a6dd1815a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
+++ /dev/null
@@ -1,49 +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.consumption.common;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * 
- * The factory class can be used to get at a single instance of the
- * WSDL parser.  Note:  This class is temporary.  We will probably come
- * up with a better method of handling passing around the parser.
- *
- */
-//TODO We need to find a better way to pass around the parser than
-//     using this singleton factory.  Hopefully, we can then delete
-//     this class.
-public class WSDLParserFactory 
-{
-  private static WebServicesParserExt parser_;
-  
-  private WSDLParserFactory()
-  {
-  }
-  
-  public static WebServicesParser getWSDLParser()
-  {
-    if( parser_ == null )
-	{
-	  parser_ = new WebServicesParserExt();
-	}
-	
-	return parser_;
-  }
-  
-  public static void killParser()
-  {
-    parser_ = null;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
deleted file mode 100644
index 7872f6d3f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,120 +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.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a WSDL resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.wsdl</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class WSDLResourceFilter extends AnyFilter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Constructs a new <code>WSDLResourceFilter</code>.
-  */
-  public WSDLResourceFilter ()
-  {
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * indicating whether or not if the given <code>object</code>
-  * represents a WSDL resource.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    if (object == null)
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
-        null
-      );
-    }
-
-    String name = null;
-
-    if (object instanceof IResource)
-    {
-      IResource resource = (IResource)object;
-      name = resource.getFullPath().toString();
-      if (resource.getType() != IResource.FILE)
-      {
-        return new Status(
-          IStatus.ERROR,
-          WebServiceConsumptionPlugin.ID,
-          0,
-          WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
-          null
-        );
-      }
-    }
-
-    if (name == null)
-    {
-      name = object.toString();
-    }
-
-    if (!name.endsWith(".wsdl"))
-    {
-      return new Status(
-        IStatus.ERROR,
-        WebServiceConsumptionPlugin.ID,
-        0,
-        WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
-        null
-      );
-    }
-
-    return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
deleted file mode 100644
index 946e98b68..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
+++ /dev/null
@@ -1,100 +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.consumption.common;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-
-
-
-/**
-* This is the registry of WebServiceStartServerType objects.
-*/
-public class WebServiceStartServerRegistry
-{
-
-  private static WebServiceStartServerRegistry instance_;
-  private Hashtable StartServerTypes;
-
-  //
-  // Loads WebServiceStartServerType objects into this registry.
-  // See method getInstance().
-  //
-  private void load ()
-  {
-    StartServerTypes = new Hashtable();
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption",
-                                     "webServiceStartServerType");
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      try 
-      {
-          String factoryId_ = elem.getAttribute("factoryId");
-		  StartServerTypes.put(factoryId_, elem);
-	  
-      } 
-      catch (Exception e)
-      {
-        Log log = EnvironmentService.getEclipseLog();
-        log.log(Log.ERROR, 5047, this, "load", e);
-      }
-      
-    }
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceStartServerRegistry object.
-  */
-  public static WebServiceStartServerRegistry getInstance ()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WebServiceStartServerRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-   public Object getServerStartByTypeId (String typeID) throws CoreException
-   {
-    if (typeID==null)
-      return null;
-    return ((IConfigurationElement)StartServerTypes.get(typeID)).createExecutableExtension("class");
-  }
-  
-   public boolean isRemoveEARRequired(String typeId) throws CoreException {
-   	if (typeId!=null) {
-   		IConfigurationElement elem = (IConfigurationElement)StartServerTypes.get(typeId);
-   		if (elem!=null){
-   			String value = elem.getAttribute("removeEAR");
-   			if (value!=null){
-   				return Boolean.valueOf(value).booleanValue();
-   			}
-   		}
-   	}
-	return true;   		 
-   }   
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
deleted file mode 100644
index c07aa7287..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
+++ /dev/null
@@ -1,99 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class ArrayElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static String ARRAY_NAME = "10101010array10101010";
-  public static String REL_METHODS = "relmethods";
- 
-  /**
-  * Constructor 
-  * @param projectElement The project this Bean belongs to.
-  */
-  public ArrayElement (String name)
-  {
-    this(name,new BasicModel("Project"),true);
-  }
-
-  /**
-  * Constructor 
-  * @param parameterElement The parameter this Bean belongs to.
-  */
-  public ArrayElement (String name, Model model,boolean isRoot)
-  {
-    super(name,model,TypeElement.ARRAY);
-    if(isRoot) model.setRootElement(this);
-    fOwnerType = TypeElement.ROOT;
-  }
-  
-  
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the bean element.
-  */
-  public ArrayElement ( ParameterElement parameterElement, String name)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public ArrayElement ( AttributeElement attributeElement, String name)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param FieldElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public ArrayElement ( FieldElement fieldElement, String name)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
-    fOwnerType = TypeElement.FIELD_OWNER;
-  }
-
-
-  /*
-  * determine wether this is an object array or
-  * primitive array
-  */
-  public String getTypeName()
-  {
-    return ARRAY_NAME + getName();
-  }
-
- 
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
deleted file mode 100644
index 0c7ce9c62..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
+++ /dev/null
@@ -1,62 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class ArrayType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public ArrayType(String typeName)
-  {
-    this(TypeFactory.ARRAY_NAME,typeName);
-  }
-
-  public ArrayType(String name,String typeName)
-  {
-    super(name);
-  } 
-
- 
-   /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-     
-    String nonBean = Generator.DOUBLE_TAB + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
-    	             + Generator.DOUBLE_TAB + "String temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
-    return nonBean;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
deleted file mode 100644
index c3cc514bb..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
+++ /dev/null
@@ -1,95 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class AttributeElement extends BasicElement implements AttributeElementType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNING_BEAN = "owningbean";
-
-  private String fSetterMethod;
-  private String fGetterMethod;
-
-  /**
-  * Constructor this takes the owning bean.
-  * @param name The name of the attribute.
-  * @param beanElement the bean that owns this attribute.
-  */
-  public AttributeElement ( BeanElement beanElement, String name)
-  {
-    super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_ATTRIBUTES);
-  }
-  
-  public void setSetterMethod(String setterMethod)
-  {
-    fSetterMethod = setterMethod;
-  }
-
-  public String getSetterMethod()
-  {
-    return fSetterMethod;
-  }
-
-  public String getGetterMethod()
-  {
-    return fGetterMethod;
-  }
- 
-  public void setGetterMethod(String getterMethod)
-  {
-    fGetterMethod = getterMethod;
-  }
-
-  public String getSetterSignature(String attribute)
-  {
-    int bracket = fSetterMethod.indexOf("(");
-    bracket++;
-    String setter = fSetterMethod.substring(0,bracket);
-    String fullSetter = setter + attribute + ");";
-   
-    return fullSetter;
-  }
-
-  /**
-  * Returns the Bean that owns this Attribute.
-  * @return BeanElement The bean that owns this attribute.
-  */
-  public BeanElement getOwningBeanElement ()
-  {
-    Enumeration e = getElements(REL_OWNING_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the type that is owned by this attributte.
-  * @return TypeElement The Type that of this attribute.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
deleted file mode 100644
index 0b0b6fc88..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
+++ /dev/null
@@ -1,39 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public interface AttributeElementType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public void setSetterMethod(String setterMethod);
-  public String getSetterMethod();
-  public String getGetterMethod();
-  public void setGetterMethod(String getterMethod);
-  public BeanElement getOwningBeanElement ();
-  public TypeElement getTypeElement ();
-  /**
-  * Return the signature with this value as the parmeter
-  *
-  */
-  public String getSetterSignature(String attribute);
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
deleted file mode 100644
index fc9c4f01f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
+++ /dev/null
@@ -1,123 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class BeanElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static String STATELESS_BEAN = "10101010statelessbean10101010";
-  public static String REL_METHODS = "relmethods";
- 
-  /**
-  * Constructor 
-  * @param projectElement The project this Bean belongs to.
-  */
-  public BeanElement (String name)
-  {
-    this(name,new BasicModel("Project"),true);
-  }
-
-  /**
-  * Constructor 
-  * @param parameterElement The parameter this Bean belongs to.
-  */
-  public BeanElement (String name, Model model,boolean isRoot)
-  {
-    super(name,model,TypeElement.BEAN);
-    if(isRoot) model.setRootElement(this);
-    fOwnerType = TypeElement.ROOT;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the bean element.
-  */
-  public BeanElement ( ParameterElement parameterElement, String name)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-  }
-
-  /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public BeanElement ( AttributeElement attributeElement, String name)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-  
-  }
-
-   /**
-  * Constructor for the case when this is not the root object
-  * here it represents complex types
-  * @param ParameterElement The Parameter that owns this bean type.
-  * @param String Name of the ParameterElement.
-  */
-  public BeanElement ( FieldElement fieldElement, String name)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
-    fOwnerType = TypeElement.FIELD_OWNER;
-  
-  }
-
-  /**
-  * Returns an enumeration of all Method objects of this Bean.
-  * @return Enumeration All Method objects of this Bean.
-  */
-  public Enumeration getMethods ()
-  {
-    return getElements(REL_METHODS);
-  }
-
-  /**
-  * Returns the number of Method objects of this Bean.
-  * @return int The number of Method objects of this Bean.
-  */
-  public int getNumberOfMethodElements ()
-  {
-    return getNumberOfElements(REL_METHODS);
-  }
-
-  public String getTypeName()
-  {
-    if(isStateLess()) return STATELESS_BEAN + getName();
-    return getName();
-  }
-
-  public boolean isStateLess()
-  {
-    Enumeration ea = getElements(TypeElement.REL_ATTRIBUTES);
-    Enumeration ef = getElements(TypeElement.REL_FIELDS);
-    if(ea.hasMoreElements() || ef.hasMoreElements()) return false;
-    else return true;
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
deleted file mode 100644
index 1ed79927a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
+++ /dev/null
@@ -1,168 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class BeanModelElementsFactory 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  public static final String RETURN_PARAM_NAME="returnp";
-
-  private BeanModelElementsFactory(){}
-
-  public static Element getBeanModelElement(Object object)
-  {
-    return BeanModelElementsFactory.getBeanModelElement(object,null,null);
-  }
-
-  public static Element getBeanModelElement(Object object,Element parentElement)
-  {
-    return BeanModelElementsFactory.getBeanModelElement(object,parentElement,null);
-  }
-  
- /*
-  * Take in an object and return an element depending on what 
-  * type we are dealing with from the javamof
-  **/
-  public static Element getBeanModelElement(Object object,Element parentElement, Model model)
-  {
-    Element returnElement = null;
-
-    if (object instanceof JavaClass){
-      JavaClass javaClass = (JavaClass)object;
-      String javaName = javaClass.getJavaName();
-      if (!javaClass.isArray()){ 
-	      if(parentElement == null && model ==null) returnElement = new BeanElement(javaName);
-	      else if(parentElement == null && model !=null) returnElement = new BeanElement(javaName,model,false);
-	      else{
-	        if(parentElement instanceof ParameterElement){ 
-	           ParameterElement tempElement = (ParameterElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-	        }
-	        else if(parentElement instanceof AttributeElement){
-	           AttributeElement tempElement = (AttributeElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof FieldElement){
-               FieldElement tempElement = (FieldElement)parentElement;
-	           returnElement = new BeanElement(tempElement,javaName);
-            }
-            else if(parentElement instanceof MethodElement){
-               returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-            }	         
-	      }
-      } 
-      else{
-          if(parentElement == null && model ==null) returnElement = new ArrayElement(javaName);
-	      else if(parentElement == null && model !=null) returnElement = new ArrayElement(javaName,model,false);
-	      else{
-	        if(parentElement instanceof ParameterElement){ 
-	           ParameterElement tempElement = (ParameterElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-	        else if(parentElement instanceof AttributeElement){
-	           AttributeElement tempElement = (AttributeElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof FieldElement){
-               FieldElement tempElement = (FieldElement)parentElement;
-	           returnElement = new ArrayElement(tempElement,javaName);
-	        }
-            else if(parentElement instanceof MethodElement){
-               returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-            }
-
-	      }
-       }
-
-    }
-    else if(object instanceof SamplePropertyDescriptor){
-      SamplePropertyDescriptor pd = (SamplePropertyDescriptor)object;
-      returnElement = new AttributeElement((BeanElement)parentElement,pd.getName());  
-    }
-    else if(object instanceof Field){
-      Field field = (Field)object;
-      returnElement = new FieldElement((BeanElement)parentElement,field.getName());
-    }
-    else if (object instanceof Method){
-      Method method = (Method)object;
-      returnElement = new MethodElement((BeanElement)parentElement,method.getName(), method.getMethodElementSignature());
-    }
-    //non beaninfo
-    else if (object instanceof String){
-      String name = (String)object;  
-      returnElement = new AttributeElement((BeanElement)parentElement,name);
-    }
-    else if (object instanceof JavaParameter){
-      JavaParameter javaParameter = (JavaParameter)object;
-
-      
-      if (javaParameter.isReturn()) 
-         returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true); 
-      else{ 
-         //a java parameter gives us the qualified name we dont want this
-         String name = javaParameter.getQualifiedName();
-         String shortName;
-         int index = name.lastIndexOf(".");
-         if (index != -1){
-           index++;
-           shortName = name.substring(index);
-         }
-      else shortName = name;
-
-         returnElement = new ParameterElement((MethodElement)parentElement,shortName,MethodElement.REL_PARAMETERS,false); 
-
-      }
-     
-    }
-    else if (object instanceof JavaHelpers){
-      JavaHelpers javaHelper = (JavaHelpers)object;
-      String javaName; 
-      if (javaHelper.isArray()) javaName = TypeFactory.ARRAY_NAME;
-      else javaName = javaHelper.getJavaName();
-      if (parentElement instanceof ParameterElement){
-          returnElement = new SimpleElement((ParameterElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof AttributeElement){
-          returnElement = new SimpleElement((AttributeElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof FieldElement){
-          returnElement = new SimpleElement((FieldElement)parentElement,javaName,javaHelper.isPrimitive());
-      }
-      else if(parentElement instanceof MethodElement){
-      	returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
-      }
-    }
-    return returnElement;
-  }
-  
-  
-  
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
deleted file mode 100644
index 24da0c1c0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class BigDecimalType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public BigDecimalType()
-  {
-    super(TypeFactory.BIG_DECIMAL_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "new java.math.BigDecimal(" + name + ");";
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
deleted file mode 100644
index acf6033cc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class BigIntegerType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public BigIntegerType()
-  {
-    super(TypeFactory.BIG_INTEGER_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "new java.math.BigInteger(" + name + ");";
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
deleted file mode 100644
index 4861a696f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
+++ /dev/null
@@ -1,90 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* This class is used to simplify the codegen process
-* Because codegen may be processed differently depending on the type
-* we can handle how each type wants the code to look for a specific task 
-* by creating a datatype and calling generic methods that are 
-* to be specialized in subclasses
-*/
-public interface DataType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public static String REL_TYPE = "type";
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName);
-
-  /**
-  * Often times in order to convert a type to string, string to type or just plain provide an input form
-  * A temporary variable is used. If we run into a sitution where two of the same types are used in the  
-  * same method these temporary variables share the same name space. It isnt enough to use a name 
-  * because of we may have a nested scenario. Therefore any temporary variable that is used in a dataType
-  * must use a unique name apeended to the end. This name must be passed in and it is up to the user of
-  * DataType to insure it is unique.
-  * @return Unique Name 
-  */
-  public void setUniqueName(String name);
-
-  /**
-  * This is the name each temp variable will use
-  * 
-  *
-  */
-  public String getUniqueName();
-  
-  /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id);
-
-
-  /**
-  * Input form returns the user input html
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name);
-  
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name);
-
-  /**
-  * return the type
-  * @return String the type(including package).
-  */
-  public String getType();
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
deleted file mode 100644
index 6a839891b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,125 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class DateType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public DateType()
-  {
-    super(TypeFactory.BIG_DECIMAL_NAME);
-  }
- 
-
-  /**
-  * inputForm returns the user input html
-  * The simple form is just a text input box
-  * This has been specialized to show an example
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"" 
-                         + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE 
-                         + "<%" + StringUtils.NEWLINE
-                         + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE   
-                         + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ "  = new java.util.GregorianCalendar();" + StringUtils.NEWLINE 
-                         + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE                 
-                         + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE  
-                         + "%>" + StringUtils.NEWLINE
-                         + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE  
-                         + "</TR>" + StringUtils.NEWLINE
-                         + "<TR>"  + StringUtils.NEWLINE
-                         + "<TD> </TD>" + StringUtils.NEWLINE
-                         + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
-                         + "</TR>" + StringUtils.NEWLINE;
-                       
-                         
-
-     return inputForm;
-  }
-
-
-  /*
-  * This function needs to be specialized
-  * We must use the date function to help
-  * us convert back and forth
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"  
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB +  "java.util.Date " + nodeName  +  "= dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"                         
-                         + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * this is needed for most case 
-  * but it is peripheral as the stringconversion needed 
-  * to be overridden
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-
-
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(" + name +"));" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
deleted file mode 100644
index c0406ac6b..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,123 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class DomElementType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public DomElementType()
-  {
-    fType = "org.w3c.dom.Element";
-    fUniqueName = "";
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The DomElement form is a text box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\"" 
-                         + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB 
-                       + "org.w3c.dom.Element " + nodeName + "= org.eclipse.jst.ws.util.DomElementHelper.createDomElementFromXMLString(" + attributeName + ");" 
-	                   + StringUtils.NEWLINE;
-     return conversion; 
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.DomElementHelper.domWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return typeToString;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
deleted file mode 100644
index eceb2eb6e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
+++ /dev/null
@@ -1,92 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class FieldElement extends BasicElement implements AttributeElementType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  private String fSetterMethod;
-  private String fGetterMethod;
-
- 
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNING_BEAN = "owningbean";
-  
-  /**
-  * Constructor this takes the owning bean.
-  * @param name The name of the attribute.
-  * @param beanElement the bean that owns this attribute.
-  */
-  public FieldElement ( BeanElement beanElement, String name)
-  {
-    super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_FIELDS);
-    fSetterMethod = name;
-    fGetterMethod = name;
-  }
-
-  public void setSetterMethod(String setterMethod)
-  {
-    fSetterMethod = setterMethod;
-  }
-
-  public String getSetterMethod()
-  {
-    return fSetterMethod;
-  }
-
-  public String getGetterMethod()
-  {
-    return fGetterMethod;
-  }
- 
-  public void setGetterMethod(String getterMethod)
-  {
-    fGetterMethod = getterMethod;
-  }
-
-  public String getSetterSignature(String attribute)
-  {
-    return fSetterMethod + " = " + attribute + ";";
-  }
-   
-  /**
-  * Returns the Bean that owns this Attribute.
-  * @return BeanElement The bean that owns this attribute.
-  */
-  public BeanElement getOwningBeanElement ()
-  {
-    Enumeration e = getElements(REL_OWNING_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the type that is owned by this attributte.
-  * @return TypeElement The Type that of this attribute.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
deleted file mode 100644
index d7cfbf9c4..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,127 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class GregorianCalendarType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public GregorianCalendarType()
-  {
-    super(TypeFactory.GREGORIAN_CALENDAR_NAME);
-  }
-
-
-  /**
-  * inputForm returns the user input html
-  * The simple form is just a text input box
-  * This has been specialized to show an example
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"" 
-                         + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE 
-                         + "<%" + StringUtils.NEWLINE
-                         + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE   
-                         + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ "  = new java.util.GregorianCalendar();" + StringUtils.NEWLINE 
-                         + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE                 
-                         + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE  
-                         + "%>" + StringUtils.NEWLINE
-          
-                          
-                         + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE  
-                         + "</TR>" + StringUtils.NEWLINE
-                         + "<TR>"  + StringUtils.NEWLINE
-                         + "<TD> </TD>" + StringUtils.NEWLINE
-                         + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
-                         + "</TR>" + StringUtils.NEWLINE;
-                       
-                         
-
-     return inputForm;
-  }
- 
- 
-  /*
-  * This function needs to be specialized
-  * We must use the date function to help
-  * us convert back and forth
-  */
-   public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"  
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB +  "java.util.Date dateTemp" + getUniqueName()+ "  = dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"                         
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.GregorianCalendar" + Generator.SPACE + nodeName + " = " + "new java.util.GregorianCalendar();" 
-                         + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + ".setTime(dateTemp" + getUniqueName()+ ");"
-                         + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * this is needed for most case 
-  * but it is peripheral as the stringconversion needed 
-  * to be overridden
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "java.util.Date date" + getUniqueName()+ " = " + name + ".getTime();" + StringUtils.NEWLINE 
-    	               + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(date" + getUniqueName() + "));" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
deleted file mode 100644
index a1ff2cf46..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
+++ /dev/null
@@ -1,37 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class HashtableType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public HashtableType()
-  {
-    super(TypeFactory.HASHTABLE_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
deleted file mode 100644
index 0035bfbe8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
+++ /dev/null
@@ -1,37 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class MapType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public MapType()
-  {
-    super(TypeFactory.MAP_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
deleted file mode 100644
index 52e8d6032..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
+++ /dev/null
@@ -1,129 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method.
-* Nearest moral equivalents: java.lang.reflect.Method, java.beans.MethodDescriptor.
-*/
-public class MethodElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  public static final String REL_BEAN = "bean";
-  public static final String REL_PARAMETERS = "parameters";
-  public static final String REL_RETURN_PARAMETERS = "returnparameters";
-  private String fDisplayName;
-  private String fName;
-  private boolean fMethodOmitted;
-
-  /**
-  * Constructor.
-  * @param bean The Bean that owns this method.
-  * @param name The name of the method.
-  * @param type The type of the method.
-  */
-  public MethodElement ( BeanElement beanElement, String name, String displayName)
-  {
-    super(name,beanElement,REL_BEAN,BeanElement.REL_METHODS);
-    fDisplayName = displayName;
-    fName = name;
-    fMethodOmitted = false;
-    
-  }
-
-  /*
-  * In the event that there is an unsupported type
-  * we will set the ommission boolean variable
-  * @return boolean true if this method is to be ommited
-  */
-  public boolean getMethodOmmission()
-  {
-    return fMethodOmitted;
-  }
-
-  /*
-  * In the event that there is an unsupported type
-  * we will get the ommission boolean variable
-  * @param boolean true if this method is to be ommited
-  */
-  public void setMethodOmmission(boolean bool)
-  {
-    fMethodOmitted = bool;
-  }
-
-
-  public String getName()
-  {
-    return fName;
-  }
-
-  public String getDisplayName()
-  {
-    return fDisplayName;
-  }
-
-  /**
-  * Returns the Bean that owns this method.
-  * @return Bean The Bean that owns this method.
-  */
-  public BeanElement getBeanElement ()
-  {
-    Enumeration e = getElements(REL_BEAN);
-    return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns an enumeration of the return parameter of this method.
-  * @return Enumeration holds the return parameter of this method.
-  */
-  public Enumeration getReturnParameterEnum ()
-  {
-    return getElements(REL_RETURN_PARAMETERS);
-  }
-
-  /**
-  * Returns an enumeration of the return parameter of this method.
-  * @return Enumeration holds the return parameter of this method.
-  */
-  public ParameterElement getReturnParameterElement ()
-  {
-    Enumeration e = getReturnParameterEnum();
-    return e.hasMoreElements() ? (ParameterElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns an enumeration of all Parameter objects of this method.
-  * @return Enumeration All Parameter objects of this method.
-  */
-  public Enumeration getParameterElements ()
-  {
-    return getElements(REL_PARAMETERS);
-  }
-
-  /**
-  * Returns the number of Parameter objects of this method.
-  * @return int The number of Parameter objects of this method.
-  */
-  public int getNumberOfParameterElements ()
-  {
-    return getNumberOfElements(REL_PARAMETERS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
deleted file mode 100644
index 36f08a8b8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
+++ /dev/null
@@ -1,83 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class ParameterElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- 
-  public static final String REL_METHOD = "method";
-  public static final String REL_TYPE = "type";
-
-  public boolean fReturnParameter=false;
-  
-  /**
-  * Constructor.
-  * @param method The Method that owns this parameter.
-  * @param name The name of the parameter.
-  * @param type The type of the parameter.
-  */
-  public ParameterElement ( MethodElement methodElement, String name, String relType,boolean returnParameter )
-  {
-    this(name,methodElement,REL_METHOD,relType);
-    fReturnParameter = returnParameter;
-  }
-  
-  /**
-  * Constructor.
-  * @param method The Method that owns this parameter.
-  * @param name The name of the parameter.
-  * @param type The type of the parameter.
-  */
-  public ParameterElement (String name, MethodElement methodElement, String outRel,String inRel)
-  {
-    super(name,methodElement,outRel,inRel);
-  }
-   
-  /**
-  * Returns the Method that owns this parameter.
-  * @return Method The Method that owns this parameter.
-  */
-  public MethodElement getMethodElement ()
-  {
-    Enumeration e = getElements(REL_METHOD);
-    return e.hasMoreElements() ? (MethodElement)e.nextElement() : null;
-  }
-
-  /**
-  * Returns the Method that owns this parameter.
-  * @return Method The Method that owns this parameter.
-  */
-  public TypeElement getTypeElement ()
-  {
-    Enumeration e = getElements(REL_TYPE);
-    return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
-  }
-
-  public boolean isReturn()
-  {
-    return fReturnParameter;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
deleted file mode 100644
index 387306178..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
+++ /dev/null
@@ -1,65 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class PrimitiveArrayType extends ArrayType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveArrayType(String typeName)
-  {
-    super(TypeFactory.PRIMITIVE_ARRAY_NAME, typeName);
-  }
-
-   /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String trippleTab = Generator.DOUBLE_TAB + Generator.TAB;
-
-    String nonBean = Generator.DOUBLE_TAB + "String temp" + getUniqueName() + " = \"[\";" 
-    	             + Generator.DOUBLE_TAB + "for(int i" + getUniqueName() + "=0;i" +getUniqueName() + "< " + name 
-    	                   + ".length;i" + getUniqueName() + "++){" + StringUtils.NEWLINE  
-    	             + trippleTab + "temp"+ getUniqueName() +" = temp"+getUniqueName() + " + " + name + "[i" + getUniqueName() 
-    	                   + "] + \",\";" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "int length" + getUniqueName() + " = temp" + getUniqueName() + ".length();" 
-                           + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "temp" + getUniqueName() + " = temp"+getUniqueName()+".substring(0,(length"+getUniqueName()+" - 1)) + \"]\";" 
-                           + StringUtils.NEWLINE
-    	             + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
-    return nonBean;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
deleted file mode 100644
index f58ad9d80..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveBooleanType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveBooleanType()
-  {
-    super(TypeFactory.PRIM_BOOLEAN_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Boolean.valueOf(" + name + ").booleanValue();";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
deleted file mode 100644
index 5045d26dd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveByteType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveByteType()
-  {
-    super(TypeFactory.PRIM_BYTE_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Byte.parseByte(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
deleted file mode 100644
index d52f90393..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveCharType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveCharType()
-  {
-    super(TypeFactory.PRIM_CHAR_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "" + name + ".charAt(0);";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
deleted file mode 100644
index 7b362e718..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveDoubleType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveDoubleType()
-  {
-    super(TypeFactory.PRIM_DOUBLE_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Double.parseDouble(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
deleted file mode 100644
index 200f9d7ca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveFloatType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveFloatType()
-  {
-    super(TypeFactory.PRIM_FLOAT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Float.parseFloat(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
deleted file mode 100644
index 2f33dd929..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveIntType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveIntType()
-  {
-    super(TypeFactory.PRIM_INTEGER_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Integer.parseInt(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
deleted file mode 100644
index f71523669..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveJavaTypes extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveJavaTypes(String type)
-  {
-    super(type);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = fType + ".valueOf(" + name + ");";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
deleted file mode 100644
index ef0c82698..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveLongType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveLongType()
-  {
-    super(TypeFactory.PRIM_LONG_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Long.parseLong(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
deleted file mode 100644
index 8f91ce6ac..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class PrimitiveShortType extends PrimitiveType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveShortType()
-  {
-    super(TypeFactory.PRIM_SHORT_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type.
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "Short.parseShort(" + name + ");";
-    return conversion;
-  }
-  
-  
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
deleted file mode 100644
index 4b5176766..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,47 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public abstract class PrimitiveType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public PrimitiveType(String type)
-  {
-    super(type);
-  }
- 
- /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
-  
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
deleted file mode 100644
index fc721a809..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
+++ /dev/null
@@ -1,108 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class RecognizedReturnType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public RecognizedReturnType(String type)
-  {
-    fType = type;
-    fUniqueName = "";
-  }
-
-  /**
-  * not relevant at this point 
-  */
-  public String inputForm(String name)
-  {
-     return "";
-  }
-
-   /**
-  * again not relevant
-  */
-  public String getRequestCode(String name, String id)
-  {
-     return "";
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-    return "";
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String nonBean =   Generator.DOUBLE_TAB + "if(" + name + "!= null){" + StringUtils.NEWLINE   
-    	             + Generator.DOUBLE_TAB + "String temp" + getUniqueName()+" = " + name + ".toString();" + StringUtils.NEWLINE 
-                     + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE  
-    	             + Generator.DOUBLE_TAB +  "<%=temp" + getUniqueName() +"%>" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB +  "<%" + StringUtils.NEWLINE
-                     + Generator.DOUBLE_TAB + "}";
-    return nonBean;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
deleted file mode 100644
index 289e009e5..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,123 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class SOAPElementType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public SOAPElementType()
-  {
-    fType = "javax.xml.soap.SOAPElement";
-    fUniqueName = "";
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The DomElement form is a text box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\"" 
-                         + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-  }
-
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion =  Generator.DOUBLE_TAB 
-                       + "javax.xml.soap.SOAPElement " + nodeName + "= org.eclipse.jst.ws.util.SoapElementHelper.createSOAPElementFromXMLString(" + attributeName + ");" 
-	                   + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * This is basically the function that dictates how we want to display this type 
-  * upon receiving it as a return from a proxy method
-  * @param String the name of the type
-  * @return String The display string
-  */
-  public String TypeConversion(String name)
-  {
-    String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.SoapElementHelper.soapElementWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return typeToString;
-  }
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-  public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
deleted file mode 100644
index f478345d1..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
+++ /dev/null
@@ -1,62 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* 1 of three type elements represents primitives 
-*/
-public class SimpleElement extends TypeElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  * Constructor 
-  * @param ParameterElement The Parameter that owns this simple type.
-  * @param String Name of the simple element.
-  */
-  public SimpleElement ( ParameterElement parameterElement, String name, boolean prim)
-  {
-    super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.PARAMETER_OWNER;
-    setPrimitive(prim);
-  }
-  
-  /**
-  * Constructor 
-  * @param ParameterElement The Attribute that owns this simple type.
-  * @param String Name of the AttributeElement.
-  */
-  public SimpleElement ( AttributeElement attributeElement, String name, boolean prim)
-  {
-    super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-    setPrimitive(prim);
-  }
-
-  /**
-  * Constructor 
-  * @param ParameterElement The Attribute that owns this simple type.
-  * @param String Name of the AttributeElement.
-  */
-  public SimpleElement ( FieldElement fieldElement, String name, boolean prim)
-  {
-    super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
-    fOwnerType = TypeElement.FIELD_OWNER;
-    setPrimitive(prim);
-  }
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
deleted file mode 100644
index e81948248..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,140 +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.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public abstract class SimpleType implements DataType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  protected String fType;
-  protected String fUniqueName;
-
-  /**
-  *Constructor
-  *
-  */
-  public SimpleType(String type)
-  {
-    fType = type;
-  }
-
-  /**
-  * inputForm returns the user input html
-  * The simple form is just a text input box
-  * @param String name The name of the input element
-  * @return String The form used to collect the data
-  */
-  public String inputForm(String name)
-  {
-     String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"" 
-                         + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE 
-                         + "</TR>" + StringUtils.NEWLINE;
-     return inputForm;
-  }
-
-   /**
-  * This function dictates how you want to process the 
-  * incoming string from the input jsp. You may or may not use the markup 
-  * function depending on the type. The simple types use it. DomElement does not
-  * @param String the name of the attribute
-  * @return String the code to be generated
-  */
-  public String getRequestCode(String name, String id)
-  {
-     String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE 
-     	                   + id + "=  request.getParameter(\""
-     	                   + name +"\");" + StringUtils.NEWLINE;
-     return requestCode;
-   }
- 
-  /**
-  * This function hands back the code required to go from the 
-  * string the user entered to the actual type of the element
-  * it uses another function that all subclasses of SimpleType are required to implement
-  * The StringToType function
-  * @param String typeName this is the actual name of the type ie int,boolean
-  * @param String nodeName The nodeName is just the attributename + Temp. 
-  * @param String the attributeName 
-  * @return String convert the string to type .
-  */
-  public String stringConversion(String typeName, String nodeName, String attributeName)
-  {
-     String conversion = Generator.DOUBLE_TAB + typeName + Generator.SPACE + nodeName 
-     	                 + Generator.SPACE + " = " + StringToType(attributeName) 
-     	                 + "" + StringUtils.NEWLINE;
-     return conversion;
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public abstract String StringToType(String name);
-
-  /**
-  * converts the type returned from the proxy 
-  * back to a string 
-  * @return String convert the type to string.
-  */
-  public String TypeConversion(String name)
-  {
-
-    String conversion = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(" + TypeToString(name) + ");" + StringUtils.NEWLINE 
-                       + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
-                       + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
-    return conversion;
-  }
-
-   /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public abstract String TypeToString(String name);
-
-  /**
-  * return the name of this type
-  * @return String the name(including package).
-  */
-  public String getType()
-  {
-    return fType;
-  }
-
-   public String getUniqueName()
-  {
-    return fUniqueName;
-  }
-
-  public void setUniqueName(String name)
-  {
-    fUniqueName = name;
-  }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
deleted file mode 100644
index 50cb4cfbe..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
+++ /dev/null
@@ -1,38 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class StateLessBeanType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /**
-  *Constructor
-  *
-  */
-  
-  public StateLessBeanType(String name)
-  {
-    super(TypeFactory.STATELESS_BEAN);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
deleted file mode 100644
index 1b99c746e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
+++ /dev/null
@@ -1,57 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class StringType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public StringType()
-  {
-    super(TypeFactory.STRING_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = name + ";";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
deleted file mode 100644
index f1592f6aa..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,192 +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.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* TypeElement is the base class for Java bean features that have types.
-*/
-public abstract class TypeElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static int BEAN = 0;
-  public static int SIMPLE = 1;
-  public static int ARRAY = 2;
-
-  private int fType;
-  protected int fOwnerType;
-  private boolean fPrimitive = false;
-
-  /**
-  * Constructor. Automatically adds this object to the given model.
-  * @param name The name of the element
-  * @param model The model to own this object.
-  * @param type The type represented by this object, one of
-  * <code>BEAN</code>, <code>SIMPLE</code> or <code>ARRAY</code>.
-  */
-  protected TypeElement ( String name, Model model, int type )
-  {
-    super(name,model);
-    fType = type;
-  }
-
-  /**
-  */
-  protected TypeElement ( String name, Element element, String outboundRelName, String inboundRelName, int type )
-  {
-    super(name,element,outboundRelName,inboundRelName);
-    fType = type;
-  }
-
-  /*
-  *This will tell you wether the type is a bean
-  *@param Boolean returns true if this is bean
-  **/
-  public boolean isBean()
-  {
-    if (fType == BEAN) return true;
-    return false;
-  }
-
-  /*
-  *This will tell you wether the type is a bean
-  *@param Boolean returns true if this is bean
-  **/
-  public boolean isPrimitive()
-  {
-    return fPrimitive;
-  }
-
-  /*
-  *This will tell you wether the type is a bean
-  *@param Boolean returns true if this is bean
-  **/
-  protected void setPrimitive(boolean prim)
-  {
-    fPrimitive = prim; 
-  }
-
-
-  /*
-  * This is mainly needed for arrays as with all types the
-  * names come out as java.util.type, but with an array it 
-  * isnt explicit in telling us its an array
-  */
-  public String getTypeName()
-  {
-    return getName();
-  }
-  
-  /*
-  *This will tell you wether the type is a simple
-  *@param Boolean returns true if this is simple
-  **/
-  public boolean isSimple()
-  {
-    if (fType == SIMPLE) return true;
-    return false;
-  }
-
-  /*
-  *This will tell you wether the type is a array
-  *@param Boolean returns true if this is array
-  **/
-  public boolean isArray()
-  {
-    if (fType == ARRAY) return true;
-    return false;
-  }
-
-  public static String REL_ATTRIBUTES = "attributes";
-  public static String REL_FIELDS = "fields";
-  public static final String REL_TYPE = "type";
-  public static final String REL_OWNER = "owner";
-
-  public static int PARAMETER_OWNER = 0;
-  public static int ATTRIBUTE_OWNER = 1;
-  public static int FIELD_OWNER = 2;
-  public static int ROOT = 3;
-
-  /*
-  * This could be The root test bean
-  * @return boolean true if this is root bean
-  */
-  public boolean isRoot()
-  {
-    if(fOwnerType == ROOT) return true;
-    return false;
-  }
-
-  /*
-  * This Type could be owned by a Parameter or an attribute
-  * @return boolean true if this is owned by a parameter
-  */
-  public boolean isOwnerParameter()
-  {
-    if(fOwnerType == PARAMETER_OWNER) return true;
-    return false;
-  }
-
-  /*
-  * This Type could be owned by a Parameter or an attribute
-  * @return boolean true if this is owned by an attribute 
-  */
-  public boolean isOwnerAttribute()
-  {
-    if(fOwnerType == ATTRIBUTE_OWNER) return true;
-    return false;
-  }
-
-  /*
-  * This Type could be owned by a Parameter or an attribute
-  * @return boolean true if this is owned by an attribute 
-  */
-  public boolean isOwnerField()
-  {
-    if(fOwnerType == FIELD_OWNER) return true;
-    return false;
-  }
-
-  /**
-  * This Type may be owned by a parameter or an attribute 
-  * Use this method in conjunction with isOwnerParamter, isOwner
-  * @return BasicElement the element that owns this attribute.
-  */
-  public BasicElement getOwningElement ()
-  {
-    if (isOwnerParameter()){
-      Enumeration e = getElements(REL_OWNER);
-      return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
-    }
-    else if(isOwnerAttribute()){
-      Enumeration e = getElements(REL_OWNER);
-      return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
-    }
-    else if(isOwnerField()){
-      Enumeration e = getElements(REL_OWNER);
-      return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
-    }
-
-    return null;
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
deleted file mode 100644
index f7a176058..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,248 +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.consumption.datamodel.beanmodel;
-
-import java.util.Hashtable;
-import org.eclipse.jem.java.JavaHelpers;
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class TypeFactory 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static final String URL_NAME                   = "java.net.URL";
-  public static final String STRING_NAME               = "java.lang.String";
-  public static final String BIG_DECIMAL_NAME          = "java.math.BigDecimal";
-  public static final String BIG_INTEGER_NAME          = "java.math.BigInteger";
-  public static final String DATE_NAME                 = "java.util.Date";
-  public static final String GREGORIAN_CALENDAR_NAME = "java.util.GregorianCalendar";
-  public static final String CALENDAR_NAME             = "java.util.Calendar";
-  public static final String BOOLEAN_NAME              = "java.lang.Boolean";
-  public static final String BYTE_NAME                  = "java.lang.Byte";
-  public static final String DOUBLE_NAME               = "java.lang.Double";
-  public static final String FLOAT_NAME                 = "java.lang.Float";
-  public static final String INTEGER_NAME               = "java.lang.Integer";
-  public static final String LONG_NAME                  = "java.lang.Long";
-  public static final String SHORT_NAME                 = "java.lang.Short";
-  public static final String CHARACTER_NAME            = "java.lang.Character";
-  public static final String PRIM_BOOLEAN_NAME         = "boolean";
-  public static final String PRIM_BYTE_NAME            = "byte";
-  public static final String PRIM_DOUBLE_NAME          = "double";
-  public static final String PRIM_FLOAT_NAME           = "float";
-  public static final String PRIM_INTEGER_NAME         = "int";
-  public static final String PRIM_LONG_NAME            = "long";
-  public static final String PRIM_SHORT_NAME           = "short";
-  public static final String PRIM_CHAR_NAME            = "char";
-  public static final String VOID_NAME                  = "void";
-
-  //some special complex
-  public static final String DOM_ELEMENT_NAME   = "org.w3c.dom.Element";
-  public static final String SOAP_ELEMENT_NAME = "javax.xml.soap.SOAPElement";
-  public static final String STATELESS_BEAN = BeanElement.STATELESS_BEAN;
-
-
-
-  public static Hashtable javaTypes = new Hashtable();
-  
-  public TypeFactory(){}
-
-  static{
-    javaTypes.put(BOOLEAN_NAME,new PrimitiveJavaTypes(BOOLEAN_NAME));
-    javaTypes.put(BYTE_NAME,   new PrimitiveJavaTypes(BYTE_NAME));
-    javaTypes.put(DOUBLE_NAME, new PrimitiveJavaTypes(DOUBLE_NAME));
-    javaTypes.put(FLOAT_NAME,  new PrimitiveJavaTypes(FLOAT_NAME));
-    javaTypes.put(INTEGER_NAME,new PrimitiveJavaTypes(INTEGER_NAME));
-    javaTypes.put(LONG_NAME,   new PrimitiveJavaTypes(LONG_NAME));
-    javaTypes.put(SHORT_NAME,  new PrimitiveJavaTypes(SHORT_NAME));
-    javaTypes.put(CHARACTER_NAME,  new PrimitiveJavaTypes(CHARACTER_NAME));
-  }
-
-
-  /*
-  * This function allows us to handle recognized beans 
-  * in displaying and generating code for them instead of 
-  * treating them as complex types
-  */ 
-  public static boolean recognizedBean(String type)
-  {
-
-    //     
-    //current recognized beans (mostly java.lang)
-    if (type.equals(BOOLEAN_NAME)             ||
-        type.equals(BYTE_NAME)               ||
-        type.equals(DOUBLE_NAME)             ||
-        type.equals(FLOAT_NAME)               ||
-        type.equals(INTEGER_NAME)             ||
-        type.equals(LONG_NAME)               ||
-        type.equals(SHORT_NAME)              ||      
-        type.equals(CHARACTER_NAME)          ||      
-        type.equals(DOM_ELEMENT_NAME)        ||      
-	    type.equals(SOAP_ELEMENT_NAME)        ||
-        type.equals(BIG_DECIMAL_NAME)         ||
-        type.equals(BIG_INTEGER_NAME)         ||
-        type.equals(DATE_NAME)                ||
-        type.equals(GREGORIAN_CALENDAR_NAME) ||
-        type.equals(CALENDAR_NAME)           || 
-        type.equals(URL_NAME)                 ||    
-        type.equals(STRING_NAME))  return true;      
-     return false; 
-  
-  }
-
-  /*
-  * This function allows us to handle unsupported types 
-  * if we dont want to support a type and we want to omitt this  
-  * method from the samples
-  * @param javaHelpers this is the type to be evaluated
-  * @return boolean true if the type is not supported
-  */ 
-  public static boolean isUnSupportedType(JavaHelpers javaHelpers)
-  {
-    //we also dont support arrays
-    if (javaHelpers.isArray()||
-    		javaHelpers.getJavaName().equals(MAP_NAME)||
-    		javaHelpers.getJavaName().equals(VECTOR_NAME)||
-    		javaHelpers.getJavaName().equals("java.lang.class")	) return true;
-    
-    return false;
-  }
-
-  public static String HASHTABLE_NAME = "java.util.Hashtable";
-  public static String MAP_NAME = "java.util.Map";
-  public static String VECTOR_NAME = "java.util.Vector";
-  public static String ARRAY_NAME = ArrayElement.ARRAY_NAME;
-  public static String PRIMITIVE_ARRAY_NAME = "primitivearray";
-
-  public static boolean isRecognizedReturnType(JavaHelpers javaHelpers)
-  {
-    //arrays 
-    //Hashtable
-    //Vectors
-    if (javaHelpers.isArray()) return true;
-    else if (javaHelpers.getJavaName().equals(HASHTABLE_NAME))return true;
-    else if (javaHelpers.getJavaName().equals(VECTOR_NAME))return true;
-    else if (javaHelpers.getJavaName().equals(MAP_NAME))return true;
-    else return false;
-  }
-
-  public static boolean isRecognizedReturnType(String type)
-  {
-    //arrays 
-    //Hashtable
-    //Vectors
-    if (type.startsWith(ARRAY_NAME)) return true;
-    else if (type.equals(HASHTABLE_NAME))return true;
-    else if (type.equals(VECTOR_NAME))return true;
-    else if (type.equals(MAP_NAME))return true;
-    else return false;
-  }
-
-  public static boolean isStateLessBean(String type)
-  {
-    if(type.startsWith(STATELESS_BEAN)) return true;
-    return false;
-  }
-
-
-  /**
-  * Creates a type based on the JavaHelper then sets this type in the element
-  * @params JavaHelpers this holds the type
-  * @param TypeElement The element which will hold the type created
-  * @param String Uniquename to be used when naming temp variables
-  */
- 
-  public static DataType createType(String type, String UniqueName)
-  {
-    //this guy might be both stateless and one of the below elements
-    //we would like to be as specific as we can, stateless is the worst case 
-    boolean stateless = false;  
-    if(type.startsWith(STATELESS_BEAN)) {
-      stateless = true;
-      type = type.substring(29); 
-    }
-   
-    DataType datatype = null;
-    if      (type.equals(PRIM_BOOLEAN_NAME)) datatype = new PrimitiveBooleanType();
-    else if (type.equals(PRIM_BYTE_NAME))     datatype = new PrimitiveByteType();
-    else if (type.equals(PRIM_DOUBLE_NAME))  datatype = new PrimitiveDoubleType();
-    else if (type.equals(PRIM_FLOAT_NAME))   datatype = new PrimitiveFloatType();
-    else if (type.equals(PRIM_LONG_NAME))    datatype = new PrimitiveLongType();
-    else if (type.equals(PRIM_INTEGER_NAME)) datatype = new PrimitiveIntType();
-    else if (type.equals(PRIM_CHAR_NAME))    datatype = new PrimitiveCharType();
-    else if (type.equals(PRIM_SHORT_NAME))   datatype = new PrimitiveShortType();
-    
-
-    //see if this critter is a javatype
-    else if (type.equals(BOOLEAN_NAME)     ||
-            type.equals(BYTE_NAME)        ||
-            type.equals(DOUBLE_NAME)      ||
-            type.equals(FLOAT_NAME)       ||
-            type.equals(INTEGER_NAME)     ||
-            type.equals(LONG_NAME)        ||
-            type.equals(CHARACTER_NAME)  ||
-            type.equals(SHORT_NAME))        datatype = (DataType)javaTypes.get(type);   
-
-    //see if its a case we handle
-    else if (type.equals(STRING_NAME))               datatype = new StringType(); 
-    else if (type.equals(VOID_NAME))                 datatype = new VoidType();
-    else if (type.equals(DOM_ELEMENT_NAME))          datatype = new DomElementType();
-    else if (type.equals(SOAP_ELEMENT_NAME))         datatype = new SOAPElementType();  
-    else if (type.equals(BIG_DECIMAL_NAME))          datatype = new BigDecimalType();
-    else if (type.equals(BIG_INTEGER_NAME))          datatype = new BigIntegerType();
-    else if (type.equals(DATE_NAME))                  datatype = new DateType();
-    else if (type.equals(URL_NAME))                   datatype = new URLType(); 
-    else if (type.equals(GREGORIAN_CALENDAR_NAME))  datatype = new GregorianCalendarType();
-    else if (type.equals(CALENDAR_NAME))  datatype = new GregorianCalendarType();
-
-    //it could be a return type we support
-    else if (type.equals(HASHTABLE_NAME))            datatype = new HashtableType();
-    else if (type.equals(VECTOR_NAME))               datatype = new VectorType();
-    else if (type.equals(MAP_NAME))                  datatype = new MapType();
-
-    // need to see if it is an object array
-    //or a primitive
-    else if (type.startsWith(ARRAY_NAME)){              
-    	String name = type.substring(21); 
-        if(name.startsWith(PRIM_BOOLEAN_NAME) ||
-          name.startsWith(PRIM_BYTE_NAME)     ||
-          name.startsWith(PRIM_DOUBLE_NAME)  ||
-          name.startsWith(PRIM_FLOAT_NAME)    ||
-          name.startsWith(PRIM_LONG_NAME)    ||
-          name.startsWith(PRIM_INTEGER_NAME)  ||
-          name.startsWith(PRIM_CHAR_NAME)    ||
-          name.startsWith(PRIM_SHORT_NAME))
-            datatype = new PrimitiveArrayType(name);  
-        else
-        	datatype = new ArrayType(name);
-
-    }
-    else if (stateless){
-        datatype = new StateLessBeanType(type);
-
-    }
-
-
-    datatype.setUniqueName(UniqueName);
-    return datatype;
-     
-  }
-  
-  
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
deleted file mode 100644
index 9c0fb28c8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
+++ /dev/null
@@ -1,57 +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.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class URLType extends SimpleType 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public URLType()
-  {
-    super(TypeFactory.URL_NAME);
-  }
- 
-  /**
-  * StringToType gets the string taken by the 
-  * user into proxy form
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    String conversion = "new java.net.URL(" + name + ");";
-    return conversion;    
-  }
-
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return name + ".toString()";
-  }
- 
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
deleted file mode 100644
index 5a0718ddc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
+++ /dev/null
@@ -1,37 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-* 
-*/
-public class VectorType extends RecognizedReturnType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public VectorType()
-  {
-    super(TypeFactory.VECTOR_NAME);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
deleted file mode 100644
index 5fde91e13..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
+++ /dev/null
@@ -1,56 +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.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* 
-*/
-public class VoidType extends SimpleType
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  
-  /**
-  *Constructor
-  *
-  */
-  public VoidType()
-  {
-    super("void");
-  }
-
-   /**
-  * for a void there is no need to return 
-  * @return String convert the string to type .
-  */
-  public String StringToType(String name)
-  {
-    return "";
-  }
-  
-  /**
-  * The stringConversion function nails out specific conversion methods used among simple types 
-  * This method is to be implemented by SimpleType subclasses
-  * @param String the name of string after the request call
-  * @return String the actual conversion string containing the name.
-  */
-  public String TypeToString(String name)
-  {
-    return "String.valueOf(" + name + ")";
-  }
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
deleted file mode 100644
index 1e8647fd2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
+++ /dev/null
@@ -1,112 +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.consumption.datamodel.validate;
-
-import java.util.HashSet;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
-  * This class manages the validation state of projects that some tasks may want
-  * to disable.  The manager can then be used to restore the validation state.
-**/
-public class ValidationManager
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-    * This set contains a set of IProjects that need to be validated.
-  **/
-  private HashSet projects = null;              
-
-  /**
-    * This object contains a reference to the j2ee validator.
-  **/
-  //pgm private ValidatorManager j2eeManager = null;
-
-  /**
-    * This boolean contains the auto build setting under preferrence
-  **/
-  private boolean isAutoBuild_;
-  private boolean autoBuildDisabled_;
-                                             
-  public ValidationManager()
-  {
-    projects    = new HashSet();
-    //pgm j2eeManager = ValidatorManager.getManager();
-    setAutoBuildPreference();
-    autoBuildDisabled_ = false;
-  }
-  
-  /**
-    * Disables the validation for a project if required.
-  **/
-  public void disableValidationForProject( IProject project )
-  {    
-    // We need to remember that this project needs have validation turned back on.
-    projects.add( project );
-    
-    //pgm j2eeManager.suspendAllValidation( true );
-  }
-
-  /**
-    * Restores the validation state for all needed projects.
-  **/
-  public void restoreValidationForProjects( boolean runValidation )
-  {
-  }
-
-  public void modifyAutoBuild(boolean isAutoBuild) {
-    try {
-      IWorkspace workspace = ResourcesPlugin.getWorkspace();
-      IWorkspaceDescription workspaceDesc = workspace.getDescription();
-      workspaceDesc.setAutoBuilding(isAutoBuild);
-      workspace.setDescription(workspaceDesc);
-    }
-    catch (Exception e) {}
-  }
-
-  public void disableAutoBuild() {
-    if (!autoBuildDisabled_) {
-      setAutoBuildPreference();
-      modifyAutoBuild(false);
-      autoBuildDisabled_ = true;
-    }
-  }
-
-  public void restoreAutoBuild() {
-    if (autoBuildDisabled_) {
-      modifyAutoBuild(getAutoBuildPreference());
-      autoBuildDisabled_ = false;
-    }
-  }
-
-  public boolean setAutoBuildPreference() {
-    isAutoBuild_ = getWorkspaceAutoBuildPreference();
-    return isAutoBuild_;
-  }
-
-  public boolean getAutoBuildPreference() {
-    return isAutoBuild_;
-  }
-
-  public boolean getWorkspaceAutoBuildPreference() {
-    IWorkspaceDescription workspaceDesc = ResourcesPlugin.getWorkspace().getDescription();
-    return workspaceDesc.isAutoBuilding();
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
deleted file mode 100644
index e7ca18741..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
+++ /dev/null
@@ -1,54 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class BindingElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_PORT = "port";
-  public static String REL_OPERATIONS = "operations";
-  public static String REL_PORT_TYPE = "porttype";
-  
-  public BindingElement (PortElement portElement,String name)
-  {
-    super(name,portElement,REL_PORT,PortElement.REL_BINDING);
-  }
-
-  public Enumeration getPort()
-  {
-    return getElements(REL_PORT);
-  }
-
-  public Enumeration getPortType()
-  {
-    return getElements(REL_PORT_TYPE);
-  }
-
-  public Enumeration getOperations()
-  {
-    return getElements(REL_OPERATIONS);
-  }
-
-  public int getNumberOfOperations()
-  {
-    return getNumberOfElements(REL_OPERATIONS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
deleted file mode 100644
index 723975828..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class DefinitionElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_SERVICES = "services";
-  public static String REL_WSDL = "wsdl";
-  
-  public DefinitionElement (WSDLElement wsdlElement,String name)
-  {
-    super(name,wsdlElement,REL_WSDL,WSDLElement.REL_DEFINITIONS);
-  }
-
-  public Enumeration getWSDL()
-  {
-    return getElements(REL_WSDL);
-  }
-
-  public Enumeration getServices()
-  {
-    return getElements(REL_SERVICES);
-  }
-
-  public int getNumberOfServices()
-  {
-    return getNumberOfElements(REL_SERVICES);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
deleted file mode 100644
index f0d010cbc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class MessageElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_OPERATION = "operation";
-  public static String REL_PARTS = "parts";
-  
-  public MessageElement (OperationElement operationElement,String name)
-  {
-    super(name,operationElement,REL_OPERATION,OperationElement.REL_MESSAGES);
-  }
-
-  public Enumeration getOperation()
-  {
-    return getElements(REL_OPERATION);
-  }
-
-  public Enumeration getParts()
-  {
-    return getElements(REL_PARTS);
-  }
-
-  public int getNumberOfParts()
-  {
-    return getNumberOfElements(REL_PARTS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
deleted file mode 100644
index 2f501e067..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class OperationElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_BINDING = "binding";
-  public static String REL_MESSAGES = "messages";
-
-  public OperationElement (BindingElement bindingElement,String name)
-  {
-    super(name,bindingElement,REL_BINDING,BindingElement.REL_OPERATIONS);
-  }
-
-  public Enumeration getBinding()
-  {
-    return getElements(REL_BINDING);
-  }
-
-  public Enumeration getMessages()
-  {
-    return getElements(REL_MESSAGES);
-  }
-
-  public int getNumberOfMessages()
-  {
-    return getNumberOfElements(REL_MESSAGES);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
deleted file mode 100644
index d80ffbb39..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
+++ /dev/null
@@ -1,39 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PartElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_MESSAGE = "message";
-    
-  public PartElement (MessageElement messageElement,String name)
-  {
-    super(name,messageElement,REL_MESSAGE,MessageElement.REL_PARTS);
-  }
-
-  public Enumeration getMessage()
-  {
-    return getElements(REL_MESSAGE);
-  }
-
-  
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
deleted file mode 100644
index 78e2ac4af..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
+++ /dev/null
@@ -1,44 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_BINDING = "binding";
-  public static String REL_SERVICE = "service";
-  
-  public PortElement (ServiceElement serviceElement,String name)
-  {
-    super(name,serviceElement,REL_SERVICE,ServiceElement.REL_PORTS);
-  }
-
-  public Enumeration getService()
-  {
-    return getElements(REL_SERVICE);
-  }
-
-  public Enumeration getBinding()
-  {
-    return getElements(REL_BINDING);
-  }
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
deleted file mode 100644
index 08f6883f8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
+++ /dev/null
@@ -1,39 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortTypeElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_BINDING = "binding";
-  
-  public PortTypeElement (BindingElement bindingElement,String name)
-  {
-    super(name,bindingElement,REL_BINDING,BindingElement.REL_PORT_TYPE);
-  }
-
-  public Enumeration getBinding()
-  {
-    return getElements(REL_BINDING);
-  }
-
- 
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
deleted file mode 100644
index 3302d8968..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
+++ /dev/null
@@ -1,48 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class ServiceElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_PORTS = "ports";
-  public static String REL_DEFINITION = "definition";
-  
-  public ServiceElement (DefinitionElement definitionElement,String name)
-  {
-    super(name,definitionElement,REL_DEFINITION,DefinitionElement.REL_SERVICES);
-  }
-
-  public Enumeration getDefinition()
-  {
-    return getElements(REL_DEFINITION);
-  }
-
-  public Enumeration getPorts()
-  {
-    return getElements(REL_PORTS);
-  }
-
-  public int getNumberOfPorts()
-  {
-    return getNumberOfElements(REL_PORTS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
deleted file mode 100644
index 64611e868..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
+++ /dev/null
@@ -1,69 +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.consumption.datamodel.wsdlmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class StubbedWSDLModel
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  protected Model fModel;
-  public StubbedWSDLModel()
-  {
-    WSDLElement wsdlElement = new WSDLElement("WSDLFiles");
-    fModel = wsdlElement.getModel();   
-  }
-
-  public Model getWSDLModel()
-  {
-    return fModel;
-  }
-
-  public void buildModel()
-  {
-    DefinitionElement def1 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"StockQuote"); 
-    ServiceElement ser1 = new ServiceElement(def1,"getQuote");
-    ServiceElement ser2 = new ServiceElement(def1,"setQuote");
-    PortElement port1 = new PortElement(ser1,"port1");
-    PortElement port2 = new PortElement(ser1,"port2");
-    PortElement port3 = new PortElement(ser2,"port1");
-    PortElement port4 = new PortElement(ser2,"port2");
-    BindingElement bind1 = new BindingElement(port1,"bind1");
-    BindingElement bind2 = new BindingElement(port2,"bind1");
-    BindingElement bind3 = new BindingElement(port3,"bind1");
-    BindingElement bind4 = new BindingElement(port4,"bind1");
-    OperationElement op1 = new OperationElement(bind1,"op1");
-    new OperationElement(bind2,"op1");
-    new OperationElement(bind3,"op1");
-    new OperationElement(bind4,"op1");
-    MessageElement me1 = new MessageElement(op1,"me1");
-    MessageElement me2 = new MessageElement(op1,"me2");
-    new PartElement(me1,"pe1");
-    new PartElement(me2,"pe2");
-
-    DefinitionElement def2 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"TempConversion"); 
-    ServiceElement ser3 = new ServiceElement(def2,"getTemp");
-    ServiceElement ser4 = new ServiceElement(def2,"setTemp");
-    PortElement port5 = new PortElement(ser3,"port1");
-    PortElement port6 = new PortElement(ser4,"port1");
-    BindingElement bind5 = new BindingElement(port5,"bind1");
-    BindingElement bind6 = new BindingElement(port6,"bind1");
-    new OperationElement(bind5,"op1");
-    new OperationElement(bind6,"op1");
-
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
deleted file mode 100644
index a9e89d3bc..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
+++ /dev/null
@@ -1,53 +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.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class WSDLElement extends BasicElement
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public static String REL_DEFINITIONS = "definitions";
-  
-  /*
-  *
-  **/
-  public WSDLElement (String name)
-  {
-    this(name,new BasicModel("WSDLModel"));
-  }
-
-  public WSDLElement (String name, Model model)
-  {
-    super(name,model);
-    model.setRootElement(this);
-  }
-
-  public Enumeration getDefinitions()
-  {
-    return getElements(REL_DEFINITIONS);
-  }
-
-  public int getNumberOfDefinitions()
-  {
-    return getNumberOfElements(REL_DEFINITIONS);
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
deleted file mode 100644
index 65cab80e0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
deleted file mode 100644
index 0b09cf2a8..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
deleted file mode 100644
index 6a3f5cf25..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
deleted file mode 100644
index a3da3d86d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
deleted file mode 100644
index 7cd1b4c2f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
deleted file mode 100644
index 5c1db7301..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
deleted file mode 100644
index a0e9c21ec..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
deleted file mode 100644
index af8268a89..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
+++ /dev/null
@@ -1,17 +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.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
deleted file mode 100644
index 42e11d018..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
+++ /dev/null
@@ -1,90 +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.consumption.plugin;
-
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceConsumptionPlugin extends Plugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.consumption";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceConsumptionPlugin instance_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceConsumptionPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws");
-  * @return The WebServiceConsumptionPlugin singleton.
-  */
-  public static WebServiceConsumptionPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-    /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", instance_ );
-    
-    if( key.startsWith("%"))
-    {
-      key = key.substring( 1, key.length() );
-    }
-    
-    return msgUtils.getMessage(key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
deleted file mode 100644
index e485e04f3..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,73 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileAttributeGenerator extends InputFileTypeGenerator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  private boolean fStateLess;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileAttributeGenerator (StringBuffer buffer, int currentLevel, int levelsDeep)
-  {
-     super(buffer,currentLevel,levelsDeep);
-  }
-
- 
-  /*
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public IStatus visit (Object object)
-  {
-     
-     AttributeElementType attributeElementType = (AttributeElementType)object;
-     //if it is a bean is it stateless
-     attributeElementType.getTypeElement(); 
-        
-     if(attributeElementType.getTypeElement().isBean()){
-       BeanElement bean = (BeanElement)attributeElementType.getTypeElement();
-       fStateLess = bean.isStateLess();
-     }	 
-
-     TypeVisitor typeVisitor = new TypeVisitor();
-     InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,fCurrentLevel,fLevelsDeep);
-     if(attributeElementType.getTypeElement().isBean() && !TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName()) 
-     	&& !(getReturnParam() && (TypeFactory.isRecognizedReturnType(attributeElementType.getTypeElement().getTypeName()) || fStateLess)))
-                
-     addParentGetter(attributeElementType.getGetterMethod(),attributeElementType.getTypeElement().getName());
-     inputFileTypeGenerator.addParentGetter(returnParentGetter(),returnParentGetterType());
-     inputFileTypeGenerator.setInstanceName(fInstanceName);
-     inputFileTypeGenerator.setReturnParam(getReturnParam());
-     typeVisitor.run(attributeElementType,inputFileTypeGenerator);   
-     fbuffer = inputFileTypeGenerator.getStringBuffer();
-     
-     return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
deleted file mode 100644
index 83719d761..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,138 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class InputFileGenerator extends Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public String fResultName;
-
-  /**
-  * Constructor.
-  * used directly 
-  */
-  public InputFileGenerator (String result)
-  {
-      super();
-      fResultName = result;
-  }
-
-  /**
-  * Constructor.
-  * called from subclasses
-  */
-  public InputFileGenerator (StringBuffer buffer, String result)
-  {
-      super(buffer);
-      fResultName = result;
-  }
-
-  /**
-  * Constructor.
-  * called from subclasses
-  */
-  public InputFileGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-  }
-  
-  public void setFileNames(String results)
-  {
-    fResultName = results;
-  }
-
-  //takes in a bean node
-   public IStatus visit (Object object)
-   {
-      Element beanElement = (Element)object;
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>" + StringUtils.NEWLINE);
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE);
-      fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TITLE>Inputs</TITLE>" + StringUtils.NEWLINE);
-      fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("<H1>Inputs</H1>" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE + "String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
-      fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
-      fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
-      fbuffer.append("boolean valid = true;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
-      fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE); 
-      fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-      	
-      // go to the next generator
-      MethodVisitor methodVisitor = new MethodVisitor();
-      InputFileHelp1Generator inputFileHelp1Generator = new InputFileHelp1Generator(fbuffer,fResultName); 
-      methodVisitor.run(beanElement,inputFileHelp1Generator);
-      fbuffer = inputFileHelp1Generator.getStringBuffer();
-
-      fbuffer.append("case 1111111111:" + StringUtils.NEWLINE);
-      fbuffer.append("valid = false;" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-      fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-      fbuffer.append("<TR>" + StringUtils.NEWLINE);
-      fbuffer.append("<TD COLSPAN=\"1\" ALIGN=\"LEFT\">URLString:</TD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"url1111111111\" SIZE=20></TD>" + StringUtils.NEWLINE);
-      fbuffer.append("</TR>" + StringUtils.NEWLINE);
-      fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-      fbuffer.append("<BR>" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
-      fbuffer.append("</FORM>" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("break;" + StringUtils.NEWLINE);
-      fbuffer.append("case 1111111112:" + StringUtils.NEWLINE);
-      fbuffer.append("valid = false;" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-      fbuffer.append("<BR>" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
-      fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
-      fbuffer.append("</FORM>" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("break;" + StringUtils.NEWLINE);
-      
-      
-
-      fbuffer.append("}" + StringUtils.NEWLINE);    
-      fbuffer.append("if (valid) {" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE + "Select a method to test." + StringUtils.NEWLINE);  
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append(Generator.TAB + "return;" + StringUtils.NEWLINE);
-      fbuffer.append("}" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-      fbuffer.append("</BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("</HTML>" + StringUtils.NEWLINE);
-      
-      return Status.OK_STATUS;
-
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
deleted file mode 100644
index 9cca6548f..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,93 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp1Generator.
-* */
-public class InputFileHelp1Generator extends InputFileGenerator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public static final int INITIAL_STATE = 1;
-  public static final int FINAL_STATE = 2;
-
-  public int fstate;
-   
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileHelp1Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      fstate = INITIAL_STATE;
-  }
-  
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileHelp1Generator (StringBuffer buffer,String resultName)
-  {
-      super(buffer,resultName);
-      fstate = INITIAL_STATE;
-  }
-  
-  /*
-  * Takes in an element
-  * @param Object Takes in an object to be acted upon
-  */
-  public IStatus visit (Object object)
-  {
-     Element methodElement = (Element)object;
-     MethodElement method = (MethodElement)methodElement;
-     if (method.getMethodOmmission()) return Status.OK_STATUS;
-     
-     ParameterVisitor parameterVisitor = new ParameterVisitor();
-     fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
-     fbuffer.append("valid = false;" + StringUtils.NEWLINE);
-     fbuffer.append("%>" + StringUtils.NEWLINE);
-     fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
-     fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-    
-     // go to the next generator
-     InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer); 
-     parameterVisitor.run(methodElement,inputFileHelp2Generator);
-     fbuffer = inputFileHelp2Generator.getStringBuffer();
-     
-     fbuffer.append("<BR>" + StringUtils.NEWLINE);
-     fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
-     fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
-     fbuffer.append("</FORM>" + StringUtils.NEWLINE);
-     fbuffer.append("<%" + StringUtils.NEWLINE);
-     fbuffer.append("break;" + StringUtils.NEWLINE);
-      
-
-     return Status.OK_STATUS;
-     
-  
-  }   
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
deleted file mode 100644
index 9e9232b70..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
+++ /dev/null
@@ -1,102 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp2Generator.
-* */
-public class InputFileHelp2Generator extends InputFileHelp1Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  /*
-  * This is actually used by the result generator to show the 
-  * resultant Bean
-  * The name is the name the resultant bean is using as its instance name
-  */
-  protected String fInstanceName;
-  private boolean fReturnParam=false;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileHelp2Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      fInstanceName="";
-  }
-
-  /**
-  * This is state data to be used by the generators
-  * @param String name The instance name of the parameters type bean
-  */
-  public void setInstanceName(String name)
-  {
-    fInstanceName = name;
-  }
-
-  /**
-  * This is state data to be used by the generators
-  * @return String name The instance name of the parameters type bean
-  */
-  public String getInstanceName()
-  {
-    return fInstanceName;
-  }
-
-
-  /*
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public IStatus visit (Object object)
-  {
-      Element parameterElement = (Element)object;
-      getVisitor();
-
-      fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-
-      TypeVisitor typeVisitor = new TypeVisitor();
-      InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,0);
-      inputFileTypeGenerator.setReturnParam(getReturnParam());
-      inputFileTypeGenerator.setInstanceName(fInstanceName);
-      typeVisitor.run(parameterElement,inputFileTypeGenerator);
-      fbuffer = inputFileTypeGenerator.getStringBuffer();
-
-      fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-      
-      return Status.OK_STATUS;
-  
-  }
-
-  public boolean getReturnParam()
-  {
-    return fReturnParam;
-  }
-
-  public void setReturnParam(boolean returnParam)
-  {
-    fReturnParam = returnParam;
-  } 
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
deleted file mode 100644
index f6d45c3df..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,291 +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.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.SimpleElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileTypeGenerator extends InputFileHelp2Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  protected String fParentGetters;
-  protected int fLevelsDeep;
-  protected int fColspan;
-  protected int fCurrentLevel;
-  private boolean fIsSimple;
-  private boolean fStateLessBean;
-  private Vector fGetters;
-  private Vector fTypes;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileTypeGenerator (StringBuffer buffer, int currentLevel)
-  {
-     super(buffer);
-     fCurrentLevel = currentLevel;
-     fLevelsDeep = -1;
-     fParentGetters = "";
-  }
-
-  /**
-  * Constructor.
-  * 
-  */
-  public InputFileTypeGenerator (StringBuffer buffer, int currentLevel,int levelsDeep)
-  {
-     super(buffer);
-     fCurrentLevel = currentLevel;
-     fLevelsDeep = levelsDeep;
-     fParentGetters = "";
-  }
-
-  public void setParentGetters(Vector getter,Vector type)
-  {
-     if(fGetters != null){
-       fGetters.clear();
-       fTypes.clear();
-     }
-     addParentGetter(getter,type);
-  }
-
-
-  /**
-  * This function holds some state data that is important in getting the 
-  * Strings for display of resultant beans
-  * @param String getter this is the getter of an attribute
-  * The idea is that by the time we get to the simple type
-  * we have getAddress().getStreet()....
-  */
-  public void addParentGetter(String getter, String type)
-  {
-    if(fGetters == null) fGetters = new Vector();
-    if(fTypes == null) fTypes = new Vector();
-    fGetters.addElement(getter);
-    fTypes.addElement(type);
-  }
-
-  /*
-  * this will be used when passing between two visitors
-  *
-  */
-  public void addParentGetter(Vector getters, Vector types)
-  {
-    if(fGetters == null) fGetters = new Vector();
-    if(fTypes == null) fTypes = new Vector();
-    int size = getters.size();    
-    for(int i = 0; i<size; i++){
-      fGetters.addElement(getters.get(i));
-      fTypes.addElement(types.get(i));
-    }
-  }
-
-  protected String returnParentGetter(int count)
-  {
-    if (fGetters == null || count > fGetters.size()) return null;
-    return (String)fGetters.get(count);  
-  }
-
-  protected String returnParentGetterType(int count)
-  {
-    if (fTypes == null || count > fTypes.size()) return null;
-    return (String)fTypes.get(count);  
-  }
-
-  protected Vector returnParentGetter()
-  {
-    if (fGetters == null ) return new Vector();
-    return fGetters;  
-  }
-
-  protected Vector returnParentGetterType()
-  {
-    if (fTypes == null ) return new Vector();
-    return fTypes;  
-  }
-
-  protected int getterCount()
-  {
-    if(fGetters == null) return 0;
-    return fGetters.size(); 
-  }
-
-
-  /**
-  * This function returns some state data that is important in getting the 
-  * Strings for display of resultant beans
-  * @return String the string of getters to this point
-  * The idea is that by the time we get to the simple type
-  * we have getAddress().getStreet()....
-  */
-  public String getParentGetters()
-  {
-    return fParentGetters;
-  }
-  
-  /*
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public IStatus visit (Object object)
-  {
-     TypeElement element = (TypeElement)object;
-          
-     if (element instanceof SimpleElement) fIsSimple = true;
-     else fIsSimple = false;
-
-     //this could be a statelessbean need to know
-     if (element instanceof BeanElement ){
-        BeanElement bean = (BeanElement)element;
-        if (bean.isStateLess()) fStateLessBean = true;
-     }
-
-
-
-     //Complex type support
-     //first I need to find out how many levels deep
-     if(fLevelsDeep == -1){
-        AttributeVisitor attributeVisitor = new AttributeVisitor();
-        LevelsDeepVisitorAction ldva = new LevelsDeepVisitorAction();
-        attributeVisitor.run(element,ldva);
-        fLevelsDeep = ldva.getLevelsDeep();
-        //check out the fields 
-        FieldVisitor fieldVisitor = new FieldVisitor();
-        LevelsDeepVisitorAction ldva2 = new LevelsDeepVisitorAction();
-        fieldVisitor.run(element,ldva2);
-
-        if(fLevelsDeep < ldva2.getLevelsDeep())fLevelsDeep = ldva2.getLevelsDeep(); 
-        fLevelsDeep++;
-     } 
-     fColspan = fLevelsDeep - fCurrentLevel;
-
-     //if we have a return param with no getter make sure we are on the 
-     //attribute and not the parameter then return
-     if(getReturnParam() &&  element.getOwningElement() instanceof AttributeElementType &&(((AttributeElementType)element.getOwningElement()).getGetterMethod() == null) ) return Status.OK_STATUS;
-
-     //Code gen for all elements
-     fbuffer.append("<TR>" + StringUtils.NEWLINE);
-     for (int i = 0; i < fCurrentLevel;i++){
-        fbuffer.append("<TD WIDTH=\"5%\"></TD>" + StringUtils.NEWLINE);
-     }
-     fbuffer.append("<TD COLSPAN=\"" + fColspan + "\" ALIGN=\"LEFT\">" + element.getOwningElement().getName() + ":</TD>" + StringUtils.NEWLINE);   
-     if(fIsSimple || TypeFactory.recognizedBean(element.getName()) 
-                || (getReturnParam() && fStateLessBean) 
-                || (getReturnParam() && TypeFactory.isRecognizedReturnType(element.getTypeName()))){
-        if(getInstanceName().equals("")){
-           DataType dataType = TypeFactory.createType(element.getName(),element.getOwningElement().getMUID());
-           fbuffer.append(dataType.inputForm(element.getOwningElement().getMUID()));
-        }
-        else{
-           if(getReturnParam() && (TypeFactory.isRecognizedReturnType(element.getTypeName()) || fStateLessBean)){
-             DataType dataType = TypeFactory.createType(element.getTypeName(),element.getOwningElement().getMUID());  
-             String uniqueName = "type" + dataType.getUniqueName();
-             fbuffer.append("<TD>" + StringUtils.NEWLINE);
-             fbuffer.append("<%" + StringUtils.NEWLINE);
-             fbuffer.append("if(" +  getInstanceName() + " != null){" + StringUtils.NEWLINE);
-             String afterString = getInstanceName(); 
-             String tmpString = "tebece";
-             String prevString = getInstanceName();
-             String newTmpString = "";
-             for(int i=0;i<getterCount();i++){
-               newTmpString = tmpString + i;
-               fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
-               prevString = newTmpString; 
-               fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
-               afterString = newTmpString;
-             }
-             fbuffer.append(element.getName() + " " + uniqueName + " = " + afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ ";" + StringUtils.NEWLINE);             
-             fbuffer.append(dataType.TypeConversion(uniqueName));
-             for(int i=0;i<getterCount();i++){
-               fbuffer.append("}");
-             }
-             fbuffer.append("}%>" + StringUtils.NEWLINE);
-             fbuffer.append("</TD>" + StringUtils.NEWLINE);
-           }
-
-           else{ 
-             fbuffer.append("<TD>" + StringUtils.NEWLINE);
-             fbuffer.append("<%" + StringUtils.NEWLINE);
-             fbuffer.append("if(" +  getInstanceName() + " != null){" + StringUtils.NEWLINE);
-             String afterString = getInstanceName();
-             String tmpString = "tebece";
-             String prevString = getInstanceName();
-             String newTmpString = "";
-             for(int i=0;i<getterCount();i++){
-               newTmpString = tmpString + i;
-               fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
-               prevString = newTmpString; 
-               fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
-               afterString = newTmpString;
-             }
-             fbuffer.append("%>" + StringUtils.NEWLINE);
-             fbuffer.append("<%=");
-             fbuffer.append(afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ StringUtils.NEWLINE);
-             fbuffer.append("%>");
-             fbuffer.append("<%");
-             for(int i=0;i<getterCount();i++){
-               fbuffer.append("}");
-             }
-             fbuffer.append("}%>" + StringUtils.NEWLINE);
-             fbuffer.append("</TD>" + StringUtils.NEWLINE);
-           }
-        }
-       
-     }
-         
-      //Now carry on down the rest of the bean
-     else {
-        AttributeVisitor attributeVisitor = new AttributeVisitor();
-        attributeVisitor.setResidentVector1(returnParentGetter());
-        attributeVisitor.setResidentVector2(returnParentGetterType());
-        InputFileAttributeGenerator inputFileAttributeGenerator = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
-        inputFileAttributeGenerator.setReturnParam(getReturnParam());
-        inputFileAttributeGenerator.setInstanceName(fInstanceName);
-        attributeVisitor.run(element,inputFileAttributeGenerator);
-        fbuffer = inputFileAttributeGenerator.getStringBuffer();
-       
-        //now do fields very similar
-        FieldVisitor fieldVisitor = new FieldVisitor();
-        fieldVisitor.setResidentVector1(returnParentGetter());
-        fieldVisitor.setResidentVector2(returnParentGetterType());
-        InputFileAttributeGenerator inputFileAttributeGenerator2 = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
-        inputFileAttributeGenerator2.setReturnParam(getReturnParam());
-        inputFileAttributeGenerator2.setInstanceName(fInstanceName);
-        fieldVisitor.run(element,inputFileAttributeGenerator2);
-        fbuffer = inputFileAttributeGenerator2.getStringBuffer();
-       
-        
-
-     }
-
-
-      return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
deleted file mode 100644
index a8f4cb17e..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a LevelsDeepVisitorAction.
-* */
-public class LevelsDeepVisitorAction implements VisitorAction 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private int fLevelsDeep;
-  private int fDeepestLevel;
-  
-  /**
-  * Constructor.
-  * This is the starting point
-  * 
-  */
-  public LevelsDeepVisitorAction ()
-  {
-    fLevelsDeep = 0;
-  }
-
-  /**
-  * Constructor.
-  * This is the starting point
-  * 
-  */
-  public LevelsDeepVisitorAction (int current,boolean increment)
-  {
-    fLevelsDeep = current;
-    if(increment) fLevelsDeep++;
-    fDeepestLevel = fLevelsDeep; 
-  }
-  
-  public void initialize(String resident)
-  {
-    //nothing to be done but must be implemented
-  }
-
-
-
-  /**
-  * The visitor that called this VisitorAction
-  * @param visitor the visitor that called this visitor action
-  */
-  public void setVisitor(Visitor visitor)
-  {
-  }
-
-
-  /**
-  * Returns the level of nesting within this bean
-  * @return int returns the int number representing the number of nests of this bean
-  */
-  public int getLevelsDeep()
-  {
-     return fDeepestLevel;
-  }
- 
-
-  /**
-  * Takes in an object to be acted upon by this visitor action
-  * @param Object The object to be acted upon
-  */
-  public IStatus visit (Object object)
-  {
-      Element element = (Element)object;
-      if (element instanceof AttributeElement || element instanceof TypeElement){
-         TypeVisitor typeVisitor = new TypeVisitor();
-         LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,true);
-         typeVisitor.run(element,lvda);
-
-         if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep(); 
-         
-      }
-      else if (element instanceof BeanElement && !(TypeFactory.recognizedBean(element.getName()))){
-         AttributeVisitor attributeVisitor = new AttributeVisitor();
-         LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,false);
-         attributeVisitor.run(element,lvda);
-         if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep(); 
-   
-         FieldVisitor fieldVisitor = new FieldVisitor();
-         LevelsDeepVisitorAction lvda2 = new LevelsDeepVisitorAction(fLevelsDeep,false);
-         fieldVisitor.run(element,lvda2);
-         if (lvda2.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda2.getLevelsDeep(); 
-   
-      }
-         
-     return Status.OK_STATUS;   
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
deleted file mode 100644
index 3a8973402..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
+++ /dev/null
@@ -1,77 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileGenerator extends Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public String fInputName;
-  /**
-  * Constructor.
-  * 
-  */
-  public MethodFileGenerator (String inputs)
-  {
-    super();
-    fInputName = inputs;
-  }
-
-   /**
-  * Constructor.
-  * @param StringBuffer buffer to append codegen 
-  */
-  public MethodFileGenerator (StringBuffer buffer,String inputs)
-  {
-    super(buffer);
-    fInputName = inputs;
-  }
-
-
-  public void setFileNames(String inputs)
-  {
-    fInputName = inputs;
-  }
-
-  //public static String LOCATOR = "Locator";
-  public static String BEAN = "Proxy";
-  public static String GET = "get";
-
-  
-  //takes in a bean node
-  public IStatus visit (Object object)
-   {
-      Element beanElement = (Element)object;
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE + "<HEAD>" + StringUtils.NEWLINE + "<TITLE>Methods</TITLE>" + StringUtils.NEWLINE + "</HEAD>" + StringUtils.NEWLINE + "<BODY>" + StringUtils.NEWLINE + "<H1>Methods</H1>" + StringUtils.NEWLINE + "<UL>" + StringUtils.NEWLINE);
-      MethodVisitor methodVisitor = new MethodVisitor();
-      MethodFileHelpGenerator methodFileHelpGenerator = new MethodFileHelpGenerator(fbuffer,fInputName); 
-      methodVisitor.run(beanElement,methodFileHelpGenerator);
-      fbuffer = methodFileHelpGenerator.getStringBuffer();
-      fbuffer.append("</UL>" + StringUtils.NEWLINE + "</BODY>" + StringUtils.NEWLINE + "</HTML>");
-      
-      return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
deleted file mode 100644
index 45ff5f9e2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
+++ /dev/null
@@ -1,56 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileHelpGenerator extends MethodFileGenerator
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  /**
-  * Constructor.
-  *
-  */
-  public MethodFileHelpGenerator (StringBuffer buffer,String inputName)
-  {
-      super(buffer,inputName);
-  }
-
-
-  //takes in a Method node
-  public IStatus visit (Object object)
-  {
-      Element methodElement = (Element)object;
-      MethodElement method = (MethodElement)methodElement;
-      if (method.getMethodOmmission()) return Status.OK_STATUS;
-      
-      fbuffer.append("<LI><A HREF=\"" + fInputName + "?method=" + method.getNumberID());
-      fbuffer.append("\" TARGET=\"inputs\"> " + method.getDisplayName());
-      fbuffer.append("</A></LI>" + StringUtils.NEWLINE);
-
-      return Status.OK_STATUS;
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
deleted file mode 100644
index 34e7a4da0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,89 +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.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-/**
-* Objects of this class represent a ResultFileAttributeGenerator.
-* */
-public class ResultFileAttributeGenerator extends ResultFileHelp2Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  private Vector fSetterVector; 
-
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileAttributeGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-      
-  }
-  
-  /**
-  * Setter vector
-  */
-  public Vector getSetterVector()
-  {
-      return fSetterVector;
-  }
-  
-
-  /**
-  * Visit Method generates code for this Visitor
-  * @param Parameter parameter code will be generated 
-  */
-  public IStatus visit (Object object)
-  {
-     AttributeElementType attributeElementType = (AttributeElementType)object;
-     BasicElement element = (BasicElement)object;
-     if(attributeElementType.getTypeElement().isSimple() || TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())){      
-        //start the codegen
-        //ask the datatype for its request line, it may need mark up or not.
-        //ie For the simple types we need the mark up
-        //for the dom element we cant use it.
-        DataType dataType = TypeFactory.createType(attributeElementType.getTypeElement().getName(),element.getMUID());
-        setTypeOwnerId(idName(element.getName())); 
-        fbuffer.append(dataType.getRequestCode(element.getMUID(),getTypeOwnerId()));
-                
-     }
-     
-     TypeVisitor typeVisitor = new TypeVisitor();
-     ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
-     resultFileTypeGenerator.setNumberFactory(getNumberFactory());
-     resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-     
-     typeVisitor.run(attributeElementType,resultFileTypeGenerator);
-     setNumberFactory(resultFileTypeGenerator.getNumberFactory());
-     Vector setterInputs = resultFileTypeGenerator.getResidentVector(); 
-     if(attributeElementType.getSetterMethod() == null) return Status.OK_STATUS; 
-     putResidentVector(attributeElementType.getSetterSignature((String)setterInputs.firstElement()));
-     
-     return Status.OK_STATUS;
-  }   
-
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
deleted file mode 100644
index 586bba91a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,139 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class ResultFileGenerator extends Generator 
-{
-  public static String TRIPLE_TAB = Generator.DOUBLE_TAB + Generator.TAB; 
-  public static String QUAD_TAB = Generator.DOUBLE_TAB + Generator.DOUBLE_TAB;
-  
-  private String setEndpointMethod;
-
-  /**
-  * Constructor.
-  * 
-  */
-  public ResultFileGenerator ()
-  {
-      super();
-  }
-
-   /**
-  * Constructor.
-  * 
-  */
-  public ResultFileGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-  }
-
-  //takes in a bean node
-  public IStatus visit (Object object)
-  {
-      Element beanElement = (Element)object;
-      BeanElement bean = (BeanElement)beanElement;
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE);
-      fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TITLE>Result</TITLE>" + StringUtils.NEWLINE);
-      fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("<H1>Result</H1>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
-      fbuffer.append("<jsp:useBean id=\""+ getSessionBeanId() + "\" scope=\"session\" class=\"");
-      fbuffer.append(bean.getName() + "\" />" + StringUtils.NEWLINE);
-      if (setEndpointMethod != null && setEndpointMethod.length() > 0)
-      {
-        fbuffer.append("<%");
-        fbuffer.append(StringUtils.NEWLINE);
-        fbuffer.append("if (request.getParameter(\"endpoint\") != null && request.getParameter(\"endpoint\").length() > 0)");
-        fbuffer.append(StringUtils.NEWLINE);
-        fbuffer.append(getSessionBeanId());
-        fbuffer.append(".");
-        int index = setEndpointMethod.indexOf('?');
-        if (index != -1)
-        {
-          fbuffer.append(setEndpointMethod.substring(0, index));
-          fbuffer.append("(new ");
-          fbuffer.append(setEndpointMethod.substring(index+1, setEndpointMethod.length()));
-          fbuffer.append("(request.getParameter(\"endpoint\")));");
-        }
-        else
-        {
-          fbuffer.append(setEndpointMethod);
-          fbuffer.append("(request.getParameter(\"endpoint\"));");
-        }
-        fbuffer.append(StringUtils.NEWLINE);
-        fbuffer.append("%>");
-        fbuffer.append(StringUtils.NEWLINE);
-      }
-      fbuffer.append(StringUtils.NEWLINE); 
-            
-      //carry on with regular gorp
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
-      fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
-      fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
-      fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE); 
-      fbuffer.append("boolean gotMethod = false;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
-      fbuffer.append("try {" + StringUtils.NEWLINE);
-      fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-    
-      // go to the next generator
-      MethodVisitor methodVisitor = new MethodVisitor();
-      ResultFileHelp1Generator resultFileHelp1Generator = new ResultFileHelp1Generator(fbuffer); 
-      resultFileHelp1Generator.setNumberFactory(getNumberFactory());
-      resultFileHelp1Generator.setClientFolderPath(getClientFolderPath());
-      methodVisitor.run(beanElement,resultFileHelp1Generator);
-      setNumberFactory(resultFileHelp1Generator.getNumberFactory());
-
-      fbuffer = resultFileHelp1Generator.getStringBuffer();
- 
-      fbuffer.append("}" + StringUtils.NEWLINE);    
-      fbuffer.append("} catch (Exception e) { " + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("exception: <%= e %>" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("return;" + StringUtils.NEWLINE);
-      fbuffer.append("}" + StringUtils.NEWLINE);
-      fbuffer.append("if(!gotMethod){" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("result: N/A" + StringUtils.NEWLINE);
-      fbuffer.append("<%" + StringUtils.NEWLINE);
-      fbuffer.append("}" + StringUtils.NEWLINE);
-      fbuffer.append("%>" + StringUtils.NEWLINE);
-      fbuffer.append("</BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("</HTML>");
-
-      return Status.OK_STATUS;
-    }
-
-  /**
-   * @param setEndpointMethod The setEndpointMethod to set.
-   */
-  public void setSetEndpointMethod(String setEndpointMethod)
-  {
-    this.setEndpointMethod = setEndpointMethod;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
deleted file mode 100644
index b6d38ab37..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
+++ /dev/null
@@ -1,148 +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.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ReturnParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a ResultFilegenerator.
-* */
-public class ResultFileHelp1Generator extends ResultFileGenerator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  public static final int INITIAL_STATE = 1;
-  public static final int FINAL_STATE = 2;
-  public static final String MTEMP = "mtemp";
-  public static String BEAN = "Proxy";
-  
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileHelp1Generator (StringBuffer buffer)
-  {
-      super(buffer);    
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param method method code will be generated for 
-  */
-  public IStatus visit (Object object)
-  {
-     Element methodElement = (Element)object;
-  
-
-     MethodElement method = (MethodElement)methodElement;
-     if (method.getMethodOmmission()) return Status.OK_STATUS;
-
-     fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
-     visitHelper(method);
-     
-     fbuffer.append("break;" + StringUtils.NEWLINE); 
-  
-     return Status.OK_STATUS;
-  }   
-  /**
-  * Helps out the visitor
-  * @param method method code will be generated for 
-  */
-  public void visitHelper (Element methodElement)
-  {
-
-     fbuffer.append(Generator.DOUBLE_TAB + "gotMethod = true;" + StringUtils.NEWLINE);
-     
-     MethodElement method = (MethodElement)methodElement;
-     // go to the next generator
-     ResultFileHelp2Generator resultFileHelp2Generator = new ResultFileHelp2Generator(fbuffer); 
-     resultFileHelp2Generator.setNumberFactory(getNumberFactory());
-     ParameterVisitor parameterVisitor = new ParameterVisitor();
-     parameterVisitor.run(methodElement,resultFileHelp2Generator);
-     fbuffer = resultFileHelp2Generator.getStringBuffer();
-     setNumberFactory(resultFileHelp2Generator.getNumberFactory());
-     // we must now grab the state data from the resident vector
-     setResidentVector(resultFileHelp2Generator.getResidentVector());
-
-     
-     //there is no return type if void occurs    
-    
-     
-     if (method.getReturnParameterElement().getTypeElement().getName().equals("void"))
-        fbuffer.append(Generator.DOUBLE_TAB + getSessionBeanId() + "." +method.getName() + "(");
-
-     else{
-        fbuffer.append(Generator.DOUBLE_TAB + method.getReturnParameterElement().getTypeElement().getName() + Generator.SPACE + method.getMUID() + MTEMP + Generator.SPACE);
-        fbuffer.append("=" + Generator.SPACE + getSessionBeanId() + "." + method.getName() + "(");
-     }
-
-     Enumeration e = fResidentVector.elements();
-     while (e.hasMoreElements()){
-          fbuffer.append((String)e.nextElement());
-          if (e.hasMoreElements())
-              fbuffer.append(",");    
-     }
-     fbuffer.append(");" + StringUtils.NEWLINE);
-     if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()){
-        //in case our result is null
-        fbuffer.append("if(" + method.getMUID() + "mtemp == null){" + StringUtils.NEWLINE);
-        fbuffer.append("%>" + StringUtils.NEWLINE);
-        fbuffer.append("<%=" + method.getMUID() + "mtemp %>" + StringUtils.NEWLINE);
-        fbuffer.append("<%" + StringUtils.NEWLINE);
-        fbuffer.append("}else{" + StringUtils.NEWLINE);
-     }
-     
-     //now lets display the return bean
-     // if it is simple we dont need to use the generator
-     
-     if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")){
-        if (method.getReturnParameterElement().getTypeElement().isSimple() 
-           || TypeFactory.recognizedBean(method.getReturnParameterElement().getTypeElement().getName())
-           || TypeFactory.isStateLessBean(method.getReturnParameterElement().getTypeElement().getTypeName())
-           || TypeFactory.isRecognizedReturnType(method.getReturnParameterElement().getTypeElement().getTypeName())){
-           DataType dataType = TypeFactory.createType(method.getReturnParameterElement().getTypeElement().getTypeName(),method.getReturnParameterElement().getMUID());
-           fbuffer.append(dataType.TypeConversion(method.getMUID() + MTEMP));
-        }
-        else{
-           fbuffer.append("%>" + StringUtils.NEWLINE);
-           InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
-           inputFileHelp2Generator.setInstanceName(method.getMUID() + MTEMP);
-           inputFileHelp2Generator.setReturnParam(true);
-           ReturnParameterVisitor returnParameterVisitor = new ReturnParameterVisitor();
-           returnParameterVisitor.run(method,inputFileHelp2Generator);
-           fbuffer = inputFileHelp2Generator.getStringBuffer();
-           fbuffer.append("<%" + StringUtils.NEWLINE);
-
-        }
-     }
-
-    if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")  && !method.getReturnParameterElement().getTypeElement().isPrimitive()) fbuffer.append("}" + StringUtils.NEWLINE);    
-    
-  }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
deleted file mode 100644
index 724285e06..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
+++ /dev/null
@@ -1,100 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileHelp2Generator extends Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-   
-  private String fTypeOwnerId;  
-
-
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileHelp2Generator (StringBuffer buffer)
-  {
-      super(buffer);
-      
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param Parameter parameter code will be generated 
-  */
-  public IStatus visit (Object object)
-  {
-    
-
-     ParameterElement parameterElement = (ParameterElement)object;
-     parameterElement.getTypeElement(); 
-     if(parameterElement.getTypeElement().isSimple() || TypeFactory.recognizedBean(parameterElement.getTypeElement().getName())){      
-        //start the codegen
-         //ask the datatype for its request line, it may need mark up or not.
-        //ie For the simple types we need the mark up
-        //for the dom element we cant use it.
-        DataType dataType = TypeFactory.createType(parameterElement.getTypeElement().getName(),parameterElement.getMUID());
-        setTypeOwnerId(idName(parameterElement.getName()));
-        fbuffer.append(dataType.getRequestCode(parameterElement.getMUID(),getTypeOwnerId()));
-     }
-         
-     //visit the type generator
-     ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer); 
-     resultFileTypeGenerator.setNumberFactory(getNumberFactory());
-     resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-     TypeVisitor TypeVisitor = new TypeVisitor();
-     TypeVisitor.run(parameterElement,resultFileTypeGenerator);
-     fbuffer = resultFileTypeGenerator.getStringBuffer();
-     setNumberFactory(resultFileTypeGenerator.getNumberFactory());
-     String name = (String)resultFileTypeGenerator.getResidentVector().firstElement();
-     putResidentVector(name); 
-     
-     return Status.OK_STATUS;
-  }
-
-
-  public String getTypeOwnerId()
-  {
-     if (fTypeOwnerId == null) fTypeOwnerId = ""; 
-     return fTypeOwnerId;
-  }
-
-  public void setTypeOwnerId(String name)
-  {
-    fTypeOwnerId = name;
-  }
-
-  public String idName(String name)
-  {
-  	
-    String uniqueNum = String.valueOf(getUniqueNumber());
-    String newName = name.replace('.','1') + "_" +uniqueNum + "id";
-    return newName;
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
deleted file mode 100644
index f78cd599d..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /dev/null
@@ -1,110 +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.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileTypeGenerator extends ResultFileHelp2Generator 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-
-  public String fTypeIdName;
- 
-  /**
-  * Constructor.
-  * @param buffer StringBuffer object that this code generator writes to 
-  */
-  public ResultFileTypeGenerator (StringBuffer buffer)
-  {
-      super(buffer);
-  }
-  
-  /**
-  * Visit Method generates code for this Visitor
-  * @param Parameter parameter code will be generated 
-  */
-  public IStatus visit (Object object)
-  {
-     Element typeElement = (Element)object;
-     TypeElement type = (TypeElement)typeElement;      
-     // right now we only have simple to worry about
-     if(type.isSimple() || TypeFactory.recognizedBean(type.getName())){
-       // create the type that represents the simple type name
-       DataType dataType = TypeFactory.createType(type.getName(),type.getOwningElement().getMUID());
-  
-       String nodeName = getTypeOwnerId()+ "Temp";
-       fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
-       putResidentVector(nodeName);
-     }
-
-     else {
-       //must be complex
-       String typeName = typeElement.getName(); 
-       fTypeIdName = idName(typeName);
-              
-       AttributeVisitor attributeVisitor = new AttributeVisitor();
-       ResultFileAttributeGenerator resultFileAttributeGenerator = new ResultFileAttributeGenerator(fbuffer);
-       resultFileAttributeGenerator.setNumberFactory(getNumberFactory());
-       attributeVisitor.run(typeElement,resultFileAttributeGenerator);
-       setNumberFactory(resultFileAttributeGenerator.getNumberFactory());
-       fbuffer = resultFileAttributeGenerator.getStringBuffer();
-
-       FieldVisitor fieldVisitor = new FieldVisitor();
-       ResultFileAttributeGenerator resultFileAttributeGenerator2 = new ResultFileAttributeGenerator(fbuffer);
-       resultFileAttributeGenerator2.setNumberFactory(getNumberFactory());
-       fieldVisitor.run(typeElement,resultFileAttributeGenerator2);
-       setNumberFactory(resultFileAttributeGenerator2.getNumberFactory());
-       fbuffer = resultFileAttributeGenerator2.getStringBuffer();
-
-      
-       fbuffer.append(Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE);
-       fbuffer.append(Generator.DOUBLE_TAB + "<jsp:useBean id=\"" + fTypeIdName + "\" scope=\"session\" class=\"" + typeName + "\" />" + StringUtils.NEWLINE);
-       fbuffer.append(Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE);
-         
-       Enumeration e = resultFileAttributeGenerator.getResidentVector().elements();
-       while(e.hasMoreElements()){
-          fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e.nextElement() + StringUtils.NEWLINE);
-       }
-
-       Enumeration e2 = resultFileAttributeGenerator2.getResidentVector().elements();
-       while(e2.hasMoreElements()){
-          fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e2.nextElement() + StringUtils.NEWLINE);
-       } 
-       putResidentVector(fTypeIdName);
-       //end of changes
-     
-    }
-     
-     return Status.OK_STATUS;
-  }   
-  
-
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
deleted file mode 100644
index 83fe42bca..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
+++ /dev/null
@@ -1,88 +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.consumption.sampleapp.codegen;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* Objects of this class represent a TestClientFilegenerator.
-* */
-public class TestClientFileGenerator extends Generator
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  public String fMethodName;
-  public String fInputName;
-  public String fResultName;
-  
-  /**
-  * Constructor.
-  *
-  */
-  public TestClientFileGenerator (String inputs, String methods, String results)
-  {
-     super();
-     fInputName = inputs;
-     fMethodName = methods;
-     fResultName = results;
-  }
-
-  public void setFileNames(String inputs, String methods, String results)
-  {
-    fInputName = inputs;
-    fMethodName = methods;
-    fResultName = results;
-  }
-
-  //takes in a bean node
-   public IStatus visit (Object object)
-   {
-      fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
-      fbuffer.append("<HTML>" + StringUtils.NEWLINE);
-      fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
-      fbuffer.append("<TITLE>Web Services Test Client</TITLE>" + StringUtils.NEWLINE);
-      fbuffer.append("</HEAD>" + StringUtils.NEWLINE + "");
-      fbuffer.append("<FRAMESET  COLS=\"220,*\">" + StringUtils.NEWLINE);
-      fbuffer.append("<FRAME SRC=\""+ fMethodName + "\" NAME=\"methods\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
-      fbuffer.append("<FRAMESET  ROWS=\"80%,20%\">" + StringUtils.NEWLINE);
-      fbuffer.append("<FRAME SRC=\""+ fInputName  + "\" NAME=\"inputs\"  MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
-      fbuffer.append("<%").append(StringUtils.NEWLINE);
-      fbuffer.append("StringBuffer resultJSP = new StringBuffer(\"").append(fResultName).append("\");").append(StringUtils.NEWLINE);
-      fbuffer.append("resultJSP.append(\"?\");").append(StringUtils.NEWLINE);
-      fbuffer.append("java.util.Enumeration resultEnum = request.getParameterNames();");
-      fbuffer.append("while (resultEnum.hasMoreElements()) {").append(StringUtils.NEWLINE);
-      fbuffer.append("Object resultObj = resultEnum.nextElement();").append(StringUtils.NEWLINE);
-      fbuffer.append("resultJSP.append(resultObj.toString()).append(\"=\").append(request.getParameter(resultObj.toString())).append(\"&\");").append(StringUtils.NEWLINE);
-      fbuffer.append("}").append(StringUtils.NEWLINE);
-      fbuffer.append("%>").append(StringUtils.NEWLINE);
-      fbuffer.append("<FRAME SRC=\"<%=resultJSP.toString()%>\" NAME=\"result\"  MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
-      fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-
-
-      fbuffer.append("<NOFRAMES>" + StringUtils.NEWLINE);
-      fbuffer.append("<BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("The Web Services Test Client requires a browser that supports frames." + StringUtils.NEWLINE);
-      fbuffer.append("</BODY>" + StringUtils.NEWLINE);
-      fbuffer.append("</NOFRAMES>" + StringUtils.NEWLINE);
-      fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-      fbuffer.append("</HTML>");
-
-      return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
deleted file mode 100644
index 111d2b9a0..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
+++ /dev/null
@@ -1,104 +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.consumption.sampleapp.command;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
- * MofToBeanModelCommand
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class GeneratePageCommand extends AbstractDataModelOperation 
-{
-		
-private Model model_;
-private Generator fGenerator;
-private IFile fIFile;
-private ResourceContext resourceContext_;
-private StringBuffer fStringBuffer;
-
-/**
- * Build constructor comment.
- */
-public GeneratePageCommand()
-{
-}
-
-/**
-* Constructor
-* This command will generate code from a Model
-* @param model The model to be traversed
-* @param generator The code generator to be used
-* @param resource the resource to place the finished product
-*/
-public GeneratePageCommand(ResourceContext context, Model model, Generator generator, IFile file)
-{
-  model_ = model;
-  fGenerator = generator;
-  fIFile = file;
-  resourceContext_ = context;
-}
-
-public Model getJavaDataModel()
-{
-  return model_;
-}
-
-/**
- *
- */
-public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-{
-  Environment env = getEnvironment();
-  
-  IStatus status = Status.OK_STATUS;
-  try {
-    fGenerator.visit(model_.getRootElement());
-    fStringBuffer = fGenerator.getStringBuffer();
-    String tempString = fStringBuffer.toString();
-    OutputStream fileResource = FileResourceUtils.newFileOutputStream(resourceContext_, fIFile.getFullPath(), monitor, env.getStatusHandler());
-    //PrintStream ps = new PrintStream(fileResource);
-    //ps.print(tempString);
-    OutputStreamWriter osw = new OutputStreamWriter(fileResource,"UTF-8");
-    osw.write(tempString,0,fStringBuffer.length());  
-    osw.close();
-    fileResource.close();
-    return status;
-  } catch (IOException ioexc) {
-  	status = StatusUtils.errorStatus( ioexc );
-  	return status;
-  }
-}
-
-public void setRootElement(Element rootElement)
-{
-}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
deleted file mode 100644
index 4bb41e97a..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,229 +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.consumption.sampleapp.command;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* This is the base class for commands that need to report progress
-* and status during and after their execution. This class extends
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-* with methods to {@link #setProgressMonitor set}
-* and {@link #getProgressMonitor get} a progress monitor,
-* and to get a status object {@link #getReadyStatus before}
-* or {@link #getResultStatus after} execution.
-* <p>
-* Note that the responsibility of providing an
-* {@link org.eclipse.core.runtime.IProgressMonitor IProgressMonitor}
-* rests with frameworks that construct or run ProgressCommand objects,
-* whereas the responsibility of providing an
-* {@link org.eclipse.core.runtime.IStatus IStatus}
-* object lies with the subclasses of ProgressCommand.
-* Subclasses must follow the rules described for
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}.
-*/
-public class JavaToModelCommand extends AbstractDataModelOperation
-{
-  private MessageUtils msgUtils;
-  private String clientProject;
-  private BooleanSelection[] methods;
-  private String proxyBean;
-  private JavaClass javaClass;
-  private Model model;
-  private Element parentElement;
-  
-  public JavaToModelCommand ()
-  {
-	String pluginId = "org.eclipse.jst.ws.consumption";
-	msgUtils = new MessageUtils(pluginId + ".plugin", this);  	
-  }
-
-  
-  private IStatus createJavaReflection(Environment env, IProgressMonitor monitor )
-  {
-  	IStatus status = Status.OK_STATUS;
-    JavaMofReflectionCommand javaMofReflectionCommand = new JavaMofReflectionCommand();
-    javaMofReflectionCommand.setClientProject(clientProject);
-    javaMofReflectionCommand.setProxyBean(proxyBean);
-    javaMofReflectionCommand.setEnvironment( env );
-    //javaMofReflectionCommand.setStatusMonitor(getStatusMonitor());
-    status = javaMofReflectionCommand.execute( monitor, null);
-    javaClass = (JavaClass)javaMofReflectionCommand.getJavaClass();
-    return status;
-  }
-
-  /**
-  * The Model that was created from this javamof
-  * @return Model The data model that was created
-  **/
-  public Model getJavaDataModel()
-  {
-    return model;
-  }
-
-  /**
-  * Build the datamodel from the mof
-  */
-  public IStatus buildModelFromMof (Environment env) throws CoreException
-  {
-  	
-  	Choice OKChoice = new Choice('O', msgUtils.getMessage("LABEL_OK"), msgUtils.getMessage("DESCRIPTION_OK"));
-  	Choice CancelChoice = new Choice('C', msgUtils.getMessage("LABEL_CANCEL"), msgUtils.getMessage("DESCRIPTION_CANCEL"));
-  	
-    // we could have one of three cases:
-    //1. The model is null meaning we want and the parent element is null, meaning we want to
-    //   create a brand new model and make this bean its root
-    //2. The model is null but the parentElement is not, meaning we want to add the Bean to the
-    //   given parent element
-    //3. The model is not null however the parentElement is, meaning we want to add this Bean to
-    //   This model but dont attach it to anything
-      IStatus status = Status.OK_STATUS;
-
-      if(model == null && parentElement == null){
-         JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(clientProject,methods, env);
-         //beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	     JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-         status = beanVisitor.run(javaClass,beanVisitorAction);
-         //
-         int severity = status.getSeverity(); 
-         if (severity==Status.ERROR)
-         	return status;
-         
-         if (severity==Status.WARNING)
-         {
-           Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-           if (result.getLabel().equals(CancelChoice.getLabel()))
-           {
-           	 //return an error status since the user canceled
-           	  return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-           }
-           	
-         }
-         //
-         model = beanVisitorAction.getModel();
-
-      }
-      else if (model == null && parentElement != null){
-         JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(parentElement,clientProject, env);
-         //beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	     JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-         status = beanVisitor.run(javaClass,beanVisitorAction);
-         //
-         int severity = status.getSeverity(); 
-         if (severity==Status.ERROR)
-         	return status;
-         
-         if (severity==Status.WARNING)
-         {
-           Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-           if (result.getLabel().equals(CancelChoice.getLabel()))
-           {
-           	 //return an error status since the user canceled
-           	  return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-           }
-           	
-         }
-         //         
-         model = beanVisitorAction.getModel();
-      }
-      else {
-         JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(model,clientProject, env);
-         //beanVisitorAction.setStatusMonitor(getStatusMonitor());
-	     JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
-         status = beanVisitor.run(javaClass,beanVisitorAction);
-         //
-         int severity = status.getSeverity(); 
-         if (severity==Status.ERROR)
-         	return status;
-         
-         if (severity==Status.WARNING)
-         {
-           Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
-           if (result.getLabel().equals(CancelChoice.getLabel()))
-           {
-           	 //return an error status since the user canceled
-           	  return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED") );
-           }
-           	
-         }
-         //         
-         model = beanVisitorAction.getModel();
-      }
-
-      return status;
-  }
-
-  /**
-  * Get the java model from the resource then
-  * build the model from the mof
-  */
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-  	IStatus status = Status.OK_STATUS;
-    if(clientProject == null) return status;
-    
-  	status = createJavaReflection(env, monitor);
-    if (status.getSeverity()==Status.ERROR) return status;
-    try{
-      status = buildModelFromMof(env);
-      return status;
-    }catch(CoreException exc){
-      IStatus embeddedStatus = exc.getStatus();
-      status = embeddedStatus;
-      return status;
-    }
-
-  }
-    
-  public void setMethods(BooleanSelection[] methods)
-  {
-  	this.methods =  methods;
-  }
-  
-  public void setClientProject(String clientProject)
-  {
-  	this.clientProject = clientProject;
-  }
-  
-  public void setParentElement(Element parentElement)
-  {
-  	this.parentElement = parentElement;
-  }
-     
-  public void setProxyBean(String proxyBean)
-  {
-  	this.proxyBean = proxyBean;
-  }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
deleted file mode 100644
index 74f4b0115..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
+++ /dev/null
@@ -1,115 +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.consumption.sampleapp.common;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-
-
-/**
-* Objects of this class represent a PropertyDescriptor.
-* */
-public class SamplePropertyDescriptor 
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-  private Method fReadMethod;
-  private Method fWriteMethod;
-  private String fPropertyName;
-  private JavaHelpers fPropertyType; 
-  private boolean fStatic;
-  
-  /*
-  * Constructor
-  **/
-  public SamplePropertyDescriptor(String name)
-  {
-    fPropertyName = name; 
-  }
-
-  /*
-  * set the ReadMethod
-  */
-  public void setReadMethod(Method readMethod)
-  {
-    fReadMethod = readMethod;
-  }
-
-   /*
-  * get the ReadMethod 
-  */
-  public Method getReadMethod()
-  {
-    return fReadMethod;
-  }
-
-  /*
-  * set the writeMethod
-  */
-  public void setWriteMethod(Method writeMethod)
-  {
-    fWriteMethod = writeMethod;
-  }
-
-   /*
-  * get the writeMethod 
-  */
-  public Method getWriteMethod()
-  {
-    return fWriteMethod;
-  }
-
-  /*
-  * set the propertyName
-  */
-  public void setName(String name)
-  {
-    fPropertyName= name;
-  }
-
-   /*
-  * get the propertyName
-  */
-  public String getName()
-  {
-    return fPropertyName;
-  }
-
-  /*
-  * set the PropertyType
-  */
-  public void setPropertyType(JavaHelpers propertyType)
-  {
-    fPropertyType = propertyType;
-  }
-
-   /*
-  * get the PropertyType 
-  */
-  public JavaHelpers getPropertyType()
-  {
-    return fPropertyType;
-  }
-      
-  public boolean isfStatic()
-  {
-  	return fStatic;
-  }
-
-  public void setfStatic(boolean fStatic)
-  {
-    this.fStatic = fStatic;	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
deleted file mode 100644
index 7ea7ff5f7..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.List;
-
-public interface IWSFinder
-{
-  public String getID();
-  public void setID(String id);
-
-  public String getName();
-  public void setName(String name);
-
-  public String getDescription();
-  public void setDescription(String desc);
-
-  public List find();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
deleted file mode 100644
index 97b207ecd..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-
-public class LiveWSDLFilter extends Thread
-{
-  private String wsdlURL_;
-  private boolean finish_;
-  private boolean live_;
-
-  public LiveWSDLFilter(String wsdlURL)
-  {
-    wsdlURL_ = wsdlURL;
-    finish_ = false;
-    live_ = false;
-  }
-
-  public String getWSDLURL()
-  {
-    return wsdlURL_;
-  }
-
-  public boolean isFinish()
-  {
-    return finish_;
-  }
-
-  public boolean isWSDLLive()
-  {
-    return live_;
-  }
-
-  public void run()
-  {
-    try
-    {
-      live_ = validateWSDL();
-    }
-    catch (Throwable t)
-    {
-      live_ = false;
-    }
-    finally
-    {
-      finish_ = true;
-    }
-  }
-
-  private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
-  {
-  	WebServicesParserExt parser = new WebServicesParserExt();
-  	Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_);
-    Map services = definition.getServices();
-    Iterator serviceIterator = services.values().iterator();
-    while (serviceIterator.hasNext())
-    {
-      Service service = (Service)serviceIterator.next();
-      Map ports = service.getPorts();
-      Iterator portIterator = ports.values().iterator();
-      while (portIterator.hasNext())
-      {
-        Port port = (Port)portIterator.next();
-        List extensibilityElements = port.getExtensibilityElements();
-        Iterator extensibilityElementsIterator = extensibilityElements.iterator();
-        while (extensibilityElementsIterator.hasNext())
-        {
-          ExtensibilityElement extensibilityElement = (ExtensibilityElement)extensibilityElementsIterator.next();
-          if ((extensibilityElement instanceof SOAPAddress) || (extensibilityElement instanceof HTTPAddress))
-            return true;
-        }
-      }
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
deleted file mode 100644
index e93561e25..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class WSFinderRegistry
-{
-  private static WSFinderRegistry instance_;
-  private Vector wsfinders_;
-
-  private WSFinderRegistry()
-  {
-    wsfinders_ = new Vector();
-  }
-  
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WSFinderRegistry object.
-  */
-  public static WSFinderRegistry getInstance()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new WSFinderRegistry();
-      instance_.init();
-    }
-    return instance_;
-  }
-  
-  private void init()
-  {
-    IExtensionRegistry pluginReg = Platform.getExtensionRegistry();
-    IConfigurationElement[] configElements = pluginReg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "wsfinder");
-    for (int i = 0; i < configElements.length; i++)
-    {
-      try
-      {
-        Object object = configElements[i].createExecutableExtension("class");
-        if (object instanceof IWSFinder)
-        {
-          IWSFinder wsfinder = (IWSFinder)object;
-          wsfinder.setID(configElements[i].getAttribute("id"));
-          wsfinder.setName(configElements[i].getAttribute("name"));
-          wsfinder.setDescription(configElements[i].getAttribute("description"));
-          wsfinders_.add(wsfinder);
-        }
-      }
-      catch (CoreException ce)
-      {
-      }
-    }
-  }
-
-  public List getWSFinders()
-  {
-    return wsfinders_;
-  }
-  
-  public List getWebServices()
-  {
-    List ws = new Vector();
-    List wsFinders = getWSFinders();
-    for (Iterator it = wsFinders.iterator(); it.hasNext();)
-    {
-      IWSFinder wsFinder = (IWSFinder)it.next();
-      ws.addAll(wsFinder.find());
-    }
-    return ws;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
deleted file mode 100644
index 5123e55e2..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import org.w3c.dom.Document;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class DomElementHelper {
-
-
-  public static org.w3c.dom.Element createDomElementFromXMLString(java.lang.String xmlString )
-  {
-    java.io.StringReader stringReader = new java.io.StringReader(xmlString); 
-    org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader); 
-    try
-    {
-      DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-      DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-      Document document = docBuilder.parse(inputSource);
-      return document.getDocumentElement();
-    }
-    catch (Throwable t)
-    {
-      return null;
-    }
-  }
-
-  public static java.lang.String domWriter(org.w3c.dom.Node node,java.lang.StringBuffer buffer)
-  {
-    if ( node == null ) {
-      return "";
-    }
-	int type = node.getNodeType();
-	switch ( type ) {
-	  case org.w3c.dom.Node.DOCUMENT_NODE: {
-	  buffer.append(JspUtils.markup("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + "<br>");
-	  domWriter(((org.w3c.dom.Document)node).getDocumentElement(),buffer);
-	  break;
-	}
-	  case org.w3c.dom.Node.ELEMENT_NODE: {
-	  buffer.append(JspUtils.markup("<" + node.getNodeName()));
-	  org.w3c.dom.Attr attrs[] = sortAttributes(node.getAttributes());
-	  for ( int i = 0; i < attrs.length; i++ ) {
-	    org.w3c.dom.Attr attr = attrs[i];
-	    buffer.append(" " + attr.getNodeName() + "=\"" + JspUtils.markup(attr.getNodeValue()) + "\"");
-	  }
-	    buffer.append(JspUtils.markup(">"));
-	    org.w3c.dom.NodeList children = node.getChildNodes();
-	    if ( children != null ) {
-	      int len = children.getLength();
-		  for ( int i = 0; i < len; i++ ) {
-		    if(((org.w3c.dom.Node)children.item(i)).getNodeType() == org.w3c.dom.Node.ELEMENT_NODE)
-			  buffer.append("<br>");
-			domWriter(children.item(i),buffer);
-		  }
-		}
-		buffer.append(JspUtils.markup("</" + node.getNodeName() + ">"));
-		break;
-      }
-	  case org.w3c.dom.Node.ENTITY_REFERENCE_NODE: {
-	    org.w3c.dom.NodeList children = node.getChildNodes();
-	    if ( children != null ) {
-		  int len = children.getLength();
-		  for ( int i = 0; i < len; i++ )
-	      {
-		    buffer.append(children.item(i));
-		  }
-		}
-		break;
-	  }
-	  case org.w3c.dom.Node.CDATA_SECTION_NODE: {
-	    buffer.append(JspUtils.markup(node.getNodeValue()));
-	    break;
-      }
-	  case org.w3c.dom.Node.TEXT_NODE:{
-	    buffer.append(JspUtils.markup(node.getNodeValue()));
-	    break;
-	  }
-	  case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:{
-		buffer.append(JspUtils.markup("<?"));
-		buffer.append(node.getNodeName());
-		String data = node.getNodeValue();
-		if ( data != null && data.length() > 0 ){
-	      buffer.append(" ");
-		  buffer.append(data);
-		}
-		buffer.append(JspUtils.markup("?>"));
-		  break;
-		}
-	  }
-	  return buffer.toString();
-    }
- 
-	public static org.w3c.dom.Attr[] sortAttributes(org.w3c.dom.NamedNodeMap attrs)
-	{
-	  int len = (attrs != null) ? attrs.getLength() : 0;
-	  org.w3c.dom.Attr array[] = new org.w3c.dom.Attr[len];
-	  for ( int i = 0; i < len; i++ ){
-	   array[i] = (org.w3c.dom.Attr)attrs.item(i);
-	  }
-	  for ( int i = 0; i < len - 1; i++ ) {
-	    String name  = array[i].getNodeName();
-	    int index = i;
-	    for ( int j = i + 1; j < len; j++ ) {
-	      String curName = array[j].getNodeName();
-		  if ( curName.compareTo(name) < 0 ) {
-		    name  = curName;
-			index = j;
-		  }
-		}
-		if ( index != i ) {
-		  org.w3c.dom.Attr temp = array[i];
-		  array[i] = array[index];
-		  array[index] = temp;
-		}
-	  }
-	  return (array);
-    }
- 
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
deleted file mode 100644
index abb9013e9..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
+++ /dev/null
@@ -1,50 +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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class JspUtils {
-	public static String markup(String text) {
-			if (text == null) {
-				return null;
-			}
-
-			StringBuffer buffer = new StringBuffer();
-			for (int i = 0; i < text.length(); i++) {
-				char c = text.charAt(i);
-				switch (c) {
-					case '<':
-						buffer.append("&lt;");
-						break;
-					case '&':
-						buffer.append("&amp;");
-						break;
-					case '>':
-						buffer.append("&gt;");
-						break;
-					case '"':
-						buffer.append("&quot;");
-						break;
-					default:
-						buffer.append(c);
-						break;
-				}
-			}
-			return buffer.toString();
-		}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
deleted file mode 100644
index ba8519010..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
+++ /dev/null
@@ -1,64 +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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class SoapElementHelper {
-/*
- * This class is being gutted for the moment,
- * until a means for including saaj.jar or an
- * equivalent keeper of the javax.xml.soap package
- * can be determined. The disabling of this class
- * will only cause problems if Sample JSPs are
- * generated for Web Service proxies that have
- * SOAPElements on their interfaces.
- * 
-  public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws SoapElementRuntimeException
-  {
-    throw new SoapElementRuntimeException("SoapElement is not supported by the sample on the current runtime. Please use WebSphere v5.1 or higher.");    
-  }
-
-  public static java.lang.String soapElementWriter(javax.xml.soap.SOAPElement node,java.lang.StringBuffer buffer)
-  {
-    if (node == null ) {
-      return "";
-    }
-    
-      buffer.append(JspUtils.markup("<" + node.getElementName().getLocalName()));
-      java.util.Iterator attrs = node.getAllAttributes();
-      while(attrs.hasNext()) {
-        javax.xml.soap.Name attr = (javax.xml.soap.Name)attrs.next();
-        buffer.append(" " + attr.getQualifiedName() + "=\"" + JspUtils.markup(node.getAttributeValue(attr)) + "\"");
-      }
-      buffer.append(JspUtils.markup(">"));
-      java.util.Iterator children = node.getChildElements();
-      if ( children != null ) {
-        while(children.hasNext()){
-          javax.xml.soap.Node childNode = (javax.xml.soap.Node)children.next();
-          if(childNode instanceof javax.xml.soap.SOAPElement){
-            buffer.append("<br>");
-            soapElementWriter((javax.xml.soap.SOAPElement)childNode,buffer);
-          }
-          else
-            buffer.append(JspUtils.markup(((javax.xml.soap.Text)childNode).getValue())); 
-        }
-        buffer.append(JspUtils.markup("</" + node.getElementName().getLocalName() + ">"));
-	  }
-      return buffer.toString();
-	}
-*/
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
deleted file mode 100644
index 2335ef522..000000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.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.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class SoapElementRuntimeException extends Exception  {
-
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3761693372674748471L;
-
-public SoapElementRuntimeException(String message){
-    super(message);
-  }
-  
-  
-      
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
deleted file mode 100644
index c14487cea..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
deleted file mode 100644
index 802346176..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.creation.ejb.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9dad8842a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ejb.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.ui,
- org.eclipse.wst.command.env.ui
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index 6e2940fa0..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
deleted file mode 100644
index 13fe654ef..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
+++ /dev/null
@@ -1,28 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation EJB Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Web service types
-#
-WEBSERVICETYPE_NAME_EJB_TP=EJB Web Service
-WEBSERVICETYPE_NAME_WSDL_EJB_TP=Skeleton EJB Web Service
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
deleted file mode 100644
index 4a8659f76..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    <!-- EJB Web Service Types -->
-<!--   
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
-      <webServiceType
-            label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP"
-            resourceTypeMetadata="File IResource"
-            extensionMetadata=".wsdl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
-            includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
-            excludeNatures=""
-            id="org.eclipse.jst.ws.type.wsdl.ejb">
-      </webServiceType>
-
-      <webServiceType
-		    label="%WEBSERVICETYPE_NAME_EJB_TP"
-		    resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
-		    extensionMetadata=".java .class .SessionImpl"
-		    objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
-		    includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
-		    excludeNatures=""
-		    id="org.eclipse.jst.ws.type.ejb">
-  	 </webServiceType>
-	</extension>
--->
-
-   <!-- Popups -->
-      
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-   </extension>
-
-
-<!-- EJB stuff -->
-     <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
-     <webServiceImpl
-            id="org.eclipse.jst.ws.wsImpl.ejb"
-            label="%WEBSERVICETYPE_NAME_EJB_TP"
-            resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
-            extensionMetadata=".java .class .SessionImpl"
-            objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
-     </webServiceImpl>
-    </extension>    
-    
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
-  <serviceType
-            id="org.eclipse.jst.ws.serviceType.ejb"
-            implId="org.eclipse.jst.ws.wsImpl.ejb"
-            buModuleTypesInclude="jst.ejb"
-            buModuleTypesExclude=""
-            tdModuleTypesInclude="jst.ejb"
-            tdModuleTypesExclude="">
-  </serviceType>
-</extension>   
-
-            
-   
-</plugin>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
deleted file mode 100644
index af1d5819e..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.project b/bundles/org.eclipse.jst.ws.creation.ui/.project
deleted file mode 100644
index ef454e4c4..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.creation.ui</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.jst.ws</project>
-		<project>org.eclipse.jst.ws.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.ui</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.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 6529b2f4d..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,43 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws.internal.creation.ui.extension,
- org.eclipse.jst.ws.internal.creation.ui.plugin,
- org.eclipse.jst.ws.internal.creation.ui.preferences,
- org.eclipse.jst.ws.internal.creation.ui.server,
- org.eclipse.jst.ws.internal.creation.ui.widgets,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.wsdl4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef839..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
deleted file mode 100644
index 74fcd7711..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
deleted file mode 100644
index 2d737f07a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
deleted file mode 100644
index abd1f9c82..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
deleted file mode 100644
index c124705dc..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null
@@ -1,62 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PLUGIN_NEW_WIZARD_NAME_WS_SERVICE=Web Service
-PLUGIN_EXPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_SERVICE=Create a new XML web service.
-PLUGIN_EXPORT_WIZARD_DESC_WS=A wizard for exporting a web service.
-
-#
-#	Web Services Preferance Pages
-#
-# Dialogs
-CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG=Hide Create Web service Dialog
-CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG=Hide Generate Java Bean Skeleton Dialog
-CHECKBOX_SHOW_GENERATE_WSDL_FILES_DIALOG=Hide Generate WSDL Files Dialog
-CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG=Hide Publish WSDL Dialog
-
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-
-
-#
-# Preferences Tooltips
-#
-#Action Dialogs
-TOOLTIP_PPAD_CHECKBOX_DEPLOY=Hides the dialog for deploying a Web service action
-TOOLTIP_PPAD_CHECKBOX_SKELETON=Hides the dialog for generating Java bean Skeleton action
-TOOLTIP_PPAD_CHECKBOX_WSDL=Hides the dialog for generating WSDL files action
-TOOLTIP_PPAD_CHECKBOX_PUBLISH=Hides the dialog for publishing the WSDL action
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-ACTION_GENERATE_JAVA_SKELETON=Generate Java bean skeleton
-ACTION_PUBLISH_WSDL=Publish WSDL file
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSS=Web Service
-
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
deleted file mode 100644
index 99bdf0177..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,245 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <!-- Wizards -->
-
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            id="org.eclipse.jst.ws.ui.new">
-      </category>
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE"
-            icon="icons/full/ctool16/new_webserv_wiz.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         <description>
-            %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/full/wizban/webservices_wiz.gif"
-            title="%WIZARD_TITLE_WSS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.exportWizards">
-      <wizard
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            icon="icons/export_ws.gif"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="wsexport">
-         <description>
-            %PLUGIN_EXPORT_WIZARD_DESC_WS
-         </description>
-      </wizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/export_ws_wiz.gif"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="wsexport">
-      </dynamicWizard>
-   </extension>
-
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            iconbanner="icons/export_ws_wiz.gif"
-            name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
-            class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-      </dynamicWizard>
-   </extension>
-
-   <!-- "Don't Show Me" Preferences -->
-
-   <extension
-         point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0006"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0008"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-      </actionDialogPreferenceType>
-
-      <actionDialogPreferenceType
-            name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG"
-            tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH"
-            infopop="org.eclipse.jst.ws.creation.ui.PPAD0009"
-            category="org.eclipse.jst.wss.popup.category"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-      </actionDialogPreferenceType>
-
-   </extension>
-
-   <!-- Popups -->
-   
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
-            nameFilter="*.java"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-      
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
-         <action
-               label="%ACTION_DEPLOY_WEBSERVICE"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="additions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>       
-      
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsil"
-            id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
-         <action
-               label="%ACTION_GENERATE_JAVA_SKELETON"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
-         </action>
-      </objectContribution>
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         <action
-               label="%ACTION_PUBLISH_WSDL"
-               class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.jst.ws.creation.ui.wizard.publish">
-         </action>
-      </objectContribution>
-
-   </extension>
-   
-   <!-- Preference Pages -->
-
-   <extension point="org.eclipse.ui.preferencePages">
-      <page
-            name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"
-            id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage">
-      </page>
-   </extension>
-   
-	<extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
-       <widgetFactory   
-             id="StartServiceServer"
-             insertBeforeCommandId="org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand"
-             class="org.eclipse.jst.ws.internal.creation.ui.server.StartServerWidgetFactory"/>
-    </extension> 
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
deleted file mode 100644
index 6a4c47a05..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
+++ /dev/null
@@ -1,25 +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
-###############################################################################
-
-#
-# WSDL Test Errors
-#
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=IWAB0361E An error occurred. Unable to launch WSDL test facility.
-
-
-#
-# Wizard pages
-#
-PAGE_TITLE_OBJECT_SELECTION=Object Selection Page
-PAGE_DESC_OBJECT_SELECTION=Object Selection Page
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
deleted file mode 100644
index 8fd6b2f74..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,107 +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.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceAssembleCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-	private String            j2eeLevel_;
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-    
-	  System.out.println( "In Pre service assemble command." );
-    
-		// Check if EAR module is req'd, ie. !=null
-		if (earProject_==null)
-			return Status.OK_STATUS;
-	  
-	  
-		//Create the service EAR module
-		CreateModuleCommand command = new CreateModuleCommand();
-		command.setProjectName(earProject_);
-		command.setModuleName(ear_);
-		command.setModuleType(CreateModuleCommand.EAR);
-		command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
-		command.setServerInstanceId( webService_.getWebServiceInfo().getServerInstanceId() );
-		command.setJ2eeLevel(j2eeLevel_);
-    command.setEnvironment( environment );
-		IStatus status = command.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);
-		  return status;
-		}			
-		
-		
-		//Associate the service module and service EAR
-		AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
-		associateCommand.setProject(project_);
-		associateCommand.setModule(module_);
-		associateCommand.setEARProject(earProject_);
-		associateCommand.setEar(ear_);
-    associateCommand.setEnvironment( environment );
-		status = associateCommand.execute( monitor, null );
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);		  
-		}			
-		
-		return status;	  
-  }
-	
-  public void setProject( String project )
-  {
-	  project_ = project;
-  }
-	  
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }	
-	
-  public void setEarProject( String earProject )
-  {
-	  earProject_ = earProject;
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }
-	
- 
-  public void setJ2eeLevel( String j2eeLevel )
-  {
-	  j2eeLevel_ = j2eeLevel;  
-  }
-	
-  public void setWebService( IWebService webService )
-  {
-	  webService_ = webService;  
-  }	
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
deleted file mode 100644
index 78b1e32b8..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
+++ /dev/null
@@ -1,28 +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.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-public class PreServiceDeployCommand extends AbstractDataModelOperation
-{
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-	  System.out.println( "In Pre service deploy command." );
-
-	  return Status.OK_STATUS;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
deleted file mode 100644
index 8f4513eed..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,255 +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.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class PreServiceDevelopCommand extends AbstractDataModelOperation 
-{
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IContext          context_;
-  private ISelection        selection_;
-	private String						project_;
-  private String            module_;
-  private String			      moduleType_;
-	private String						earProject_;
-  private String            ear_;
-	
-  private IWebService       webService_;
-  private String            j2eeLevel_;
-  private ResourceContext   resourceContext_;
-  
-  private boolean run_;
-  private boolean client_;
-  private boolean test_;
-  private boolean publish_;
-  
-
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment environment = getEnvironment();
-	  
-    // Split up the project and module
-    int index = module_.indexOf("/");
-    if (index!=-1){
-      project_ = module_.substring(0,index);
-      module_ = module_.substring(index+1);
-    }
-
-    if (ear_!=null && ear_.length()>0)
-    {
-      int earIndex = ear_.indexOf("/");
-      if (earIndex!=-1) {
-        earProject_ = ear_.substring(0,earIndex);
-        ear_ = ear_.substring(earIndex+1);
-      }
-    }
-    
-    
-	  IWebServiceRuntime wsrt   = WebServiceRuntimeExtensionUtils.getWebServiceRuntime( typeRuntimeServer_.getRuntimeId() );
-	  WebServiceInfo     wsInfo = new WebServiceInfo();
-
-	  System.out.println( "In Pre service develop command." );
-	
-	  wsInfo.setJ2eeLevel( j2eeLevel_ );
-	  wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
-      wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
-	  wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
-	  wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-    
-		webService_  = wsrt.getWebService( wsInfo );
-	
-		//Set up the IContext
-		WebServiceScenario scenario = null;
-    int scenarioInt = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(typeRuntimeServer_.getTypeId());
-    if (scenarioInt == WebServiceScenario.BOTTOMUP)
-		{
-			scenario = WebServiceScenario.BOTTOMUP_LITERAL;
-      String impl = (String)(selection_.getSelection())[0];
-      wsInfo.setImplURL(impl);
-		}
-    else if (scenarioInt == WebServiceScenario.TOPDOWN)
-		{
-		  scenario = WebServiceScenario.TOPDOWN_LITERAL;
-      String wsdlURL = (String)(selection_.getSelection())[0];
-      wsInfo.setWsdlURL(wsdlURL);      
-		}
-	
-		context_     = new SimpleContext(true, true, true, true, run_, client_, test_, publish_, 
-																		scenario, 
-																		resourceContext_.isOverwriteFilesEnabled(),
-																		resourceContext_.isCreateFoldersEnabled(),
-																		resourceContext_.isCheckoutFilesEnabled());
-
-    //Create the service module
-
-		//rsk todo -- pick the correct module type based on the Web service type, it's hard coded to WEB for now.
-		int intModuleType = convertModuleType(moduleType_);
-		
-
-	      CreateModuleCommand command = new CreateModuleCommand();
-		  command.setProjectName(project_);
-		  command.setModuleName(module_);			
-		  command.setModuleType(intModuleType);
-		  command.setServerFactoryId(typeRuntimeServer_.getServerId());
-		  command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
-		  command.setJ2eeLevel(j2eeLevel_);
-      command.setEnvironment(environment);
-		  IStatus status = command.execute( monitor, null);
-
-		
-		if (status.getSeverity()==Status.ERROR)
-		{
-			environment.getStatusHandler().reportError(status);
-		}			
-	  return status;				
-  }
-  
-  private int convertModuleType(String type)
-  {
-	  if (type.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return CreateModuleCommand.WEB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return CreateModuleCommand.EJB;
-	  }
-	  else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return CreateModuleCommand.APPCLIENT;
-	  }
-	  else if (type.equals(IModuleConstants.JST_EAR_MODULE))
-	  {
-		  return CreateModuleCommand.EAR;
-	  }	  
-	  else
-	  {
-		  return -1;
-	  }
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
-  {
-	  typeRuntimeServer_ = typeRuntimeServer;  
-  }
-	  
-  public void setServiceJ2EEVersion( String j2eeLevel )
-  {
-	j2eeLevel_ = j2eeLevel;  
-  }
-  
-  public String getJ2eeLevel()
-  {
-	  return j2eeLevel_;  
-  }
-	
-  public IWebService getWebService()
-  {
-	return webService_;  
-  }
-  
-  public IContext getContext()
-  {
-    return context_;
-  }
-  
-  public void setResourceContext( ResourceContext resourceContext )
-  {
-    resourceContext_ = resourceContext;	  
-  }
-  
-  public ISelection getSelection()
-  {
-    return selection_;	  
-  }
-  
-  public void setSelection( ISelection selection )
-  {
-	selection_ = selection;  
-  }
-  
-  public String getProject()
-  {
-    return project_;	  
-  }
-	 
-  public String getModule()
-  {
-    return module_;	  
-  }
-	
-  public void setModule( String module )
-  {
-	  module_ = module;
-  }
-  
-  public void setModuleType(String type)
-  {
-	  moduleType_ = type;
-  }
-	
-  public String getEarProject()
-  {
-    return earProject_;	  
-  }
-	
-  public String getEar()
-  {
-	  return ear_;  
-  }
-  
-  public void setEar( String ear )
-  {
-	  ear_ = ear;  
-  }
-  
-	public void setStartService(boolean startService)
-	{
-		run_ = startService;
-	}
-	
-	public void setTestService(boolean testService)
-	{
-		test_ = testService;
-	}	
-	
-  public void setPublishService(boolean publishService)
-  {
-    publish_ = publishService;
-  }
-	
-  public void setGenerateProxy(boolean genProxy)
-  {
-    client_ = genProxy;  
-  }	
-	
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
deleted file mode 100644
index cfdd16209..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,107 +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.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	private String						project_;
-  private String            module_;
-	private String						earProject_;
-  private String            ear_;
-		
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      Environment environment = getEnvironment();
-      
-		  System.out.println( "In Pre service install command." );
-			
-			if (webService_.getWebServiceInfo().getServerInstanceId()==null)
-			{
-				CreateServerCommand createServerCommand = new CreateServerCommand();
-				createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
-        createServerCommand.setEnvironment( environment );
-				IStatus createServerStatus = createServerCommand.execute( monitor, null);
-				if (createServerStatus.getSeverity()==Status.OK)
-				{
-					webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
-				}
-				else
-				{
-					if (createServerStatus.getSeverity()==Status.ERROR)
-					{
-						environment.getStatusHandler().reportError(createServerStatus);
-					}								
-					return createServerStatus;
-				}
-			}
-			  
-			
-			
-			AddModuleToServerCommand command = new AddModuleToServerCommand();
-			command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-			if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
-			{
-				command.setProject(earProject_);
-				command.setModule(ear_);
-			}
-			else
-			{
-				command.setProject(project_);
-				command.setModule(module_);				
-			}
-
-      command.setEnvironment( environment );
-			IStatus status = command.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-				environment.getStatusHandler().reportError(status);
-			}			
-		  return status;
-	  }
-
-	  public void setProject( String project )
-	  {
-		  project_ = project;
-	  }
-		  
-	  public void setModule( String module )
-	  {
-		  module_ = module;
-	  }	
-		
-	  public void setEarProject( String earProject )
-	  {
-		  earProject_ = earProject;
-	  }
-	  
-	  public void setEar( String ear )
-	  {
-		  ear_ = ear;  
-	  }
-		
-	  public void setWebService( IWebService webService )
-	  {
-		  webService_ = webService;  
-	  }
-		
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
deleted file mode 100644
index cc68b968d..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,50 +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.creation.ui.extension;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceRunCommand extends AbstractDataModelOperation 
-{
-	private IWebService				webService_;
-	
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-      Environment environment = getEnvironment();
-      
-		  System.out.println( "In Pre service run command." );
-			
-			StartServerCommand command = new StartServerCommand();
-			command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
-      command.setEnvironment( environment );
-			IStatus status = command.execute( monitor, null );
-			if (status.getSeverity()==Status.ERROR)
-			{
-				environment.getStatusHandler().reportError(status);			  
-			}			
-			return status;
-			
-	  }
-		
-	  public void setWebService( IWebService webService )
-	  {
-		  webService_ = webService;  
-	  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
deleted file mode 100644
index 86a7020ff..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,111 +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.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.RunServiceFragment;
-
-public class ServiceRootFragment extends SequenceFragment 
-{
-  public ServiceRootFragment()
-  {
-    add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) );
-    add( new DevelopServiceFragment() );
-    add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) );
-    add( new AssembleServiceFragment() );
-    add( new SimpleFragment( new PreServiceDeployCommand(), "" ) );
-    add( new DeployServiceFragment() );
-    add( new SimpleFragment( new PreServiceInstallCommand(), "" ) );
-    add( new InstallServiceFragment() );
-    add( new SimpleFragment( new PreServiceRunCommand(), 
-    	 "org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceRunCommand" ) );
-    add( new RunServiceFragment() );
-  }
-
-  public void registerDataMappings(DataMappingRegistry registry) 
-  {
-		//Mappings from framework to extension fragments
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class );
-	
-	// Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand.
-	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null );
-	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null );
-		
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class );
-	
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class );  
-  	registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class );  
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class );
-		
-		//Mappings from framework to framework commands
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );		
-		registry.addMapping( PreServiceDevelopCommand.class, "J2eeLevel", PreServiceAssembleCommand.class );
-		
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceInstallCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceInstallCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceInstallCommand.class );
-		registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceInstallCommand.class );
-  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceInstallCommand.class );		
-
-  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class );
-	
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
deleted file mode 100644
index 42317407b..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services Creation UI plugin.
-* <p>
-* The Web Services Creation UI plugin's sole function is to add 
-* user interface of the Web Services Creation Wizard, contained in  
-* the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceCreationUIPlugin extends Plugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.creation.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceCreationUIPlugin instance_;
-
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  * The "plugin" element in plugin.xml should include the attribute
-  * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin".
-  * @param descriptor The descriptor of this plugin.
-  */
-  public WebServiceCreationUIPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui");
-  * @return The WebServiceCreationUIPlugin singleton.
-  */
-  public static WebServiceCreationUIPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.creation.ui.plugin", instance_ );
-    
-    if( key.startsWith("%"))
-    {
-      key = key.substring( 1, key.length() );
-    }
-    
-    return msgUtils.getMessage(key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index d0ab4aa0a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-
-/**
- *
- */
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage 
-{
-	private ServerWizardWidget serverWidget_ = null;
-	
-	public void init(IWorkbench workbench)   { }	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	
-	protected Control createContents(Composite parent) 
-	{
-	  UIUtils utils = new UIUtils(null, null);
-	  
-	  Composite page = utils.createComposite( parent, 1 );
-	  
-      serverWidget_ = new ServerWizardWidget( false );
-      serverWidget_.addControls( page, new Listener()
-                                       {
-                                         public void handleEvent( Event evt ){}
-                                       } );
-	  initializeValues();
-	  return page;
-	}
-
-	private void initializeValues()
-	{
-	  ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
-      // Set values from context.
-	  TypeRuntimeServer serverIds = new TypeRuntimeServer();
-	  TypeRuntimeServer clientIds = new TypeRuntimeServer();
-		
-	  serverIds.setTypeId( context.getWebServiceType() );
-	  clientIds.setTypeId( context.getClientWebServiceType() );
-		
-      serverWidget_.setServiceTypeRuntimeServer( serverIds );
-      serverWidget_.setClientTypeRuntimeServer( clientIds );
-      serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) );
-      serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) );
-      serverWidget_.setStartService( new Boolean(context.getStartWebService()) );
-      serverWidget_.setTestService( new Boolean(context.getTestWebService()) );
-      serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
-      serverWidget_.internalize();
-	}
-	
-    /**
-	 * Does anything necessary because the default button has been pressed.
-	*/
-	protected void performDefaults()
-	{
-	  super.performDefaults();
-	  setToDefaults();
-	}
-	
-	private void setToDefaults()
-	{
-	  ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
-      // Set values from context.
-	  TypeRuntimeServer serverIds = new TypeRuntimeServer();
-	  TypeRuntimeServer clientIds = new TypeRuntimeServer();
-		
-	  serverIds.setTypeId( context.getWebServiceTypeDefault() );
-	  clientIds.setTypeId( context.getClientWebServiceTypeDefault() );
-		
-      serverWidget_.setServiceTypeRuntimeServer( serverIds );
-      serverWidget_.setClientTypeRuntimeServer( clientIds );
-      serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxyDefault()) );
-      serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) );
-      serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) );
-      serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) );
-      serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
-      serverWidget_.internalize();
-	}
-
-	/**
-	 * Do anything necessary because the OK button has been pressed.
-	 *  @return whether it is okay to close the preference page
-	 */
-	public boolean performOk()
-	{
-	  storeValues();
-	  return true;
-	}
-
-	private void storeValues()
-	{
-	  ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-	  
-	  TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer();
-	  TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer();
-	  
-      context.setWebServiceType( serverIds.getTypeId() );
-      context.setClientWebServiceType( clientIds.getTypeId() );
-      context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() );
-      context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() );
-      context.setStartWebService( serverWidget_.getStartService().booleanValue() );
-      context.setTestWebService( serverWidget_.getTestService().booleanValue() );
-      context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
-	}
-	
-	protected void performApply()
-	{
-	  performOk();
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
deleted file mode 100644
index d63a7eb2c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetContributor.java
+++ /dev/null
@@ -1,57 +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.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.consumption.ui.server.StartServerWidget;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartServerWidgetContributor implements INamedWidgetContributor 
-{
-  private IServer      server_;
-  private MessageUtils msgUtils_;
-	  
-  public StartServerWidgetContributor( IServer server )
-  {
-	server_ = server;
-	msgUtils_ = new  MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", this );
-  }
-  
-  public String getDescription() 
-  {
-	return msgUtils_.getMessage( "PAGE_DESC_WS_START_SERVER" );
-  }
-
-  public String getName() 
-  {
-	return "";
-  }
-
-  public String getTitle() 
-  {
-	return msgUtils_.getMessage( "PAGE_TITLE_WS_START_SERVER" );
-  }
-
-  public WidgetContributorFactory getWidgetContributorFactory() 
-  {
-	return new WidgetContributorFactory()
-	       {
-			 public WidgetContributor create() 
-			 {
-				return new StartServerWidget( server_ );
- 			 }
-	       };
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
deleted file mode 100644
index 4c0341ae0..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/server/StartServerWidgetFactory.java
+++ /dev/null
@@ -1,57 +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.creation.ui.server;
-
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class StartServerWidgetFactory implements INamedWidgetContributorFactory 
-{
-  private IWebService webservice_;
-  
-  public INamedWidgetContributor getFirstNamedWidget() 
-  {
-    IServer server = null;
-    
-    if( webservice_ != null )
-    {
-      server = ServerCore.findServer(webservice_.getWebServiceInfo().getServerInstanceId() );
-    }
-    
-    if( server != null && server.getServerState() != IServer.STATE_STARTED )
-    {
-      return new StartServerWidgetContributor( server );
-    }
-    
-	return null;
-  }
-
-  public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor) 
-  {
-	return null;
-  }
-
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-	dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", StartServerWidgetFactory.class );
-  }
-  
-  public void setWebService( IWebService webservice )
-  {
-    webservice_ = webservice;  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
deleted file mode 100644
index 8b68cb85b..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,303 +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.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PreferencesSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor
-{   
-  private WebServiceClientTypeWidget clientWidget_;
-  private PreferencesSelectionWidget preferencesWidget_;
-  private Listener                   statusListener_;
-  private TypeRuntimeServer          ids_;
-  private LabelsAndIds               labelIds_;
-  private boolean                    displayPreferences_;
-  
-  /*CONTEXT_ID PWPR0001 for the Project Page*/
-  private String INFOPOP_PWPR_PAGE = "PWPR0001";
-  
-  /*CONTEXT_ID PWPR0005 for the Generate Proxy check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY = "PWPR0005";
-  private Button  generateProxy_;
-  
-  /*CONTEXT_ID PWPR0010 for the Web Service Type combo box of the Project Page*/
-  private String INFOPOP_PWPR_COMBO_TYPE = "PWPR0010";
-  private Combo  webserviceType_;
-  
-  /*CONTEXT_ID PWPR0011 for the Wizard Scenario Service group of the Project Page*/
-  private String INFOPOP_PWPR_GROUP_SCENARIO_SERVICE = "PWPR0011";
-  private Button startService_;
-  
-  /*CONTEXT_ID PWPR0009 for the Start Web Project check box check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT = "PWPR0009";
-  
-  /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/  
-  private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
-  private Button testService_;
-  
-  /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the projec page*/
-  private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWPR0014";
-  private Button monitorService;
-  
-  /*CONTEXT_ID PWPR0012 for the Launch UDDI check box of the Project Page*/
-  private String INFOPOP_PWPR_CHECKBOX_LAUNCH_WS = "PWPR0012";
-  private Button launchUddi_;
-  
-  public ServerWizardWidget( boolean displayPreferences )
-  {
-    displayPreferences_ = displayPreferences;  
-  }
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    String       pluginId = "org.eclipse.jst.ws.consumption.ui";
-    String       createPluginId = "org.eclipse.jst.ws.creation.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-    UIUtils      utils    = new UIUtils( msgUtils, createPluginId );
-    
-    statusListener_ = statusListener;
-    
-  	PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." +  INFOPOP_PWPR_PAGE );
-  	
-  	Composite serverComposite = utils.createComposite( parent, 1 );
-  	
-  	Group serviceGroup = utils.createGroup( serverComposite, "GROUP_SCENARIO_SERVICE",
-  	                                        "TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE", 
-  	                                        INFOPOP_PWPR_GROUP_SCENARIO_SERVICE,
-											2, 10, 10);
-  	
-  	
-  	// Create webservice combo box.
-    webserviceType_ = utils.createCombo( serviceGroup, "LABEL_WEBSERVICETYPE",
-                                         "TOOLTIP_PWPR_COMBO_TYPE",
-                                         INFOPOP_PWPR_COMBO_TYPE, 
-										 SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    webserviceType_.addListener( SWT.Modify, statusListener );
-    
-    Composite buttonsGroup = utils.createComposite( serviceGroup, 1 );
-    GridData  buttonGrid   = new GridData();
-    buttonGrid.horizontalSpan = 2;
-    buttonsGroup.setLayoutData( buttonGrid );
-    
-    // Create start service check box.
-    startService_ = utils.createCheckbox( buttonsGroup, "BUTTON_START_WEB_PROJECT",
-                                          "TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT",
-                                          INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT );
-    startService_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent evt )
-                                          {
-                                            handleStartPressed();
-                                          }
-                                        });
-    
-    launchUddi_ = utils.createCheckbox( buttonsGroup, "BUTTON_WS_PUBLISH",
-                                        "TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS",
-                                        INFOPOP_PWPR_CHECKBOX_LAUNCH_WS );
-    
-    Composite proxyComposite = utils.createComposite( serverComposite, 1, 5, 0 );
-    
-    // Create generate proxy check box.
-    generateProxy_ = utils.createCheckbox( proxyComposite, "BUTTON_GENERATE_PROXY",
-                                           "TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY",
-                                           INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY );
-    generateProxy_.addSelectionListener( new SelectionAdapter()
-                                         {
-                                           public void widgetSelected( SelectionEvent evt )
-                                           {
-                                             clientWidget_.enableWidget( generateProxy_.getSelection() );
-                                           }
-                                         });
-    
-    // Create client selection widget.
-    clientWidget_ = new WebServiceClientTypeWidget();
-    clientWidget_.addControls( serverComposite, statusListener );
-    
-    Composite testGroup = utils.createComposite(serverComposite,1);
-    
-    //  Create test service check box.
-    testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
-                                         "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
-                                         INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
-    monitorService = utils.createCheckbox( testGroup, "CHECKBOX_MONITOR_WEBSERVICE",
-                                         "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE",
-                                         INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE );
-    
-    if( displayPreferences_ )
-    {
-      // Create the preferences widgets.
-      preferencesWidget_ = new PreferencesSelectionWidget();
-      preferencesWidget_.addControls( serverComposite, statusListener );
-    }
-    
-    return this;
-  }
-
-  private void handleStartPressed()
-  {
-    boolean enabled = startService_.getSelection();
-    
-    testService_.setEnabled( enabled );
-    monitorService.setEnabled(enabled);
-    launchUddi_.setEnabled( enabled );
-    generateProxy_.setEnabled( enabled );
-    clientWidget_.enableWidget( getGenerateProxy().booleanValue() );
-  }
-  
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setTypeRuntimeServer( ids );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getTypeRuntimeServer();  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    LabelsAndIds                        labelIds   = WebServiceRuntimeExtensionUtils.getServiceTypeLabels();
-	//rskreg
-    int                                 selection  = 0;
-    String[]                            serviceIds = labelIds.getIds_();
-    String                              selectedId = ids.getTypeId();
-    
-    webserviceType_.removeListener( SWT.Modify, statusListener_ );
-    webserviceType_.setItems( labelIds.getLabels_() );
-        
-    // Now find the selected one.
-    for( int index = 0; index < serviceIds.length; index++ )
-    {
-      if( selectedId.equals( serviceIds[index ]) )
-      {
-        selection = index;
-        break;
-      }
-    }
-    
-    webserviceType_.select( selection );
-    webserviceType_.addListener( SWT.Modify, statusListener_ );
-    ids_      = ids;  
-    labelIds_ = labelIds;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    int selectionIndex = webserviceType_.getSelectionIndex();
-    
-    ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-    
-    return ids_;  
-  }
-  
-  public Boolean getStartService()
-  {
-    return new Boolean( startService_.getSelection() );  
-  }
-  
-  public void setStartService( Boolean value )
-  {
-    startService_.setSelection( value.booleanValue() );
-  }
-
-  public Boolean getTestService()
-  {
-    return new Boolean( testService_.getSelection() && startService_.getSelection() );
-  }
-  
-  public void setTestService( Boolean value )
-  {
-    testService_.setSelection( value.booleanValue() );  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(monitorService.getSelection() && startService_.getSelection());
-  }
-  
-  public void setMonitorService(Boolean value)
-  {
-    monitorService.setSelection(value.booleanValue());
-  }
-
-  public Boolean getPublishService()
-  {
-    return new Boolean( launchUddi_.getSelection() && startService_.getSelection() );
-  }
-  
-  public void setPublishService( Boolean value )
-  {
-    launchUddi_.setSelection( value.booleanValue() );  
-  }
-
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( generateProxy_.getSelection() && startService_.getSelection() );
-  }
-  
-  public void setGenerateProxy( Boolean value )
-  {
-    generateProxy_.setSelection( value.booleanValue() );  
-  }
-
-  public ResourceContext getResourceContext()
-  {
-    return preferencesWidget_.getResourceContext(); 
-  }
-
-  public void setResourceContext( ResourceContext context )
-  {
-    preferencesWidget_.setResourceContext( context );
-  }
-
-  public void internalize()
-  {
-    handleStartPressed();  
-  }
-  
-  public IStatus getStatus()
-  {
-    IStatus status = Status.OK_STATUS;
-    
-    // If the webservice has not been selected then user can not move
-    // forward to the next page.
-    if( webserviceType_.getText().equals("") )
-    {
-      status = StatusUtils.errorStatus( "" );
-    }
-    
-    return status;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
deleted file mode 100644
index f447504a8..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,79 +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.creation.ui.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private IStructuredSelection initialSelection_;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    String type      = getScenarioContext().getWebServiceType();
-    String runtime   = WebServiceRuntimeExtensionUtils.getDefaultRuntimeValueFor( type );
-	
-    String factoryID = WebServiceRuntimeExtensionUtils.getDefaultServerValueFor(type);    
-    typeRuntimeServer_ = new TypeRuntimeServer();
-    
-    typeRuntimeServer_.setTypeId( type );
-    typeRuntimeServer_.setRuntimeId( runtime );
-    typeRuntimeServer_.setServerId( factoryID );
-    
-    //Default the typeId from the initial selection
-    String[] typeIds = WebServiceRuntimeExtensionUtils.getWebServiceTypeBySelection(initialSelection_);
-
-    if (typeIds!=null && typeIds.length>0)
-    {
-      typeRuntimeServer_.setTypeId(typeIds[0]);
-    }
-    
-    return Status.OK_STATUS;
-  }
-  
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-    initialSelection_ = selection;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public Boolean getStartService()
-  {
-    return new Boolean( getScenarioContext().getStartWebService() );  
-  }
-  
-  public Boolean getPublishService()
-  {
-    return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() );
-  }
-
-  public Boolean getGenerateProxy()
-  {
-    return new Boolean( getScenarioContext().getGenerateProxy() );  
-  }
-  
-  public Boolean getMonitorService()
-  {
-    return new Boolean(getScenarioContext().getMonitorWebService());
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
deleted file mode 100644
index 2395c95c1..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,98 +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.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand
-{    
-  private TypeRuntimeServer typeRuntimeServer_;
-  private boolean           startService_;
-  private boolean           testService_;
-  private boolean           publishService_;
-  private boolean           generateProxy_;
-	private ResourceContext   resourceContext_;
-    
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  { 
-    return typeRuntimeServer_;
-  }
-
-  public boolean getStartService()
-  {
-    return startService_;  
-  }
-
-  public boolean getTestService()
-  {
-    return testService_;
-  }
-  
-  public boolean getPublishService()
-  {
-    return publishService_;
-  }
-
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;  
-  }
-	
-	public ResourceContext getResourceContext()
-	{
-		return resourceContext_;
-	}
-  
-  /**
-   * @param generateProxy_ The generateProxy_ to set.
-   */
-  public void setGenerateProxy(boolean generateProxy_)
-  {
-    this.generateProxy_ = generateProxy_;
-  }
-  /**
-   * @param publishService_ The publishService_ to set.
-   */
-  public void setPublishService(boolean publishService_)
-  {
-    this.publishService_ = publishService_;
-  }
-  /**
-   * @param startService_ The startService_ to set.
-   */
-  public void setStartService(boolean startService_)
-  {
-    this.startService_ = startService_;
-  }
-  /**
-   * @param testService_ The testService_ to set.
-   */
-  public void setTestService(boolean testService_)
-  {
-    this.testService_ = testService_;
-  }
-  /**
-   * @param typeRuntimeServer_ The typeRuntimeServer_ to set.
-   */
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_)
-  {
-    this.typeRuntimeServer_ = typeRuntimeServer_;
-  }
-	
-	public void setResourceContext(ResourceContext rc)
-	{
-		resourceContext_ = rc;
-	}
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
deleted file mode 100644
index 346307048..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
+++ /dev/null
@@ -1,105 +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.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ExportWSWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ExportWSWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               SequenceFragment root = new SequenceFragment();
-               root.add(new SimpleFragment("WSExport"));
-               root.add(publishToPrivateUDDICmdFrag);
-               root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
-               return root;  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    this.dataMappingRegistry = dataRegistry;
-    publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    this.widgetRegistry = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("WSExport", 
-      msgUtils.getMessage("PAGE_TITLE_WS_PUBLISH"),
-      msgUtils.getMessage("PAGE_DESC_WS_PUBLISH"),
-      new WidgetContributorFactory()
-      {
-        public WidgetContributor create()
-        {
-          return new PublishWSWidget(true);
-        }
-      }
-    );
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
deleted file mode 100644
index 068d4afd1..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null
@@ -1,62 +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.creation.ui.widgets.binding;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PublishWSDLWidgetBinding implements CommandWidgetBinding
-{
-  public PublishWSDLWidgetBinding()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new SimpleFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-  }
-
-  /* (non-Javadoc), 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
deleted file mode 100644
index 29615e731..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,568 +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.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.CheckWSDLValidationCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-public class ServerWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry_;
-  private WidgetRegistry      widgetRegistry_;
-  private DataMappingRegistry dataMappingRegistry_;
-  private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
-  public ServerWidgetBinding()
-  {
-    publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-           {
-             public CommandFragment create()
-             {
-               return new ServiceRootCommandFragment();  
-             }
-           };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    canFinishRegistry_ = canFinishRegistry;
-    publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_);
-  }
-
-  /* (non-Javadoc), 
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry_ = dataRegistry;
-    
-    // Before ServerWizardWidget
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
-    dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class);
-    
-    // After ServerWizardWidget
-    dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class );
-    dataRegistry.addMapping(ServerWizardWidget.class, "StartService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "TestService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "PublishService", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-    dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-    
-    // Before ObjectSelectionWidget
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientTestWidget.class );
-    dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService",FinishTestFragment.class);
-    
-    // Before ServerRuntimeSelectionWidget
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerRuntimeSelectionWidget.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerRuntimeSelectionWidget.class);
-    
-            
-    // After ServerRuntimeSelectionWidget    
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class );
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class );
-    //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-    
-
-    // Map fragments that depend on data.   
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-    dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-    
-    // CreateMonitorCommand
-    dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
-    
-    // ComputeEndpointCommand
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
-    dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-
-    //ServiceTestWidget mappings    
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class);
-	dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class);
-    dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class);    
-    dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class);
-    dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class);
-        
-    // Before Client Test widget.
-    dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-    
-    // Before ClientTestWidget
-        
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
-    dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
-    dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-    
-    
-    // After ClientTestWidget    
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
-    dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
-    // PublishWSWidget
-    dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-    
-    // PublishToPrivateUDDICommandFragment
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-    
-    // LaunchWebServicesExplorerCommand
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class);
-    dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class);
-    // TODO Need defaults for these properties.
-    dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
-    dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-  
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    String       pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    
-    widgetRegistry_ = widgetRegistry;
-    publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_);
-
-    widgetRegistry.add( "ServerWizardWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
-                        msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
-				        new WidgetContributorFactory()
-				        {
-				          public WidgetContributor create()
-				          {
-				            return new ServerWizardWidget( true );
-				          }
-				        } );
-
-    MessageUtils creationUIMessageUtils = new MessageUtils("org.eclipse.jst.ws.creation.ui.plugin", this);
-    widgetRegistry.add( "ObjectSelectionWidget", 
-                        creationUIMessageUtils.getMessage("PAGE_TITLE_OBJECT_SELECTION"),
-                        creationUIMessageUtils.getMessage("PAGE_DESC_OBJECT_SELECTION"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ObjectSelectionWidget();
-                          }
-                        });
-
-    widgetRegistry.add( "ServerRuntimeSelectionWidget", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_RUNTIME_SELECTION"),
-                        msgUtils.getMessage("PAGE_DESC_WS_RUNTIME_SELECTION"),
-						new WidgetContributorFactory()
-                        {
-						  public WidgetContributor create()
-						  {
-						    return new ServerRuntimeSelectionWidget();
-						  }
-						} ); 
-    
-    widgetRegistry.add( "TestService", 
-                        msgUtils.getMessage("PAGE_TITLE_WSTEST"),
-                        msgUtils.getMessage("PAGE_DESC_WSTEST"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new ServiceTestWidget();
-                          }
-                        } );
-    
-    widgetRegistry.add( "ClientTestWidget", 
-            msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
-            msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
-            new WidgetContributorFactory()
-            {
-              public WidgetContributor create()
-              {
-                return new ClientTestWidget(); 
-              }
-            });
-    
-    widgetRegistry.add( "Publish", 
-                        msgUtils.getMessage("PAGE_TITLE_WS_PUBLISH"),
-                        msgUtils.getMessage("PAGE_DESC_WS_PUBLISH"),
-                        new WidgetContributorFactory()
-                        {
-                          public WidgetContributor create()
-                          {
-                            return new PublishWSWidget(true);
-                          }
-                        } );
-  }
-      
-  private class ClientFragment extends BooleanFragment
-  {
-    boolean genProxy_ = false;
-    
-    public ClientFragment()
-    {      
-      setCondition( new Condition() 
-                    {
-                      public boolean evaluate()
-                      {
-                        return genProxy_;
-                      }
-                    });
-      
-      SequenceFragment clientRoot = new SequenceFragment();
-      
-      clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), ""));
-      //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client     
-      //clientRoot.add( new ClientExtensionFragment() );
-      clientRoot.add( new ClientRootFragment() );
-      clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-      
-      setTrueFragment( clientRoot );
-    }
-    
-    public void setGenerateProxy( boolean genProxy )
-    {
-      genProxy_ = genProxy;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      // Map the output of the service scenario to the client scenario.
-      dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class );
-	  dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class );
-	  dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class );
-	  
-      
-      // Setup the PreClientDevelopCommand.
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);           
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);            
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );      
-      dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class);
-      dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );      
-    }
-  }
-  
-  private class ServiceRootCommandFragment extends SequenceFragment
-  {
-    public ServiceRootCommandFragment()
-    {
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-      
-      add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerWizardWidget" ) );
-      add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
-      add( new ObjectSelectionFragment() );
-      add( new SimpleFragment( new CheckWSDLValidationCommand(), ""));
-      add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
-      add( new SimpleFragment( "ServerRuntimeSelectionWidget" ) );
-      add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
-      //add(new SimpleFragment(new ServerDeployableConfigurationCommand(), "")); //Note: added here            
-      //add( new ServerExtensionFragment() );
-	  add( new ServiceRootFragment() );
-      add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
-      add(new SimpleFragment(new CreateMonitorCommand(), ""));
-      add(new SimpleFragment(new ComputeEndpointCommand(), ""));
-      add( new ServiceTestFragment( "TestService") );
-      add( new SimpleFragment(new TestDefaultingFragment(),""));
-      add( new ClientFragment() );
-//      add( new SimpleFragment(new ManageServerStartUpCommand(),""));
-      add( new ClientTestFragment( "ClientTestWidget") );
-      add( new SimpleFragment( "Publish") );
-      add(publishToPrivateUDDICmdFrag);
-      add(new LaunchFragment());
-      add(new FinishFragment());
-      
-      add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-     */
-    public void registerDataMappings(DataMappingRegistry dataRegistry)
-    {
-      publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_);   
-      
-      dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class );
-
-      //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-      //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);      
-      dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-      
-      // Map ServerWizardWidgetDefaultingCommand
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);    
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-      	  
-      // Map ServerWizardWidgetOutputCommand.
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionFragment.class, "TypeRuntimeServer", null);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-      
-      //to the test wizard
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class);
-      
-	  
-      
-      // Map ServerRuntimeSelectionWidgetDefaultingCommand
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
-      //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);      
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
-      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-      
-      
-      // Map ServerExtensionDefaultingCommand
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class);      
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class);
-	  
-	    // Setup the PreServiceDevelopCommand.
-			//
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);      
-      dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);			
-			//
-	  dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
-	    dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
-      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
-      //
-	    dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-			
-			dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
- 
-      // Map ClientExtensionDefaultingCommand
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarProjectName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientEarComponentName", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
-	  dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
-
-      
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-           
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class);
-
-      // Map ServerExtensionOutputCommand for ServerStart()
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
-
-      // MAP post server config call
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-      
-      // Map ClientExtensionOutputCommand
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
-	  dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-	  
-      // Map ManageServerStartUpCommand
-      dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class);
-      
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class);
-      dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class);
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null);
-      
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer());
-      dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());      
-      
-      // Map WebServiceClientTestArrivalCommand
-      dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
-      dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);    
-    
-    
-      //Map Finish Command 
-      
-      
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
deleted file mode 100644
index ae66f726e..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,462 +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.creation.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.RuntimeServerSelectionWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-/*
- *
- * ServerRuntimeSelectionWidget
- * This widget is the parent widget for server and client deployment/environment settings 
- * 
- */
-public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-  
-  /* CONTEXT_ID PWRS0002 for the Wizard Scenario Service configuration of the Runtime Selection Page */
-  private String INFOPOP_PWRS_GROUP_SERVICE =  "PWRS0002";
-  
-  private RuntimeServerSelectionWidget runtimeWidget_;
-  private ProjectSelectionWidget       projectWidget_;
-  private ClientRuntimeSelectionWidget clientWidget_;
-  private TextModifyListener           textListener_;
-  private MessageUtils msgUtils_;
-  
-  private boolean isClientWidgetVisible_ = true;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils_, createPluginId_ ); 
-    
-    ScrolledComposite scroller = new ScrolledComposite( parent, SWT.H_SCROLL | SWT.V_SCROLL );
-    scroller.setExpandHorizontal(true);
-    scroller.setExpandVertical(true);
-    
-    Composite root = uiUtils.createComposite( scroller, 1 );
-    scroller.setContent( root );
-    
-    Composite textComposite = uiUtils.createComposite( root, 1, 0, 0 );
-    createMessageText( textComposite, msgUtils_.getMessage("MSG_GENERAL_PROJECT_AND_EAR", new String[] { msgUtils_.getMessage("MSG_SERVICE_SUB")}));
-    createMessageText( textComposite, msgUtils_.getMessage("MSG_EAR_PROJECT_WILL_BE_CREATED") );
-    
-    Composite serverComp = uiUtils.createComposite( root, 1, 5, 0 );
-    
-    Group serverGroup = uiUtils.createGroup( serverComp, "LABEL_SELECTION_VIEW_TITLE",
-                                             null, INFOPOP_PWRS_GROUP_SERVICE,
-											 2, 5, 5);
-    
-    runtimeWidget_ = new RuntimeServerSelectionWidget( false );
-    runtimeWidget_.addControls( serverGroup, statusListener );
-    textListener_ = new TextModifyListener();
-    runtimeWidget_.addModifyListener( textListener_ );
-             
-    projectWidget_ = new ProjectSelectionWidget();
-    projectWidget_.addControls( serverGroup, statusListener );
-    
-    clientWidget_ = new ClientRuntimeSelectionWidget();
-    clientWidget_.addControls( root, statusListener );
-    
-    Point size = root.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-    scroller.setMinSize( size ); 
-    root.setSize( size );
-     
-    scroller.setLayoutData( new GridData( GridData.FILL_BOTH ) );
-    
-    return this;
-  }
-  
-  //If generate proxy is not selected, don't show the client portion of the page.
-  public void setGenerateProxy( Boolean value )
-  {
-    clientWidget_.setVisible( value.booleanValue() ); 
-    isClientWidgetVisible_ = value.booleanValue();
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return runtimeWidget_.getTypeRuntimeServer();  
-  }
-   
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    runtimeWidget_.removeModifyListener( textListener_ );
-    runtimeWidget_.setTypeRuntimeServer( ids );  
-    projectWidget_.setTypeRuntimeServer(ids);
-    runtimeWidget_.addModifyListener( textListener_ );
-  }
-  
-  public TypeRuntimeServer getClientTypeRuntimeServer()
-  {
-    return clientWidget_.getClientTypeRuntimeServer();  
-  }
-   
-  public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    clientWidget_.setClientTypeRuntimeServer( ids );  
-  }
-  
-  public SelectionListChoices getServiceProject2EARProject()
-  {
-    return projectWidget_.getProjectChoices();
-  }
-  
-  public void setServiceProject2EARProject(SelectionListChoices serviceProject2EARProject)
-  {
-    projectWidget_.setProjectChoices(serviceProject2EARProject);
-  }
-  
-  public SelectionListChoices getRuntime2ClientTypes()
-  {
-    return clientWidget_.getRuntime2ClientTypes();
-  }  
-  
-  public void setRuntime2ClientTypes(SelectionListChoices runtime2ClientTypes)
-  {
-    clientWidget_.setRuntime2ClientTypes(runtime2ClientTypes);
-  }
-  
-  public String getServiceJ2EEVersion()
-  {
-    return runtimeWidget_.getJ2EEVersion();
-  }
-  
-  public void setServiceJ2EEVersion(String j2eeVersion)
-  {
-    runtimeWidget_.setJ2EEVersion(j2eeVersion);
-    projectWidget_.setJ2EEVersion(j2eeVersion);
-  }
-  
-  public String getClientJ2EEVersion()
-  {
-    return clientWidget_.getJ2EEVersion();
-  }
-  
-  public void setClientJ2EEVersion(String j2eeVersion)
-  {
-    clientWidget_.setJ2EEVersion(j2eeVersion);
-  }
-  
-  public boolean getServiceNeedEAR()
-  {
-    return projectWidget_.getNeedEAR();
-  }
-  
-  public void setServiceNeedEAR(boolean b)
-  {
-    projectWidget_.setNeedEAR(b);
-  }
-  
-  public boolean getClientNeedEAR()
-  {
-    return clientWidget_.getClientNeedEAR();
-  }
-  
-  public void setClientNeedEAR(boolean b)
-  {
-    clientWidget_.setClientNeedEAR(b);
-  }  
-  
-  public String getServiceComponentName()
-  {
-	return projectWidget_.getComponentName();  
-  }
-  
-  public void setServiceComponentName( String name )
-  {
-    projectWidget_.setComponentName( name );
-  }
-  
-  public String getServiceEarComponentName()
-  {
-    return projectWidget_.getEarComponentName();	  
-  }
-  
-  public void setServiceEarComponentName( String name )
-  {
-	projectWidget_.setEarComponentName( name );  
-  }
-  
-  public void setServiceComponentType( String type )
-  {
-	projectWidget_.setComponentType( type );  
-  }
-  
-  public String getClientComponentName()
-  {
-	return clientWidget_.getClientComponentName();  
-  }
-  
-  public void setClientComponentName( String name )
-  {
-    clientWidget_.setClientComponentName( name );
-  }
-  
-  public String getClientEarComponentName()
-  {
-    return clientWidget_.getClientEarComponentName();	  
-  }
-  
-  public void setClientEarComponentName( String name )
-  {
-	clientWidget_.setClientEarComponentName( name );  
-  }
-  
-  public String getClientComponentType()
-  {
-    return clientWidget_.getClientComponentType();
-  }  
-  
-  public void setComponentType( String type )
-  {
-	clientWidget_.setClientComponentType( type );  
-  }
-  
-  public String getServiceProjectName()
-  {
-    return projectWidget_.getProjectName();  
-  }
-  
-  public String getServiceEarProjectName()
-  {
-	return projectWidget_.getEarProjectName();  
-  }
-  
-  public String getClientProjectName()
-  {
-    return clientWidget_.getClientProjectName();  
-  }
-  
-  public String getClientEarProjectName()
-  {
-	return clientWidget_.getClientEarProjectName();  
-  }
-  
-  private class TextModifyListener implements ModifyListener 
-  {
-  	public void modifyText(ModifyEvent e)
-  	{
-		if( clientWidget_.isVisible() )
-  		{  	  
-		  TypeRuntimeServer serviceIds = runtimeWidget_.getTypeRuntimeServer();
-  		  TypeRuntimeServer clientIds  = clientWidget_.getClientTypeRuntimeServer();
-  		
-  		  clientIds.setRuntimeId( serviceIds.getRuntimeId() );
-  		  clientIds.setServerId( serviceIds.getServerId() );
-  		  clientIds.setServerInstanceId( serviceIds.getServerInstanceId() );
-
-  		  clientWidget_.setClientTypeRuntimeServer( clientIds );
-  		  clientWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());  	
-  		}
-		
-		//Set the current server selection and J2EE level on the ProjectSelectionWidget
-		projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
-		projectWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
-  	}
-  }
- 
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus() 
-  {
-    IStatus serviceStatus = runtimeWidget_.getStatus();
-    IStatus projectStatus = projectWidget_.getStatus();
-    IStatus clientStatus  = clientWidget_.getStatus();    
-    IStatus finalStatus   = Status.OK_STATUS;
-    
-    // call child widgets' getStatus()
-    if( serviceStatus.getSeverity() == Status.ERROR )
-    {
-      finalStatus = serviceStatus;
-    }
-    else if( clientStatus.getSeverity() == Status.ERROR )
-    {
-      if (isClientWidgetVisible_)
-        finalStatus = clientStatus;
-    }
-    else if ( projectStatus.getSeverity()== Status.ERROR) {
-      finalStatus = projectStatus;
-    }
-    
-    //Validate service side server target and J2EE level
-	ValidationUtils valUtils = new ValidationUtils();
-	String serviceEARName  = projectWidget_.getEarProjectName();
-	String serviceProjName = projectWidget_.getProjectName();
-	String serviceServerFactoryId = runtimeWidget_.getTypeRuntimeServer().getServerId();
-	String serviceJ2EElevel = runtimeWidget_.getJ2EEVersion();
-  String serviceComponentName = projectWidget_.getComponentName();
-  String serviceEARComponentName = projectWidget_.getEarComponentName();
-	IStatus serviceProjectStatus = valUtils.validateProjectTargetAndJ2EE(serviceProjName,serviceComponentName, serviceEARName, serviceEARComponentName, serviceServerFactoryId, serviceJ2EElevel);
-	if(serviceProjectStatus.getSeverity()==Status.ERROR)
-	{
-		finalStatus = serviceProjectStatus;
-	}
-    
-    //Ensure the service project type (Web/EJB) is valid
-    if (serviceProjName!=null && serviceProjName.length()>0)
-    {
-      IProject serviceProj = ProjectUtilities.getProject(serviceProjName);
-      if (serviceProj.exists())
-      {
-		// rskreg
-        //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
-        //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId();
-		//String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId();
-        /* rskejb
-        boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceServerFactoryId, webServiceRuntimeId, webServiceTypeId);
-        if (!isEJBRequired)
-        {
-          //Check the Web service type to see if an EJB project is required
-          //isEJBRequired = wssrtRegistry.requiresEJBProject(webServiceTypeId);
-			isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceTypeId);
-        }
-        rskejb */
-        if (serviceComponentName!=null && serviceComponentName.length()>0)
-        {
-          String compTypeId = J2EEUtils.getComponentTypeId(serviceProj, serviceComponentName);
-          if (!compTypeId.equals(projectWidget_.getComponentType()))
-          {
-        	//Construct the error message
-        	String compTypeLabel = getCompTypeLabel(projectWidget_.getComponentType()); 
-        	finalStatus = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_INVALID_PROJECT_TYPE",new String[]{serviceProjName, compTypeLabel}) );        	        	
-          }
-        }
-        // begin remove
-        /*
-        boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceRuntimeId, webServiceTypeId);
-        if (isEJBRequired && serviceComponentName!=null && serviceComponentName.length()>0 && !J2EEUtils.isEJBComponent(serviceProj, serviceComponentName))
-        {
-          finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_EJB_PROJECT",new String[]{serviceProjName}),Status.ERROR);          
-        }
-        if (!isEJBRequired && serviceComponentName!=null && serviceComponentName.length()>0 && !J2EEUtils.isWebComponent(serviceProj, serviceComponentName))
-        {
-          finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_WEB_PROJECT",new String[]{serviceProjName}),Status.ERROR);
-        }
-        */
-        // end remove
-      }
-    }
-    
-    if (isClientWidgetVisible_) 
-    {
-	    String clientEARName   = clientWidget_.getClientEarProjectName();
-	    String clientProjName  = clientWidget_.getClientProjectName();
-	
-  		String clientComponentName = clientWidget_.getClientComponentName();
-		
-	    // check same EAR-ness -----
-	    String warning_msg = getEARProjectWarningMessage(serviceEARName, clientEARName);
-	    
-		if (serviceComponentName.equalsIgnoreCase(clientComponentName)){
-			  String err_msg = msgUtils_.getMessage( "MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS", new String[]{ "WEB" } );
-			  finalStatus = StatusUtils.errorStatus( err_msg );				
-		}
-		
-	    if( clientProjName != null && serviceProjName != null && 
-	        clientProjName.equalsIgnoreCase( serviceProjName ))
-	    {
-		  String error_msg = msgUtils_.getMessage("MSG_SAME_CLIENT_AND_SERVICE_PROJECTS");
-		  finalStatus = StatusUtils.errorStatus( error_msg );
-	    }
-	    
-		if (warning_msg != null)
-	    {
-	      if (finalStatus.getSeverity()!=Status.ERROR)
-	      	return StatusUtils.warningStatus( warning_msg );          
-	    }         
-      
-    }
-    
-    return finalStatus;
-  }
-  
-  private void createMessageText( Composite parent, String value )
-  {
-    Text     messageText = new Text( parent, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY );    
-	GridData gridData    = new GridData( GridData.FILL_BOTH );
-	
-	gridData.horizontalIndent = 10;    
-	messageText.setLayoutData( gridData );
-	messageText.setText( value );
-  }
-  
-  private String getEARProjectWarningMessage(String serviceEARName, String clientEARName ) {
-
-    // check if service and client share the same EAR
-    if (serviceEARName!=null && clientEARName!=null) {
-    
-      if (clientEARName.equalsIgnoreCase(serviceEARName) && clientEARName.length()>0) {
-        return msgUtils_.getMessage("MSG_SAME_CLIENT_AND_SERVICE_EARS", new String[]{ "EAR" });
-      }
-    }
-
-    return null;
-
-  }
-  
-  //Returns a label corresponding to the componentTypeId. This is hard-coded for now.
-  //This is something the flexible project framework should provide. Enhancement 106785 has been
-  //opened.
-  private String getCompTypeLabel(String typeId)
-  {
-	  if (typeId.equals(IModuleConstants.JST_WEB_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
-	  }
-	  else if (typeId.equals(IModuleConstants.JST_EJB_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
-	  }
-	  else if (typeId.equals(IModuleConstants.JST_APPCLIENT_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
-	  }
-	  else if (typeId.equals(IModuleConstants.JST_UTILITY_MODULE))
-	  {
-		  return msgUtils_.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
-	  }
-	  else
-	  {
-		  //No known label, return the typeId itself. 
-		  return typeId;
-	  }	  
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 31b1c55a1..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,933 +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.creation.ui.widgets.runtime;
-
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceType;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-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.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{
-  private String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR";	
-  private boolean           generateProxy_;
-  
-  // webServiceRuntimeJ2EEType contains the default Web service runtime and J2EE level based on the initial selection.
-  // If the initialSeleciton does not result in a valid Web service runtime and J2EE level, webServiceRuntimeJ2EEType
-  // should remain null for the life of this instance.
-  private WSRuntimeJ2EEType webServiceRuntimeJ2EEType = null;
-  
-  private TypeRuntimeServer serviceIds_;
-  private SelectionListChoices serviceProject2EARProject_;
-  private String serviceComponentName_;
-  private String serviceEarComponentName_;
-  private String serviceComponentType_;
-  private IProject initialProject_;
-  private String initialComponentName_;
-  private String serviceJ2EEVersion_;
-  private boolean serviceNeedEAR_ = true;
-
-  public ServerRuntimeSelectionWidgetDefaultingCommand()
-  {
-    super();
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {    
-    Environment env = getEnvironment();
-    
-    try
-    {
-     IStatus clientSideStatus = super.execute(monitor, null);
-     if (clientSideStatus.getSeverity()==Status.ERROR)
-     {
-       return clientSideStatus;
-     }
-     IStatus status = Status.OK_STATUS;
-
-
-    setDefaultServiceRuntimeFromPreference();
-    setDefaultServiceJ2EEVersionFromPreference();      
-    webServiceRuntimeJ2EEType = getWSRuntimeAndJ2EEFromProject(initialProject_, initialComponentName_);
-    if (webServiceRuntimeJ2EEType != null)
-    {
-      serviceJ2EEVersion_ = webServiceRuntimeJ2EEType.getJ2eeVersionId();
-      serviceIds_.setRuntimeId(webServiceRuntimeJ2EEType.getWsrId()); 
-    }	 
-     
-     setServiceComponentType();
-     // Default projects EARs and servers.
-     setDefaultProjects();
-     setDefaultEARs();
-     IStatus serverStatus = setDefaultServer();
-     if (serverStatus.getSeverity()== Status.ERROR)
-     {
-         env.getStatusHandler().reportError(serverStatus);
-         return serverStatus;
-     }
-     updateServiceEARs();
-     //updateClientProject(getServiceProject2EARProject().getList().getSelection(), serviceComponentName_, serviceIds_.getTypeId());
-     updateClientEARs();
-	 	 
-     return status;
-    } catch (Exception e)
-    {
-      //Catch all Exceptions in order to give some feedback to the user
-      IStatus errorStatus = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}), e);
-      env.getStatusHandler().reportError(errorStatus);
-      return errorStatus;
-    }
-    
-  }  
-
-  private void setServiceComponentType()
-  {
-    ServiceType st = WebServiceRuntimeExtensionUtils.getServiceType(serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
-    int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(serviceIds_.getTypeId());
-    String[] includeComponentTypes = null;
-    switch (scenario)
-    {
-    case WebServiceScenario.BOTTOMUP:
-		includeComponentTypes = st.getBottomUpModuleTypesInclude();
-      break;
-    case WebServiceScenario.TOPDOWN:
-		includeComponentTypes = st.getTopDownModuleTypesInclude();
-    }
-    
-    if (includeComponentTypes == null || includeComponentTypes.length==0)
-    {
-      serviceComponentType_ = IModuleConstants.JST_WEB_MODULE;
-    }
-    else
-    {
-	  serviceComponentType_ = includeComponentTypes[0];
-    }
-  }
-  
-  /*
-  private void setWebClientType()
-  {
-    SelectionListChoices choices = getRuntime2ClientTypes();
-    String               webId   = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
-    
-    if( choices != null )
-    {
-      choices.getChoice().getList().setSelectionValue( webId );   
-    }
-  }
-  */
-  
-  /**
-   * Returns an object with target Runtime and J2EE value
-   * @param project
-   * @return
-   */
-
-  private WSRuntimeJ2EEType getWSRuntimeAndJ2EEFromProject(IProject project, String componentName)
-  {
-    WSRuntimeJ2EEType wsrJ2EE = null;
-    //If there is a valid initial selection, use it to determine
-    //reasonable J2EE version and Web service runtime values
-
-    if (project != null && project.exists())
-    {
-      boolean isValidComponentType = false;
-      if (componentName != null && componentName.length()>0)
-      {
-        isValidComponentType = J2EEUtils.isWebComponent(project, componentName) ||
-                                     J2EEUtils.isEJBComponent(project, componentName);
-      }
-      if (isValidComponentType)
-      {
-        //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-        
-        //Get the J2EE level
-        int versionId = J2EEUtils.getJ2EEVersion(project, componentName);
-        String versionString = String.valueOf(versionId);
-        
-        //Get the runtime target of the project
-        IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
-        String runtimeTargetId = null;
-        if (runtimeTarget != null) 
-          runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-        
-        //If the preferred Web service runtime supports this J2EE level and this server target, keep it
-        if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
-            ((runtimeTarget == null) || 
-             (runtimeTarget != null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId()))
-            )
-           )
-          
-        {
-            //Set the J2EE level and Web service runtime
-            wsrJ2EE = new WSRuntimeJ2EEType();
-            wsrJ2EE.setWsrId(serviceIds_.getRuntimeId());
-            wsrJ2EE.setJ2eeVersionId(versionString);
-            return wsrJ2EE;
-
-        } else
-        {
-          //Look for a runtime that matches both the J2EE level and the server target.
-          String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(serviceIds_.getTypeId());
-          for (int i = 0; i < validRuntimes.length; i++)
-          {
-            if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i]) &&
-                ((runtimeTarget == null) ||
-                 (runtimeTarget!=null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))
-                )
-                )
-            {
-              wsrJ2EE = new WSRuntimeJ2EEType();
-              wsrJ2EE.setWsrId(validRuntimes[i]);
-              wsrJ2EE.setJ2eeVersionId(versionString);
-              return wsrJ2EE;
-            }
-          }
-        }
-      }
-    }    
-    return wsrJ2EE;
-  }
-  
-  private void setDefaultServiceRuntimeFromPreference()
-  {
-  	
-    PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-    String pRuntimeId = context.getRuntimeId();
-    //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-    //if the preferred runtime in compatible with the type, select it.
-    if (WebServiceRuntimeExtensionUtils.isRuntimeSupportedForType(serviceIds_.getTypeId(), pRuntimeId))
-    {
-      serviceIds_.setRuntimeId(pRuntimeId);
-    }
-    else
-    {
-      //Set the Web service runtime to one that is supported by the selected type.
-      String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(serviceIds_.getTypeId());
-      if (validRuntimes != null && validRuntimes.length>0)
-      {
-        serviceIds_.setRuntimeId(validRuntimes[0]);
-      }
-    }
-  }
-
-  
-
-  private void setDefaultServiceJ2EEVersionFromPreference()
-  {
-    if (serviceIds_ != null)
-    {
-      String runtimeId = serviceIds_.getRuntimeId();
-      if (runtimeId != null)
-      {
-        //IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
-        WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
-        if (wsrt != null)
-        {
-          String[] versions = wsrt.getJ2eeLevels();          
-          //If the preferred J2EE version is in versions, pick the preferred one. 
-          //Otherwise, pick the first one.
-          if (versions != null && versions.length > 0)
-          {
-          	PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-          	String pJ2EE = context.getJ2EEVersion();
-          	if (pJ2EE!=null && pJ2EE.length()>0)
-          	{
-              for (int i=0;i<versions.length;i++)
-          	  {
-          		  if (versions[i].equals(pJ2EE))
-          		  {
-          			  serviceJ2EEVersion_ = versions[i];
-          		    return;
-          		  }
-          	  }
-          	}
-          	serviceJ2EEVersion_ = versions[0];
-          	return;
-          }
-            
-        }
-      }
-    }
-  } 
-
-  
-  /**
-   * This method needs a lot of work. It does not take into account the component types supported by the
-   * selected Web service type or the fact that there are multiple components in a project.
-   */
-  //rskrem93309
-  /*
-  private void setDefaultProjectsNew()
-  {
-    if (initialProject_ != null)
-    {
-      getServiceProject2EARProject().getList().setSelectionValue(initialProject_.getName());
-      String moduleName = null;
-      if (initialComponentName_!=null && initialComponentName_.length()>0)
-      {
-        moduleName = initialComponentName_;
-      }
-      else
-      {
-        moduleName = J2EEUtils.getFirstWebModuleName(initialProject_);
-      }
-      
-      serviceComponentName_ = moduleName;
-      String version = String.valueOf(J2EEUtils.getJ2EEVersion(initialProject_, moduleName));
-      String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels();
-      for (int i=0; i< validVersions.length; i++)
-      {
-        if (validVersions[i].equals(version))
-        {
-          serviceJ2EEVersion_ = validVersions[i];
-        }
-      }
-    }
-    else
-    {
-      //Pick the first one
-      IProject[] projects = WebServiceRuntimeExtensionUtils.getAllProjects();
-      if (projects.length>0)
-      {
-        getServiceProject2EARProject().getList().setSelectionValue(projects[0].getName());
-        String moduleName = J2EEUtils.getFirstWebModuleName(projects[0]);
-        serviceComponentName_ = moduleName;
-        String version = String.valueOf(J2EEUtils.getJ2EEVersion(projects[0], moduleName));
-        String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels();
-        for (int i=0; i< validVersions.length; i++)
-        {
-          if (validVersions[i].equals(version))
-          {
-            serviceJ2EEVersion_ = validVersions[i];
-          }
-        }        
-        
-      }
-      else
-      {
-        //there are no projects in the workspace. Pass the default names for new projects.
-        
-        if (serviceComponentType_.equals(IModuleConstants.JST_EJB_MODULE))
-        {
-          getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultEJBProjectName());
-          serviceComponentName_ = ResourceUtils.getDefaultEJBComponentName();
-        }
-        else
-        {
-          getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-          serviceComponentName_ = ResourceUtils.getDefaultWebComponentName();
-        }
-      }
-      
-      
-    }
-  }
-  */
-  //
-
-  private void setDefaultProjects()
-  {
-	
-	//Handle the case where no valid initial selection exists
-    if (initialProject_== null || (initialProject_!=null && webServiceRuntimeJ2EEType==null))
-    {
-      //Select the first existing project that is valid.
-      setServiceProjectToFirstValid();
-      String serviceProjectName = getServiceProject2EARProject().getList().getSelection();
-     
-      //Select a client project with "client" added to the above project name.
-      updateClientProject(serviceProjectName, serviceComponentName_, serviceIds_.getTypeId());
-      //String clientProjectName = ResourceUtils.getClientWebProjectName(serviceProjectName, serviceIds_.getTypeId() );
-      //getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientProjectName);
-      
-      return;
-    }    
-	    
-
-	//Set the service project selection to this initialProject
-	getServiceProject2EARProject().getList().setSelectionValue(initialProject_.getName());
-  serviceComponentName_ = initialComponentName_;
-  updateClientProject(initialProject_.getName(), serviceComponentName_, serviceIds_.getTypeId());
-	//String clientProjectName = ResourceUtils.getClientWebProjectName(initialProject_.getName(), serviceIds_.getTypeId() ); 
-	//Set the client project selection to clientProject
-	//getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientProjectName);
-		      	    
-  }
-  
-
-  private void setServiceProjectToFirstValid()
-  {
-    //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-    String[] projectNames = getServiceProject2EARProject().getList().getList();
-    for (int i=0;i<projectNames.length; i++)
-    {
-      IProject project = ProjectUtilities.getProject(projectNames[i]);
-      IVirtualComponent[] vcs = J2EEUtils.getComponentsByType(project, serviceComponentType_);
-      if (project.isOpen() && vcs!=null && vcs.length>0)
-      {
-        //Get the runtime target of the project
-        IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
-        String runtimeTargetId = null;
-        if (runtimeTarget != null) 
-          runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-        
-        for (int j=0; j < vcs.length; j++)
-        {  
-          //Get the J2EE level
-          int versionId = J2EEUtils.getJ2EEVersion(vcs[j]);
-          String versionString = String.valueOf(versionId);
-        
-        
-          if (serviceJ2EEVersion_!=null && serviceJ2EEVersion_.length()>0 && serviceJ2EEVersion_.equals(versionString))
-          {
-            if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
-               ((runtimeTarget == null) || 
-               ((runtimeTarget!=null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId()))) 
-               )
-            {
-              getServiceProject2EARProject().getList().setSelectionValue(projectNames[i]);
-              serviceComponentName_ = vcs[j].getName();
-              
-              return;
-            }
-          }
-        }
-      }
-    }
-    
-    //Didn't find a single project that worked. Default to a new project name.    
-    //getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-    //serviceComponentName_ = ResourceUtils.getDefaultWebProjectName();
-    if (serviceComponentType_.equals(IModuleConstants.JST_EJB_MODULE))
-    {
-      getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultEJBProjectName());
-      serviceComponentName_ = ResourceUtils.getDefaultEJBComponentName();
-    }
-    else
-    {
-      getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
-      serviceComponentName_ = ResourceUtils.getDefaultWebComponentName();
-    }    
-  }
-
-
-  private void setDefaultEARs()
-  { 
-    //Service side
-    String initialProjectName = getServiceProject2EARProject().getList().getSelection();
-    IProject initialProject =   FileResourceUtils.getWorkspaceRoot().getProject(initialProjectName);
-    boolean earIsSet = false;
-    if (initialProject != null && initialProject.exists())
-    {
-      IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialProject, serviceComponentName_);
-      if (earComps.length > 0)
-      {
-        // Pick the first one
-        IVirtualComponent earComp = earComps[0];
-        String earProjectName = earComp.getProject().getName();
-        String earComponentName = earComp.getName();
-        getServiceProject2EARProject().getChoice().getList().setSelectionValue(earProjectName);
-        serviceEarComponentName_ = earComponentName;
-        earIsSet = true;
-      }
-    }
-     
-    if (!earIsSet)
-    {
-      // Either the component is not associated with any EARs or the project
-      // does not exist,
-      // so pick the first EAR yousee with the correct J2EE version.
-      IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
-      if (allEarComps.length > 0)
-      {
-        for (int i = 0; i < allEarComps.length; i++)
-        {
-          IRuntime runtime = ServerSelectionUtils.getRuntimeTarget(allEarComps[i].getProject().getName());
-          if (runtime != null && serviceIds_.getRuntimeId() != null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtime.getRuntimeType().getId(), serviceIds_.getRuntimeId()) && serviceJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
-          {
-            String earProjectName = allEarComps[i].getProject().getName();
-            getServiceProject2EARProject().getChoice().getList().setSelectionValue(earProjectName);
-            serviceEarComponentName_ = allEarComps[i].getName();
-            earIsSet = true;
-          }
-
-        }
-      }
-    }
-      
-    if (!earIsSet)
-    {
-        // there are no suitable existing EARs
-        getServiceProject2EARProject().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultServiceEARProjectName());
-        serviceEarComponentName_ = ResourceUtils.getDefaultServiceEARComponentName();
-    }
-  
-    
-    
-    //Client side    
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection(); 
-    IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
-    String[] clientEARInfo = getDefaultEARFromClientProject(initialClientProject, getClientComponentName());
-
-    //If the client project exists and the default EAR is the same as that of the service project, 
-    //pick the defaultClientEAR
-    if(initialClientProject!=null && initialClientProject.exists() 
-       && clientEARInfo[1].equalsIgnoreCase(serviceEarComponentName_))
-    {
-      getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(clientEARInfo[0]);
-      setClientEARComponentName(clientEARInfo[1]);
-    }
-    else
-    { 
-      ProjectTopologyContext ptc= WebServicePlugin.getInstance().getProjectTopologyContext();
-      String serviceEARName = getServiceProject2EARProject().getChoice().getList().getSelection();
-      if (!ptc.isUseTwoEARs()) {        
-        getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(serviceEARName);
-        setClientEARComponentName(serviceEarComponentName_);
-      }
-      else {
-        //I am here
-        IProject proxyEARProject = getUniqueClientEAR(clientEARInfo[0], serviceEARName, initialClientProjectName);
-        getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(proxyEARProject.getName());
-        setClientEARComponentName(proxyEARProject.getName());
-      }     
-    }    
-  
-  }
-
-  
-/*  
-    private void setDefaultEARs() { 
-      // Service-side 
-      String initialProjectName = getServiceProject2EARProject().getList().getSelection(); 
-      IProject initialProject = FileResourceUtils.getWorkspaceRoot().getProject(initialProjectName);
-    IProject defaultServiceEAR = getDefaultEARFromServiceProject(initialProject);
-    getServiceProject2EARProject().getChoice().getList().setSelectionValue(defaultServiceEAR.getName());
-    // Client-side 
-    String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
-   IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
-    IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject); // If the client project exists and the default EAR is the same as that of the service
-    project, // pick the defaultClientEAR 
-    if(initialClientProject!=null && initialClientProject.exists() && defaultClientEAR.getName().equalsIgnoreCase(defaultServiceEAR.getName())) {
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultClientEAR.getName()); }
-    else { ProjectTopologyContext ptc=
-    WebServicePlugin.getInstance().getProjectTopologyContext(); if
-    (!ptc.isUseTwoEARs()) {
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultServiceEAR.getName()); }
-    else { IProject proxyEARProject =
-    getUniqueClientEAR(defaultClientEAR.getName(), defaultServiceEAR.getName(),
-    initialClientProjectName);
-    getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(proxyEARProject.getName()); } } }
-  */ 
-  
-  private IProject getUniqueClientEAR(String earProject, String serviceProject, String clientProjectName) {
-
-    String projectName = new String();
-    if (!earProject.equalsIgnoreCase(serviceProject)) {
-      projectName = earProject;
-    }
-    else {
-      projectName = clientProjectName+DEFAULT_CLIENT_EAR_PROJECT_EXT;
-      int i=1;      
-      while (projectName.equalsIgnoreCase(serviceProject)) {
-        projectName = projectName+i;
-        i++;
-      }
-    }
-    return projectName.equals("") ? null : ResourceUtils.getWorkspaceRoot().getProject(projectName);
-    
-  }
-  
-  /*
-  private void setDefaultServer()
-  {
-    String initialProjectName = getServiceProject2EARProject().getList().getSelection();
-	  IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(initialProjectName);
-    String runtimeTargetId = null;
-    if (runtimeTarget != null)
-    {
-      runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-      //Pick a compatible existing server if one exists.
-      IServer[] servers = ServerSelectionUtils.getCompatibleExistingServers(runtimeTarget);
-      if (servers!=null && servers.length>0)
-      {
-        for (int i=0; i<servers.length; i++)
-        {
-          String thisFactoryId = servers[0].getServerType().getId();
-          //if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(serviceIds_.getRuntimeId(), thisFactoryId))
-          //{
-            //Pick this server and return.
-            serviceIds_.setServerId(thisFactoryId);
-            serviceIds_.setServerInstanceId(servers[0].getId());
-            return;
-          //}			  
-        }
-      }
-      
-      //No compatible existing server, set the factory id to something the runtime supports
-      String[] factoryIds = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds();
-      if (factoryIds!=null && factoryIds.length>0)
-      {
-        for (int i=0; i<factoryIds.length; i++)
-        {
-          IServerType serverType = ServerCore.findServerType(factoryIds[i]);
-          if (serverType != null)
-          {
-            String serverRuntimeTypeId = serverType.getRuntimeType().getId();            
-            if (serverRuntimeTypeId.equals(runtimeTargetId))
-            {
-              //Found a match
-              serviceIds_.setServerId(factoryIds[i]);
-              return;
-            }
-          }
-        }        
-      }
-      else
-      {
-        //Runtime does not specify any server factory ids
-        IServerType[] serverTypes = ServerCore.getServerTypes();
-        serviceIds_.setServerId(serverTypes[0].getId());
-      }
-      
-    }
-    else
-    {
-      // The project has no server target so pick a server factory id that is supported by the runtime
-      String[] fids = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds();
-      if (fids!=null && fids.length>0)
-      {
-        serviceIds_.setServerId(fids[0]);  
-      }
-      else
-      {
-        //Runtime does not specify any server factory ids
-        IServerType[] serverTypes = ServerCore.getServerTypes();
-        serviceIds_.setServerId(serverTypes[0].getId());        
-      }
-            
-    }        
-  }
-  */
-
-  private IStatus setDefaultServer()
-  {
-	  IStatus status = Status.OK_STATUS;
-    //Calculate reasonable default server based on the default project selection. 
-
-    String initialProjectName = getServiceProject2EARProject().getList().getSelection(); 
-    IProject initialProject = ProjectUtilities.getProject(initialProjectName);
-    if (initialProject.exists())
-    {
-      String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialProject, serviceComponentName_, serviceIds_.getRuntimeId(), true);
-      if (serverInfo!=null)
-      {
-        if (serverInfo[0]!=null && serverInfo[0].length()>0)
-        {
-          serviceIds_.setServerId(serverInfo[0]);
-        }
-        if (serverInfo[1]!=null && serverInfo[1].length()>0)
-        {
-          serviceIds_.setServerInstanceId(serverInfo[1]);
-        }        
-      }      
-    }
-    else //the project does not exist.
-    {
-      //Does the EAR exist?
-      String initialEARProjectName = getServiceProject2EARProject().getChoice().getList().getSelection();
-      IProject initialEARProject = ProjectUtilities.getProject(initialEARProjectName);
-      if (initialEARProject.exists())
-      {
-        String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialEARProject, serviceEarComponentName_, serviceIds_.getRuntimeId(), false);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            serviceIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            serviceIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }              
-      }
-      else
-      {
-        //We have a new project and EAR. Use the runtime/server selection 
-        //preferences to set the default server/server type.
-        //Pick a server type that is compatible with the Web service runtime
-        //If there is an existing server that works, pick that one.
-        
-        String[] serverInfo = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(serviceIds_.getRuntimeId(), serviceJ2EEVersion_);
-        if (serverInfo!=null)
-        {
-          if (serverInfo[0]!=null && serverInfo[0].length()>0)
-          {
-            serviceIds_.setServerId(serverInfo[0]);
-          }
-          if (serverInfo[1]!=null && serverInfo[1].length()>0)
-          {
-            serviceIds_.setServerInstanceId(serverInfo[1]);
-          }        
-        }
-        else
-        {
-        	//Since the project and the EAR are both new, try changing the J2EE level
-        	boolean foundServer = false;
-        	WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId());
-            if (wsrt != null)
-            {
-              String[] versions = wsrt.getJ2eeLevels();
-              if (versions != null && versions.length > 0)
-              {
-            	  for (int k=0; k<versions.length; k++)
-            	  {
-            		  //If this J2EE version is different from the current one, see if there is
-            		  //a server available.
-            		  if (serviceJ2EEVersion_!=versions[k])
-            		  {
-            			  String[] si = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(serviceIds_.getRuntimeId(), versions[k]);
-             		      if (si!=null)
-            		      {
-            		        if (si[0]!=null && si[0].length()>0)
-            		        {
-            		          serviceIds_.setServerId(si[0]);
-            		        }
-            		        if (si[1]!=null && si[1].length()>0)
-            		        {
-            		          serviceIds_.setServerInstanceId(si[1]);
-            		        }             
-            		        serviceJ2EEVersion_ = versions[k];
-            		        foundServer = true;
-            		        break;
-            		      }
-            		  
-            	      }
-                  }
-               }
-            }
-        	//No valid server runtimes appear to be configured, this is an error condition.
-            if (!foundServer)
-            {
-              String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(serviceIds_.getRuntimeId());
-              String serverLabels = getServerLabels(serviceIds_.getRuntimeId());            	
-        	    status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}) );
-            }
-        	
-        }
-      }
-      
-    }
-    
-    return status;
-  }
-
-  
-  private void updateServiceEARs()
-  {
-  	//Set EAR selection to null if the project/server defaults imply an EAR should not be created
-  	String serviceProjectName = getServiceProject2EARProject().getList().getSelection();
-  	IProject serviceProject = FileResourceUtils.getWorkspaceRoot().getProject(serviceProjectName);
-  	if (serviceProject != null && serviceProject.exists())
-  	{
-  	  //Get the runtime target on the serviceProject
-  	  IRuntime serviceTarget = ServerSelectionUtils.getRuntimeTarget(serviceProjectName);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(serviceProject, serviceComponentName_));
-  	  if (serviceTarget != null)
-  	  {
-  	  	if (!ServerUtils.isTargetValidForEAR(serviceTarget.getRuntimeType().getId(),j2eeVersion))
-  	  	{
-  	      //Default the EAR selection to be empty
-  	  	  getServiceProject2EARProject().getChoice().getList().setIndex(-1);
-          serviceEarComponentName_ = "";
-  	  	  serviceNeedEAR_ = false;
-  	  	}
-  	  		
-  	  }
-  	}
-  	else
-  	{
-      String serverId = serviceIds_.getServerId();
-      if (serverId != null)
-      {
-  		//Use the server type
-  		String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverId);
-  		if (serverTargetId!=null && serverTargetId.length()>0)
-  		{
-  		  if (!ServerUtils.isTargetValidForEAR(serverTargetId,serviceJ2EEVersion_))
-  	  	  {
-  	        //Default the EAR selection to be empty
-  	  	    getServiceProject2EARProject().getChoice().getList().setIndex(-1);
-            serviceEarComponentName_ = "";
-  	  	    serviceNeedEAR_ = false;
-  	  	  }
-  		}
-      }
-  	}
-  	
-  		
-  }
-  public void setInitialSelection(IStructuredSelection selection)
-  {
-  }
-  
-  public void setInitialProject(IProject initialProject)
-  {
-    initialProject_ = initialProject;
-  }
-  
-  public void setInitialComponentName(String name)
-  {
-    initialComponentName_ = name;  
-  }
-  
-  public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
-  {
-    serviceIds_ = ids;
-  }
-  
-  public TypeRuntimeServer getServiceTypeRuntimeServer()
-  {
-    return serviceIds_; 
-  }
-
-  public SelectionListChoices getServiceProject2EARProject()
-  {
-    if (serviceProject2EARProject_ == null)
-    {
-	  // rskreg
-      //IProject[] projects = WebServiceServerRuntimeTypeRegistry.getInstance().getProjectsByWebServiceType(serviceIds_.getTypeId());
-      //Populate the list with all the projects in the workspace except Servers and ones that start with "."
-	  // rskreg
-	  String[] projectNames = getAllFlexibleProjects();
-	  SelectionList list = new SelectionList(projectNames, 0);
-	  Vector choices = new Vector();
-	  for (int i = 0; i < projectNames.length; i++) {
-      IProject project = ProjectUtilities.getProject(projectNames[i]);
-	    choices.add(getProjectEARChoice(project));
-	  }
-	  serviceProject2EARProject_ = new SelectionListChoices(list, choices, getEARProjects());
-    }
-    return serviceProject2EARProject_; 
-  }
-    
-  /**
-   * @return Returns the generateProxy_.
-   */
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;
-  }
-  /**
-   * @param generateProxy_ The generateProxy_ to set.
-   */
-  public void setGenerateProxy(boolean generateProxy_)
-  {
-    this.generateProxy_ = generateProxy_;
-  }
-
-  public String getServiceJ2EEVersion()
-  {
-    return serviceJ2EEVersion_;
-  }
-  
-  public String getServiceProjectName()
-  {
-    return getServiceProject2EARProject().getList().getSelection();  
-  }
-  
-  public String getServiceEarProjectName()
-  {
-    return getServiceProject2EARProject().getChoice().getList().getSelection();
-  }
-  
-  public String getServiceComponentName()
-  {
-    return serviceComponentName_;
-  }
-  
-  public String getServiceEarComponentName()
-  {
-    return serviceEarComponentName_;
-  }
-  
-  public String getServiceComponentType()
-  {
-    return serviceComponentType_;
-  }
-  
-  public boolean getServiceNeedEAR()
-  {
-    return serviceNeedEAR_;
-  }
-  
-  /**
-   * Returns the first EAR for a given project
-   * @param project
-   * @return
-   */
-  /*
-  private IProject getDefaultEARFromServiceProject(IProject project)
-  {
-    if (project!=null && project.exists()) 
-    {
-      IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
-      IServer firstSupportedServer = ServerSelectionUtils.getFirstSupportedServer(configuredServers, serviceIds_.getTypeId() );
-      
-      EARNatureRuntime[] earProjects = J2EEUtils.getEARProjects(project, firstSupportedServer);
-      if (earProjects!=null && earProjects[0] instanceof EARNatureRuntime) 
-        return earProjects[0].getProject();
-    }
-    
-    int versionId = -1;
-    if (serviceJ2EEVersion_ != null && serviceJ2EEVersion_.length()>0)
-    {
-      versionId = Integer.parseInt(serviceJ2EEVersion_);
-    }
-    EARNatureRuntime newEAR = J2EEUtils.getEAR(versionId);
-    IProject earProject = ResourceUtils.getWorkspaceRoot().getProject(ResourceUtils.getDefaultServiceEARProjectName());
-      
-    if (newEAR!=null)
-      earProject = newEAR.getProject();
-
-    return earProject;  	
-  }
-  */
-  
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
deleted file mode 100644
index 72e0589c1..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null
@@ -1,49 +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.creation.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class LaunchFragment extends BooleanFragment
-{
-  private boolean publishToPublicUDDI_;  
-  private boolean publishToPrivateUDDI_;
-  
-  public LaunchFragment()
-  {
-    Condition condition = new Condition()
-    {
-      public boolean evaluate()
-      {
-        return (publishToPublicUDDI_ || publishToPrivateUDDI_);
-      }
-    };
-    setCondition( condition );
-    setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) );
-  }
-  
-  public void setPublishToPublicUDDI(boolean publishToPublicUDDI)
-  {
-    publishToPublicUDDI_ = publishToPublicUDDI;
-  }
-  
-  public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI)
-  {
-  	publishToPrivateUDDI_ = publishToPrivateUDDI;
-  }
-   
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
deleted file mode 100644
index 99d82143c..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null
@@ -1,78 +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.creation.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class ServiceTestFragment extends BooleanFragment
-{
-  private boolean testService;
-  private boolean generateProxy;
-  
-  
-  public ServiceTestFragment( String id )
-  {
-  	SequenceFragment testRoot = new SequenceFragment();
-  	Condition condition = new Condition()
-                          {
-                            public boolean evaluate()
-                            {
-                              return testService;
-                            }
-                          };
-    setCondition( condition );
-    
-    testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) );
-    testRoot.add( new SimpleFragment( id ) );
-    setTrueFragment( testRoot );
-      
-  }
- 
-  
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-  	
-  	dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class);
-  	
-  	//from the wizard 
-  	dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class);
-  	dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class);
-  }
-  
-  public void setGenerateProxy(boolean generateProxy)
-  {
-  	this.generateProxy = generateProxy;
-  }
-  
-  public boolean getGenerateProxy()
-  {
-  	return generateProxy;
-  }
-  
-  /**
-   * @return Returns the testService.
-   */
-  public void setTestService( boolean testService )
-  {
-    this.testService = testService;
-  }
-
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
deleted file mode 100644
index a0fa9eb02..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.common.environment.Environment;
-
-
-public class ServiceTestWidget extends SimpleWidgetDataContributor
-{
-  private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-  private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-
-  private Combo testTypeCombo_;
-  /*CONTEXT_ID PSTP0001 for the Test Type Combo box of the Service Test Page*/
-  private final String INFOPOP_PSTP_COMBOBOX_TEST = "PSTP0001";
-  private final String TOOLTIP_PSTP_COMBOBOX_TEST = "TOOLTIP_PSTP_COMBOBOX_TEST";
-
-  private Button launchButton_;
-  /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/
-  private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002";
-  private final String TOOLTIP_PSTP_LAUNCH_BUTTON = "TOOLTIP_PSTP_LAUNCH_BUTTON";
-  
-  private SelectionList facilities_;
-  
-  private String serviceServerInstanceId = null;
-  
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener )
-  {
-    MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-    UIUtils      uiUtils  = new UIUtils(msgUtils, createPluginId_ );
-        
-    Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 );
-    
-    testTypeCombo_ = uiUtils.createCombo( testComposite, "LABEL_TEST_TYPES",
-                                          TOOLTIP_PSTP_COMBOBOX_TEST,
-                                          INFOPOP_PSTP_COMBOBOX_TEST,
-                                          SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-    
-    launchButton_ = uiUtils.createPushButton( testComposite, "BUTTON_LAUNCH_SERVICE_TEST",
-                                          TOOLTIP_PSTP_LAUNCH_BUTTON,
-                                          INFOPOP_PSTP_LAUNCH_BUTTON );
-    launchButton_.addSelectionListener( new SelectionAdapter()
-                                        {
-                                          public void widgetSelected( SelectionEvent event )
-                                          {
-                                            handleLaunchButton();
-                                          }
-                                        });
-    
-     
-    return this;
-  }
-  
-  private TypeRuntimeServer serviceids;
-  private String serverProject;
-  private String module;
-  private String wsdlURI;
-  private String launchedServiceTestName = "";
-  private Environment env;
-  private List endpoints;
-  
-  private void handleLaunchButton()
-  {
-	// Split up the project and module
-	int p = serverProject.indexOf("/");
-	if (p != -1){
-		module = serverProject.substring(p+1);
-		serverProject = serverProject.substring(0,p);
-	}
-  	
-  	String testID = testTypeCombo_.getText();
-  	launchedServiceTestName = testID;
-  	WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
-  	wtlc.setTestID(testID);
-  	wtlc.setServiceTypeRuntimeServer(serviceids);
-	  wtlc.setServiceServerInstanceId(serviceServerInstanceId);
-  	wtlc.setServerProject(serverProject);
-	  wtlc.setServerModule(module);
-  	wtlc.setWsdlURI(wsdlURI);
-  	wtlc.setExternalBrowser(true);
-  	wtlc.setEndpoint(endpoints);
-  	wtlc.setEnvironment( env );
-  	wtlc.execute( null, null );
-  }
-  
-  public void setServiceTestFacilities( SelectionList facilities )
-  {
-    facilities_ = facilities;
-    testTypeCombo_.setItems( facilities.getList() );
-    testTypeCombo_.select( facilities.getIndex() );
-  }
-  
-  public SelectionList getServiceTestFacilities()
-  {
-    facilities_.setIndex( testTypeCombo_.getSelectionIndex() );
-    return facilities_;
-  }
-
-  public String getTestID()
-  {
-  	return testTypeCombo_.getText();
-  }
-  
-  public void setWsdlURI(String wsdlURI)
-  {
-  	this.wsdlURI = wsdlURI;
-  }
-    
-  public void setServerProject(String serverProject)
-  {
-    this.serverProject = serverProject;
-  }
-
-  public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
-  {
-    this.serviceids = serviceids;
-  }
-  
-  public String getLaunchedServiceTestName()
-  {
-    return launchedServiceTestName;
-  }
-
-  public void setEnvironment(Environment env)
-  {
-  	this.env = env;
-  }
-
-  public void setEndpoint(String endpoint)
-  {
-    if (endpoint != null && endpoint.length() > 0)
-    {
-      Vector v = new Vector();
-      v.add(endpoint);
-      setEndpoints(v);
-    }
-  }
-  
-  public void setEndpoints(List endpoints)
-  {
-    this.endpoints = endpoints;
-  }
-  
-  public void setServiceServerInstanceId(String ssInstanceId){
-	  this.serviceServerInstanceId = ssInstanceId;
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
deleted file mode 100644
index 3aa830d8a..000000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null
@@ -1,104 +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
- *******************************************************************************/
-/*
- * Created on Apr 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.common.environment.Environment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestDefaultingCommand extends AbstractDataModelOperation 
-{
-  
-  private SelectionList serviceTestFacilities;	
-  private Environment environment;
-  private String testID;
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    Environment env = getEnvironment();
-    
-  	ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
-  	testID = scenarioContext.getNonJavaTestService();
-  	String[] testTypes = scenarioContext.getWebServiceTestTypes();
-  	
-  	
-  	environment = env;
-  	IStatus status = Status.OK_STATUS;
-  	WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-  	
-    
-  	Vector wsdlNames = new Vector();
-  	for(int i =0 ;i<testTypes.length;i++){
-  	  WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]);  	
-  	  if(wscte.testWSDL()){
-  	    wsdlNames.addElement(testTypes[i]);
-  	  }
-  	}
-    
-  	String javaNamesArray[] = new String[wsdlNames.size()];
-  	Enumeration e = wsdlNames.elements();
-  	int i = 0;
-  	while(e.hasMoreElements()){
-      javaNamesArray[i] = (String)e.nextElement();
-  	  i++;
-  	}
-  	
-  	
-  	serviceTestFacilities = new SelectionList(javaNamesArray,0);  	
-  	
- 	return status;
-  }
-
-  public SelectionList getServiceTestFacilities()
-  {
-  	return serviceTestFacilities;
-  }
-
-  public String getTestID()
-  {
-  	return testID;
-  }
-  
-  public Environment getEnvironment()
-  {
-  	return environment;
-  }
-
-  public boolean getExternalBrowser()
-  {
-  	return false;
-  }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath b/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore b/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
deleted file mode 100644
index e15b00db1..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.project b/bundles/org.eclipse.jst.ws.uddiregistry/.project
deleted file mode 100644
index cd999f6fd..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.uddiregistry</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.consumption</project>
-		<project>org.eclipse.jst.ws.consumption.ui</project>
-		<project>org.eclipse.jst.ws.ui</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.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
deleted file mode 100644
index 665da2974..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.uddiregistry; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.uddiregistry.plugin,
- org.eclipse.jst.ws.internal.uddiregistry.widgets,
- org.eclipse.jst.ws.internal.uddiregistry.widgets.binding,
- org.eclipse.jst.ws.internal.uddiregistry.wizard,
- org.eclipse.jst.ws.uddiregistry
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.common.frameworks
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/about.html b/bundles/org.eclipse.jst.ws.uddiregistry/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
deleted file mode 100644
index 5b43cae7b..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
deleted file mode 100644
index 31611ec30..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
deleted file mode 100644
index d8cfbff82..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/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=Web Services Universal Description Discovery and Integration Registry
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI=Unit Test UDDI
-
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
deleted file mode 100644
index 77a2c48c5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   
-<!--
-  <description>
-  %PLUGIN_DESC
-  </description>
-  -->
-    <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
-   <extension
-         point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
-      <privateUDDIRegistryType
-            name="%PRIVATE_UDDI_REGISTRY_TYPE_IMPL"
-            class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl"
-            id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl">
-      </privateUDDIRegistryType>
-   </extension>
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            icon="icons/registry.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
-            id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
-      </wizard>
-   </extension>
-   <extension
-         point="org.eclipse.wst.command.env.dynamicWizard">
-      <dynamicWizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            class="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding"
-            iconbanner="icons/uddiprivateconfig_wiz.gif"
-            id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
-      </dynamicWizard>
-   </extension>
-   <!--
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
-            icon="icons/registry.gif"
-            category="org.eclipse.jst.ws.ui.new"
-            class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard"
-            id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard">
-         <description>
-            %PLUGIN_NEW_WIZARD_DESC_WS_UNIT_TEST_UDDI
-         </description>
-         <selection
-               class="org.eclipse.core.resources.IResource">
-         </selection>
-      </wizard>
-   </extension>
-   -->
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
deleted file mode 100644
index 81df413f7..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-/**
-* This is the plugin class for the Web Services UDDI Registry plugin.
-* <p>
-* The Web Services UDDI Registry plugin's is to add the
-* option to create a unit test UDDI registry 
-*/
-public class WebServiceUDDIRegistryPlugin extends Plugin
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.uddiregistry";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceUDDIRegistryPlugin instance_;
-  
-  /**
-  * Constructs a runtime plugin object for this plugin.
-  */
-  public WebServiceUDDIRegistryPlugin ()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceUDDIRegistryPlugin)Platform.getPlugin("org.eclipse.jst.ws.uddiregistry");
-  * @return The WebServiceUDDIRegistryPlugin singleton.
-  */
-  public static WebServiceUDDIRegistryPlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-  public static ImageDescriptor getImageDescriptor ( String name )
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL,name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    return Platform.getResourceString(instance_.getBundle(),key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
deleted file mode 100644
index 2a58fc3cb..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
+++ /dev/null
@@ -1,78 +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.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-/*
-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.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends AbstractDataModelOperation
-{
-  private byte operationType;
-  private PrivateUDDIRegistryType registryType;
-  
-  /*
-  public Status execute(Environment env)
-  {
-    MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
-  	if (registryType != null)
-  	{
-  	  switch (operationType)
-  	  {
-  	  	case PrivateUDDIRegistryType.OP_DEPLOY:
-  	      return registryType.deploy(env);
-  	  	case PrivateUDDIRegistryType.OP_UPDATE:
-  	  	  return registryType.update(env);
-  	  	case PrivateUDDIRegistryType.OP_REMOVE:
-  	  	  return registryType.remove(env);
-  	  	default:
-  	  }
-  	}
-  	return new SimpleStatus("");
-  }
-  */
-
-  public PrivateUDDIRegistryType getRegistryType()
-  {
-    return getPrivateUDDIRegistryType();
-  }
-  
-  public byte getOperationType()
-  {
-    return operationType;
-  }
-  
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
-  {
-  	return registryType;
-  }
-
-  public void setRegistryType(PrivateUDDIRegistryType regType)
-  {
-  	setPrivateUDDIRegistryType(regType);
-  }
-  
-  public void setOperationType(byte type)
-  {
-    operationType = type;
-  }
-  
-  public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType regType)
-  {
-  	registryType = regType;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
deleted file mode 100644
index 84fd197eb..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
+++ /dev/null
@@ -1,98 +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.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
-  private PrivateUDDIRegistryType registryType;
-  private DataMappingRegistry dataMappingRegistry;
-  private CanFinishRegistry canFinishRegistry;
-  private WidgetRegistry widgetRegistry;
-  
-  public PrivateUDDISelectionCommandFragment()
-  {
-  	super(null, "");
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-  	if (registryType != null)
-  	{
-      registryType.registerCanFinish(canFinishRegistry);
-      registryType.registerDataMappings(dataMappingRegistry);
-      registryType.registerWidgetMappings(widgetRegistry);
-      return registryType.create().create();
-  	}
-    else
-      return null;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment(CommandFragment fragment)
-  {
-  	return null;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings(DataMappingRegistry registry)
-  {
-  	dataMappingRegistry = registry;
-  }
-
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-  }
-
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    this.widgetRegistry = widgetRegistry;
-  }
-
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-  	PrivateUDDISelectionCommandFragment fragment = new PrivateUDDISelectionCommandFragment();
-  	fragment.registerDataMappings(dataMappingRegistry);
-  	fragment.registerCanFinish(canFinishRegistry);
-  	fragment.registerWidgetMappings(widgetRegistry);
-  	fragment.setPrivateUDDIRegistryType(registryType);
-  	return fragment;
-  }
-  
-  public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType registryType)
-  {
-  	this.registryType = registryType;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
deleted file mode 100644
index 77c692133..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
+++ /dev/null
@@ -1,212 +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.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-
-
-/**
-* This UDDI configuration page prompts the user
-* for the information required to configure the
-* unit test UDDI registry.
-*/
-public class PrivateUDDISelectionWidget extends SimpleWidgetDataContributor
-{
-  private MessageUtils msgUtils;
-  private Listener statusListener;
-
-  private Button deployRadio_;
-  private Label typesLabel_;
-  private Combo typesCombo_;
-  private Button updateRadio_;
-  private Button removeRadio_;
-  private PrivateUDDIRegistryType[] types_;
-  private PrivateUDDIRegistryType installedType_;
-
-  // Infopop
-  private final String INFOPOP_PUPR_PRIVATE_UDDI_PAGE = WebServiceUDDIRegistryPlugin.ID + ".pupr0001";
-  private final String INFOPOP_PUPR_PRIVATE_UDDI_TYPE = WebServiceUDDIRegistryPlugin.ID + ".pupr0002";
-  private final String INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0003";
-  private final String INFOPOP_PUPR_UPDATE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0005";
-  private final String INFOPOP_PUPR_REMOVE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0004";
-
-  public PrivateUDDISelectionWidget()
-  {
-    msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this );
-  }
-
-  public WidgetDataEvents addControls(Composite parent, Listener statusListener)
-  {
-  	this.statusListener = statusListener;
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_PAGE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PUPR_PRIVATE_UDDI_PAGE);
-
-    GridLayout gl;
-    GridData gd;
-    
-    Listener listener = new Listener()
-    {
-      public void handleEvent(Event event)
-      {
-      	handleWidgetEvent(event);
-      }
-    };
-
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    
-    deployRadio_ = new Button(parent, SWT.RADIO);
-    deployRadio_.setText(msgUtils.getMessage("BUTTON_DEPLOY_UDDI_REGISTRY"));
-    deployRadio_.setSelection(true);
-    deployRadio_.addListener(SWT.Selection, listener);
-    deployRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI"));
-    helpSystem.setHelp(deployRadio_, INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI);
-
-    Composite typeComposite = new Composite(parent,SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 5;
-    gl.verticalSpacing = 15;
-    gl.marginWidth = 20;
-    typeComposite.setLayout(gl);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    typeComposite.setLayoutData(gd);
-
-    typesLabel_ = new Label(typeComposite, SWT.WRAP);
-    typesLabel_.setText(msgUtils.getMessage("LABEL_PRIVATE_UDDI_REGISTRY_TYPES"));
-    typesLabel_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
-    helpSystem.setHelp(typesLabel_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
-    typesCombo_ = new Combo(typeComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
-    gd = new GridData(GridData.FILL_HORIZONTAL);
-    typesCombo_.setLayoutData(gd);
-    typesCombo_.addListener(SWT.Selection, listener);
-    typesCombo_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
-    helpSystem.setHelp(typesCombo_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
-    updateRadio_ = new Button(parent,SWT.RADIO);
-    updateRadio_.setText(msgUtils.getMessage("BUTTON_UPDATE_UDDI_REGISTRY"));
-    updateRadio_.setSelection(false);
-    updateRadio_.addListener(SWT.Selection,listener);
-    updateRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI"));
-    helpSystem.setHelp(updateRadio_, INFOPOP_PUPR_UPDATE_PRIVATE_UDDI);
-
-    removeRadio_ = new Button(parent, SWT.RADIO);
-    removeRadio_.setText(msgUtils.getMessage("BUTTON_REMOVE_UDDI_REGISTRY"));
-    removeRadio_.setSelection(false);
-    removeRadio_.addListener(SWT.Selection, listener);
-    removeRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI"));
-    helpSystem.setHelp(removeRadio_, INFOPOP_PUPR_REMOVE_PRIVATE_UDDI);                
-
-    loadTypes();
-    init();
-    return this;
-  }
-
-  private final void loadTypes()
-  {
-    types_ = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-  }
-
-  private final void init()
-  {
-    for (int i = 0; i < types_.length; i++)
-    {
-      if (types_[i] != null)
-      {
-        typesCombo_.add(types_[i].getName());
-        if (types_[i].isPrivateUDDIRegistryInstalled())
-          installedType_ = types_[i];
-      }
-    }
-    if (typesCombo_.getItemCount() > 0)
-      typesCombo_.setText(typesCombo_.getItem(0));
-    if (installedType_ != null)
-    {
-      updateRadio_.setEnabled(true);
-      removeRadio_.setEnabled(true);                
-    }
-    else
-    {
-      updateRadio_.setEnabled(false);
-      removeRadio_.setEnabled(false);
-    }
-  }
-
-  private void handleWidgetEvent(Event event)
-  {
-    if (event.widget == removeRadio_ || event.widget == updateRadio_)
-    {
-      boolean isUpdateOrRemoveSelected = ((Button)event.widget).getSelection();
-      typesLabel_.setEnabled(!isUpdateOrRemoveSelected);
-      typesCombo_.setEnabled(!isUpdateOrRemoveSelected);
-    }
-    else if (event.widget == deployRadio_)
-    {
-      boolean isDeploySelected = ((Button)event.widget).getSelection();
-      typesLabel_.setEnabled(isDeploySelected);
-      typesCombo_.setEnabled(isDeploySelected);
-    }
-    statusListener.handleEvent(event);
-  }
-  
-  public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
-  {
-  	if (deployRadio_.getSelection())
-  	{
-  	  String selectedRegistryName = typesCombo_.getText();
-  	  for (int i = 0; i < types_.length; i++)
-        if (selectedRegistryName.equals(types_[i].getName()))
-  	  	  return types_[i];
-      return null;
-  	}
-  	else
-  	  return installedType_;
-  }
-  
-  public byte getOperationType()
-  {
-  	if (deployRadio_.getSelection())
-  	  return PrivateUDDIRegistryType.OP_DEPLOY;
-  	else if (updateRadio_.getSelection())
-      return PrivateUDDIRegistryType.OP_UPDATE;
-  	else if (removeRadio_.getSelection())
-      return PrivateUDDIRegistryType.OP_REMOVE;
-  	else
-  	  return PrivateUDDIRegistryType.OP_DEPLOY;
-  }
-
-  public IStatus getStatus()
-  {
-    PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
-    if (privateUDDIRegistryType != null)
-      return privateUDDIRegistryType.getOperationStatus(getOperationType());
-    else
-      return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE") );
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
deleted file mode 100644
index 05ed0fd65..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.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.uddiregistry.widgets;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends AbstractDataModelOperation implements Condition
-{
-  private boolean condition;
-
-  public PrivateUDDISelectionWidgetConditionCommand()
-  {
-    condition = true;
-  }
-  
-  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    condition = !condition;
-    return Status.OK_STATUS;
-  }
-  
-  public IStatus undo( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    condition = !condition;
-    return Status.OK_STATUS;
-  }
-  
-  public boolean evaluate()
-  {
-    return condition;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
deleted file mode 100644
index 78dedf196..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
+++ /dev/null
@@ -1,113 +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.uddiregistry.widgets.binding;
-
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommand;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PrivateUDDIWidgetBinding implements CommandWidgetBinding
-{
-  private CanFinishRegistry   canFinishRegistry;
-  private WidgetRegistry      widgetRegistry;
-  private DataMappingRegistry dataMappingRegistry;
-  private PrivateUDDISelectionCommandFragment privateUDDISelFragment;
-  private PrivateUDDISelectionWidgetConditionCommand conditionCommand;
-  
-  public PrivateUDDIWidgetBinding()
-  {
-    privateUDDISelFragment = new PrivateUDDISelectionCommandFragment();
-    conditionCommand = new PrivateUDDISelectionWidgetConditionCommand();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
-   */
-  public CommandFragmentFactory create()
-  {
-    return new CommandFragmentFactory()
-    {
-      public CommandFragment create()
-      {
-        SequenceFragment root = new SequenceFragment();
-        root.add(new SimpleFragment(conditionCommand, ""));
-        root.add(new SimpleFragment("PrivateUDDISelectionWidget"));
-        root.add(new SimpleFragment(conditionCommand, ""));
-        root.add(new SimpleFragment(new PrivateUDDISelectionCommand(), ""));
-        root.add(privateUDDISelFragment);
-        return root;
-      }
-    };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry)
-  {
-    this.canFinishRegistry = canFinishRegistry;
-    privateUDDISelFragment.registerCanFinish(this.canFinishRegistry);
-    
-    canFinishRegistry.addCondition(conditionCommand);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry)
-  {
-    dataMappingRegistry = dataRegistry;
-    privateUDDISelFragment.registerDataMappings(dataMappingRegistry);
-    
-    // PrivateUDDISelectionCommand
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommand.class);
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "OperationType", PrivateUDDISelectionCommand.class);
-    
-    // PrivateUDDISelectionCommandFragment
-    dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommandFragment.class);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry)
-  {
-    MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
-    this.widgetRegistry = widgetRegistry;
-    privateUDDISelFragment.registerWidgetMappings(this.widgetRegistry);
-
-    widgetRegistry.add("PrivateUDDISelectionWidget", 
-      msgUtils.getMessage("PAGE_TITLE_PRIVATE_UDDI_CONFIG"),
-      msgUtils.getMessage("PAGE_DESC_PRIVATE_UDDI_CONFIG"),
-	  new WidgetContributorFactory()
-      {
-	    public WidgetContributor create()
-	    {
-	      return new PrivateUDDISelectionWidget();
-	    }
-	  }
-    );
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
deleted file mode 100644
index 7e48cf0cc..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.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.uddiregistry.wizard;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public interface PrivateUDDIRegistryType extends CommandWidgetBinding
-{
-  // operation types
-  public static byte OP_DEPLOY = 0x0;
-  public static byte OP_UPDATE = 0x1;
-  public static byte OP_REMOVE = 0x2;
-
-  // general information
-  public String getID();
-  public String getName();
-  public boolean isPrivateUDDIRegistryInstalled();
-  public IStatus getOperationStatus(byte operation);
-
-  // registry URLs
-  public String getInquiryAPI();
-  public String getPublishAPI();
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
deleted file mode 100644
index 2af533c00..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public class PrivateUDDIRegistryTypeImpl implements org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType
-{
-    public PrivateUDDIRegistryTypeImpl() {
-    }
-
-    public boolean isPrivateUDDIRegistryInstalled() {
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled())
-                return true;
-        }
-        return false;
-    }
-
-    public String[] getPrivateUDDIRegistryInquiryAPI() {
-        Vector inquiryAPIVector = new Vector();
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled()) {
-                String inquiryAPI = types[i].getInquiryAPI();
-                if (inquiryAPI != null && inquiryAPI.startsWith("http"))
-                    inquiryAPIVector.add(inquiryAPI);
-            }
-        }
-
-        String[] inquiryAPIArray = new String[inquiryAPIVector.size()];
-        Enumeration e = inquiryAPIVector.elements();
-        int j = 0;
-        while(e.hasMoreElements()) {
-            inquiryAPIArray[j] = (String)e.nextElement();
-            j++;
-        }
-        return inquiryAPIArray;
-    }
-
-    public String[] getPrivateUDDIRegistryPublishAPI() {
-        Vector publishAPIVector = new Vector();
-        PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
-        for (int i = 0; i < types.length; i++) {
-            if (types[i].isPrivateUDDIRegistryInstalled()) {
-                String publishAPI = types[i].getPublishAPI();
-                if (publishAPI != null && publishAPI.startsWith("http"))
-                    publishAPIVector.add(publishAPI);
-            }
-        }
-
-        String[] publishAPIArray = new String[publishAPIVector.size()];
-        Enumeration e = publishAPIVector.elements();
-        int j = 0;
-        while(e.hasMoreElements()) {
-            publishAPIArray[j] = (String)e.nextElement();
-            j++;
-        }
-        return publishAPIArray;
-    }
-    
-    public CommandWidgetBinding getBinding()
-    {
-      return new PrivateUDDIWidgetBinding();
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 971d6c55d..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class PrivateUDDIRegistryTypeRegistry {
-
-    private static PrivateUDDIRegistryTypeRegistry instance_;
-    private IConfigurationElement[] configElements_;
-
-    private PrivateUDDIRegistryTypeRegistry() {
-    }
-  
-    /**
-    * Returns a singleton instance of this class.
-    * @return A singleton WebServiceClientTypeRegistry object.
-    */
-    public static PrivateUDDIRegistryTypeRegistry getInstance() {
-        if (instance_ == null) {
-            instance_ = new PrivateUDDIRegistryTypeRegistry();
-            instance_.getConfigElements();
-        }
-        return instance_;
-    }
-  
-    public IConfigurationElement[] getConfigElements() {
-        IExtensionRegistry reg = Platform.getExtensionRegistry();
-        configElements_ = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.uddiregistry",
-                                     "privateUDDIRegistryType");
-        Vector v = new Vector();
-        for (int i = 0; i < configElements_.length; i++)
-        {
-          int weight = getWeight(configElements_[i]);
-          int index = -1;
-          for (int j = v.size()-1; j >= 0; j--)
-          {
-            if (weight > getWeight((IConfigurationElement)v.get(j)))
-              index = j;
-            else
-              break;
-          }
-          if (index != -1)
-            v.add(index, configElements_[i]);
-          else
-            v.add(configElements_[i]);
-        }
-        v.copyInto(configElements_);
-        return configElements_;
-    }
-
-    private int getWeight(IConfigurationElement e)
-    {
-      try
-      {
-        return Integer.parseInt(e.getAttribute("weight"));
-      }
-      catch (NumberFormatException nfe)
-      {
-        return -1;
-      }
-    }
-
-    private IConfigurationElement getConfigElementByID(String id) {
-        for (int i = 0; i <configElements_.length; i++) {
-            if (configElements_[i].getAttribute("id").equals(id))
-                return configElements_[i];
-        }
-        return null;
-    }
-
-    public PrivateUDDIRegistryType[] getTypes() {
-        Vector types = new Vector();
-        for (int i = 0; i < configElements_.length; i++) {
-            try {
-                Object typeObj = configElements_[i].createExecutableExtension("class");
-                if (typeObj instanceof PrivateUDDIRegistryType)
-                    types.add(typeObj);
-            }
-            catch (Exception e) {}
-        }
-
-        PrivateUDDIRegistryType[] typesArray = new PrivateUDDIRegistryType[types.size()];
-        for (int j = 0; j < types.size(); j++) {
-            typesArray[j] = (PrivateUDDIRegistryType)types.elementAt(j);
-        }
-        return typesArray;
-    }
-
-    public PrivateUDDIRegistryType getTypeByID(String id) {
-        try {
-            Object typeObj = getConfigElementByID(id).createExecutableExtension("class");
-            if (typeObj instanceof PrivateUDDIRegistryType)
-                return (PrivateUDDIRegistryType)typeObj; 
-        }
-        catch (Exception e) {}
-        return null;
-    }
-
-    public String[] getSupportedServerFactoryIDByID(String id) {
-        IConfigurationElement configElement = getConfigElementByID(id);
-        if (configElement == null)
-            return new String[0];
-        Vector idVector = new Vector();
-        StringTokenizer st = new StringTokenizer(configElement.getAttribute("serverFactoryID"), ",");
-        while (st.hasMoreTokens()) {
-            idVector.add(st.nextToken());
-        }
-        String[] ids = new String[idVector.size()];
-        for (int i = 0; i < idVector.size(); i++) {
-            ids[i] = (String)idVector.elementAt(i);
-        }
-        return ids;
-    }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
deleted file mode 100644
index c4d8af3a5..000000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# PrivateUDDIConfigPage
-#
-PAGE_TITLE_PRIVATE_UDDI_CONFIG=Unit Test UDDI Registry Configuration
-PAGE_DESC_PRIVATE_UDDI_CONFIG=Configure the unit test UDDI registry.
-
-#
-# Tooltip for PrivateUDDIConfigPage
-#
-TOOLTIP_PUPR_PRIVATE_UDDI_PAGE=Deploy or remove a Unit Test UDDI Registry
-TOOLTIP_PUPR_PRIVATE_UDDI_TYPE=Choose the type of Unit Test UDDI Registry you want to deploy
-TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI=Deploy a Unit Test UDDI Registry
-TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI=Update the existing Unit Test UDDI Registry
-TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI=Remove the existing Unit Test UDDI Registry
-
-#
-# Common wizard strings.
-#
-LABEL_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry type:
-BUTTON_DEPLOY_UDDI_REGISTRY=Deploy the Unit Test UDDI Registry
-BUTTON_UPDATE_UDDI_REGISTRY=Update the previously deployed UDDI registry
-BUTTON_REMOVE_UDDI_REGISTRY=Remove the previously deployed UDDI registry
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Dialog messages
-#
-
-#
-# Progress messages
-#
-
-#
-# Warning messages
-#
-
-#
-# Error messages
-#
-MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE=IWAB0363E No UDDI registry available.
diff --git a/bundles/org.eclipse.jst.ws.ui/.classpath b/bundles/org.eclipse.jst.ws.ui/.classpath
deleted file mode 100644
index cb0105380..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.ui/.cvsignore b/bundles/org.eclipse.jst.ws.ui/.cvsignore
deleted file mode 100644
index f8f79d43e..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws.ui/.project b/bundles/org.eclipse.jst.ws.ui/.project
deleted file mode 100644
index 17ef9ac85..000000000
--- a/bundles/org.eclipse.jst.ws.ui/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws.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>
-	</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.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 974a07877..000000000
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.ui; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-Activator: org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.ui.action,
- org.eclipse.jst.ws.internal.ui.common,
- org.eclipse.jst.ws.internal.ui.dialog,
- org.eclipse.jst.ws.internal.ui.plugin,
- org.eclipse.jst.ws.internal.ui.preferences,
- org.eclipse.jst.ws.internal.ui.uddi,
- org.eclipse.jst.ws.ui
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.j2ee.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.ui/about.html b/bundles/org.eclipse.jst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.ui/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index e1dec33b5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-bin.includes = .,\
-               icons/,\
-               plugin.properties,\
-               plugin.xml,\
-               META-INF/,\
-               about.html
diff --git a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif b/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
deleted file mode 100644
index 152f4f2b3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
+++ /dev/null
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/plugin.properties
deleted file mode 100644
index bf5d6cf21..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /dev/null
@@ -1,48 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-
-#
-#  WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-
-#
-# Popup action Category
-#
-LABEL_POPUP_CATEGORY_WEB_SERVICES=Web Services
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
deleted file mode 100644
index 375662aaf..000000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%PLUGIN_NEW_CATEGORY_NAME_WS"
-            id="org.eclipse.jst.ws.ui.new">
-      </category>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      
-      <page
-            name="%PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT"
-            category="org.eclipse.wst.ws.internal.ui.preferences.name"
-            class="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage"
-            id="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage">
-      </page>
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.propertyPages">
-
-      
-
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IResource"
-            adaptable="true"
-            id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
-         <menu
-               label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
-               path="additions"
-               id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
-            <separator
-                  name="popupActions">
-            </separator>
-         </menu>
-      </objectContribution>
-
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
-            adaptable="true"
-            id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
-         <menu
-               label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
-               path="additions"
-               id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
-            <separator
-                  name="popupActions">
-            </separator>
-         </menu>
-      </objectContribution>
-      
-
-      <objectContribution
-            objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-   </extension>
-   
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
deleted file mode 100644
index 9597ab97b..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
+++ /dev/null
@@ -1,64 +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.ui.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-
-/**
- * This class launches the import wizard.
- */
-public class LaunchImportWizardAction implements IActionDelegate
-{
-    private IStructuredSelection selection_;
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) 
-    {
-      DynamicWizard wizard = new DynamicWizard();
-      
-      try
-      {
-        wizard.setInitialData( "wsimport" );
-        wizard.init( PlatformUI.getWorkbench(), selection_ );
-      }
-      catch( CoreException exc )
-      {
-        // Do nothing.
-        return;
-      }
-      
-  	  WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
-	  dialog.setPageSize( 500, 400 );
-	  dialog.create();
-	  dialog.open();
-    }
-    
-    /* (non-Javadoc)
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) 
-    {
-      if( selection instanceof IStructuredSelection )
-      {
-        selection_ = (IStructuredSelection)selection;
-      }
-    }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b71f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
+++ /dev/null
@@ -1,18 +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.ui.action;
-import org.eclipse.core.resources.IResource;
-
-
-public interface WebServiceDeploy {
-	public void run(IResource selection); 
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
deleted file mode 100644
index a1db9cbbc..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null
@@ -1,83 +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.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-
-public class WebServiceDeployAction extends WindowActionDelegate {
-public void run(org.eclipse.jface.action.IAction action) {
-
-   IProject project = getSelectedResourceProject();
-
-   String [] typeIds = ServerUtils.getServerTypeIdsByModule(project);
-   Object theAction = null;
-
-   IExtensionRegistry reg = Platform.getExtensionRegistry();
-   IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.ui", "webservicedeploy");
-   try {
-   	
-   	if (typeIds == null || typeIds.length <= 0)
-   	{
-   	 	// that means the module is not attached to a server then pick the first extension found
-   	    theAction = elements[0].createExecutableExtension("class");
-   	}
-   	else if ( typeIds.length == 1)
-   	{
-   		// that means the module is attached to one server then finds it id and a matchin extension or give a message
-   		for (int i = 0; i < elements.length; i++)
-      	{
-		   	String id = elements[i].getAttribute("factoryId");
-    	   	if ( typeIds[0].equals(id))
-		   	{
-		   		theAction = elements[i].createExecutableExtension("class");
-		   		break;
-		   	}
-   		}
-   		if (theAction == null )
-   			{
-   				// give a message
-   			}
-   	}
-   	else
-   	{
-		// The module is attached to more than one server find the first server-extension couple
-		// TBD: add a dialog to choose the server for deployment
-		for (int i = 0; i < elements.length; i++)
-      	{
-		   	String id = elements[i].getAttribute("factoryId");
-		   	for ( int k=0; k< typeIds.length; k++)
-		   	{
-    	   		if ( typeIds[k].equals(id))
-		   		{
-		   			theAction = elements[i].createExecutableExtension("class");
-		   			break;
-		   		}
-		   	}
-		   if (theAction != null) break;
-   		 }
-		if (theAction == null) 
-			{
-				// give a Message
-			}
-   	}
-
-    if (theAction instanceof WebServiceDeploy)
-          ((WebServiceDeploy)theAction).run(project);   
-  }
-
-  catch (Exception e) {}
-} 
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
deleted file mode 100644
index 837e28409..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
+++ /dev/null
@@ -1,86 +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.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-public abstract class WindowActionDelegate implements IWorkbenchWindowActionDelegate {
-protected IStructuredSelection fSelection;
-
-public WindowActionDelegate() {
-    super();
- }
-
-public void dispose() 
- {
- }
-
-public void init(org.eclipse.ui.IWorkbenchWindow window) { }
-
-public void selectionChanged(org.eclipse.jface.action.IAction action, 
-                                    org.eclipse.jface.viewers.ISelection selection) {
-   if (selection instanceof IStructuredSelection)                                 
-     fSelection = (IStructuredSelection) selection;
- }
-
-public void setSelection(IStructuredSelection selection) {
-	fSelection = selection;
-}
-public IStructuredSelection getSelection() {
-	return fSelection;
-}
-
-public IProject getSelectedResourceProject() {
- IProject project = null;
- IResource resource_ = null;
-   try {
-   		if (fSelection != null && fSelection.size() == 1)    {
-      		Object obj = fSelection.getFirstElement();
-
-      		if (obj != null)    {
-      			if ( obj instanceof IResource) 
-      				{
-      					resource_ = (IResource) obj;
-      				}
-      			else if (obj instanceof ICompilationUnit)
-      			{
-        			ICompilationUnit compUnit = (ICompilationUnit)obj;
-        			resource_= compUnit.getCorrespondingResource();
-      			}
-				else if (obj instanceof IJavaProject) {
-					project = ((IJavaProject) obj).getProject();
-				}
-
-				else if (obj instanceof EObject) {
-					project = ProjectUtilities.getProject((EObject) obj);
-				}
-
-      			if ( resource_ != null )
-   					project = resource_.getProject();
-         		
-    		}
-   		}
-   	}	
-   catch (Exception e) {}
-   return project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
deleted file mode 100644
index 4545acac5..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null
@@ -1,221 +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.ui.common;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
-* This class provides a dialog for browsing workspace resources.
-*/
-public class DialogResourceBrowser extends Dialog
-{
-  private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
-  private IResource root_;
-  private IFilter[] filters_;
-  private boolean multipleSelectionEnabled_;
-  private IResource[] selection_;
-  private Tree resourceTree_;
-  private TreeViewer fileViewer_;
-
-  public DialogResourceBrowser(Shell shell, IResource root, IFilter filter)
-  {
-    this(shell, root, new IFilter[]{filter});
-  }
-
-  /**
-  * Constructs a new <code>DialogResourceBrowser</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code>
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param filters An array of java.lang.String
-  */
-  public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters)
-  {
-    super(shell);
-
-    IResource moduleRoot = root;
-    if (root instanceof IProject)
-    {
-      IProject p = (IProject)moduleRoot;
-     
-        moduleRoot = p;
-    
-    }
-
-    root_ = (moduleRoot == null) ? ResourcesPlugin.getWorkspace().getRoot() : moduleRoot;
-    filters_ = (filters == null) ? new IFilter[0] : filters;
-    multipleSelectionEnabled_ = false;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-
-  /**
-  * Enables or disables multiple selection in the tree view.
-  * Multiple selection is disabled by default.
-  * @param multipleSelectionEnabled True to enabled or false to disable.
-  */
-  public void setMultipleSelectionEnabled(boolean multipleSelectionEnabled)
-  {
-    multipleSelectionEnabled_ = multipleSelectionEnabled;
-  }
-
-  /**
-  * Returns the selections made in the dialog if OK was pressed,
-  * or null if Cancel was pressed. Returns null if the dialog
-  * has never been opened.
-  * @return An array of selected resources, possibly empty, possibly null.
-  */
-  public IResource[] getSelection()
-  {
-    return selection_;
-  }
-
-  public IResource getFirstSelection()
-  {
-    if (selection_ != null && selection_.length > 0)
-      return selection_[0];
-    else
-      return null;
-  }
-
-   /**
-  * Called when the Cancel button is pressed.
-  * Insures that {@link #getResult} will return null.
-  */
-  protected void cancelPressed()
-  {
-    selection_ = null;
-    setReturnCode(Dialog.CANCEL);
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  * Squirrels away the list of zero or more selected
-  * <code>IResource</code>s to be returned by {@link #getResult}.
-  */
-  protected void okPressed()
-  {
-    ISelection selection = fileViewer_.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      selection_ = new IResource[structuredSelection.size()];
-      int i = 0;
-      Iterator it = structuredSelection.iterator();
-      while (it.hasNext())
-      {
-        Object object = it.next();
-        if (object instanceof IResource)
-          selection_[i++] = (IResource)object;
-      }
-    }
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(getMessage("%DIALOG_TITLE_RESOURCE_BROWSER"));
-  }
-
-  /** 
-  * Creates the dialog area.
-  * @param parent The parent composite.
-  * @return The control area.
-  */
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = (Composite)super.createDialogArea(parent);
-    GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.widthHint = 400;
-    gd.heightHint = 300;
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-
-    if (multipleSelectionEnabled_)
-    {
-      resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    else
-    {
-      resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    resourceTree_.setLayoutData(gd);
-    resourceTree_.setToolTipText(getMessage("%TOOLTIP_RESOURCE_TREE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_, INFOPOP_RESOURCE_TREE);
-
-    fileViewer_ = new TreeViewer(resourceTree_);
-    fileViewer_.setContentProvider(new WorkbenchContentProvider());
-    fileViewer_.setLabelProvider(new DecoratingLabelProvider(new WorkbenchLabelProvider(), WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
-    fileViewer_.addFilter(
-      new ViewerFilter()
-      {
-        public boolean select(Viewer viewer, Object parentObject, Object object)
-        {
-          if ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
-            return true;
-          else
-          {
-            for (int i = 0; i < filters_.length; i++)
-            {
-              if (filters_[i].accepts(object))
-                return true;
-            }
-            return false;
-          }
-        }
-      }
-    );
-    fileViewer_.setInput(root_);
-    return composite;
-  }
-
-  private String getMessage(String msgId)
-  {
-    return WebServiceUIPlugin.getMessage(msgId);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
deleted file mode 100644
index ed355c40d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
+++ /dev/null
@@ -1,70 +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.ui.common;
-
-import org.eclipse.core.resources.IFile;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public class FileExtensionFilter implements IFilter
-{
-  private String[] extensions_;
-
-  public FileExtensionFilter(String[] extensions)
-  {
-    extensions_ = (extensions != null) ? extensions : new String[0];
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName()
-  {
-    return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription()
-  {
-    return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
-  }
-
-  /**
-  * Returns true if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>. This method
-  * must return true if and only if {@link #statusOf}
-  * returns an <code>IStatus</code> with a severity of
-  * less than <code>IStatus.ERROR</code>.
-  * @param object The object to filter.
-  * @return True if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>.
-  */
-  public boolean accepts(Object object)
-  {
-    if (object instanceof IFile)
-    {
-      IFile file = (IFile)object;
-      for (int i = 0; i < extensions_.length; i++)
-      {
-        if (file.getFileExtension() != null && file.getFileExtension().equals(extensions_[i]))
-          return true;
-      }
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
deleted file mode 100644
index 2e5db8b50..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
+++ /dev/null
@@ -1,43 +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.ui.common;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface IFilter
-{
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName();
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription();
-
-  /**
-  * Returns true if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>. This method
-  * must return true if and only if {@link #statusOf}
-  * returns an <code>IStatus</code> with a severity of
-  * less than <code>IStatus.ERROR</code>.
-  * @param object The object to filter.
-  * @return True if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>.
-  */
-  public boolean accepts(Object object);
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
deleted file mode 100644
index 5115a8530..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
+++ /dev/null
@@ -1,212 +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.ui.common;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class UIUtils 
-{
-  String       infoPopid_;
-  MessageUtils msgUtils_;
-  
-  public UIUtils( MessageUtils msgUtils, String infoPopid )
-  {
-    msgUtils_  = msgUtils;
-    infoPopid_ = infoPopid;
-  }
-  
-  public Button createRadioButton( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    return createButton( SWT.RADIO, parent, labelName, tooltip, infopop );
-  }
-  
-  public Button createCheckbox( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    return createButton( SWT.CHECK, parent, labelName, tooltip, infopop );
-  }
-  
-  public Button createPushButton( Composite parent, String labelName, String tooltip, String infopop )
-  {
-    return createButton( SWT.NONE, parent, labelName, tooltip, infopop );
-  }
-  
-  public Button createButton( int kind, Composite parent, String labelName, String tooltip, String infopop )
-  {
-    Button button = new Button( parent, kind );
-    
-    tooltip = tooltip == null ? labelName : tooltip;
-    button.setText( msgUtils_.getMessage( labelName ) );
-    button.setToolTipText( msgUtils_.getMessage( tooltip ) );
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infoPopid_ + "." + infopop );
-    
-    return button;
-  }
-  
-  public Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style )
-  {    
-    tooltip = tooltip == null ? labelName : tooltip;
-    
-    if( labelName != null )
-    {
-      Label label = new Label( parent, SWT.WRAP);
-      label.setText( msgUtils_.getMessage( labelName ) );
-      label.setToolTipText( msgUtils_.getMessage( tooltip ) );
-    }
-    
-    Combo combo = new Combo( parent, style );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-     
-    combo.setLayoutData( griddata );
-    combo.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, infoPopid_ + "." + infopop );
-    
-    return combo;      
-  }
-  
-  public Text createText( Composite parent, String labelName, String tooltip, String infopop, int style )
-  {    
-    tooltip = tooltip == null ? labelName : tooltip;
-    
-    if( labelName != null )
-    {
-      Label label = new Label( parent, SWT.WRAP);
-      label.setText( msgUtils_.getMessage( labelName ) );
-      label.setToolTipText( msgUtils_.getMessage( tooltip ) );
-    }
-    
-    Text text = new Text( parent, style );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    
-    text.setLayoutData( griddata );
-    text.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, infoPopid_ + "." + infopop );
-    
-    return text;      
-  }
-  
-  public Composite createComposite( Composite parent, int columns )
-  {
-    return createComposite( parent, columns, -1, -1 );
-  }
-  
-  public Composite createComposite( Composite parent, int columns, int marginHeight, int marginWidth )
-  {
-    Composite composite = new Composite( parent, SWT.NONE );
-    
-    GridLayout gridlayout   = new GridLayout();
-    gridlayout.numColumns   = columns;
-  
-    if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
-    if( marginWidth >= 0 )  gridlayout.marginWidth  = marginWidth;
-    
-    composite.setLayout( gridlayout );
-    GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    composite.setLayoutData( griddata );
-    
-    return composite;
-    
-  }
-  public Group createGroup( Composite parent, String groupName, String tooltip, String infopop )
-  {
-  	return createGroup( parent, groupName, tooltip, infopop, 1, -1, -1 );
-  }
-  
-  public Group createGroup( Composite parent, String groupName, String tooltip, String infopop, int columns, int marginHeight, int marginWidth )
-  {
-    Group      newGroup    = new Group( parent, SWT.NONE );
-    GridData   griddata    = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-    GridLayout gridlayout  = new GridLayout();
-    
-    gridlayout.numColumns  = columns;
-  
-    if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
-    if( marginWidth >= 0 )  gridlayout.marginWidth  = marginWidth;
-        
-    tooltip = tooltip == null ? groupName : tooltip;
-    newGroup.setLayout( gridlayout );
-    newGroup.setText( msgUtils_.getMessage( groupName ) );
-    newGroup.setLayoutData( griddata );
-    newGroup.setToolTipText( msgUtils_.getMessage( tooltip ));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup, infoPopid_ + "." + infopop);
-    
-    return newGroup;
-  }
-  
-  public Tree createTree( Composite parent, String tooltip, String infopop, int style )
-  {
-    
-    tooltip = tooltip == null ? "" : tooltip;
-    
-    Tree tree = new Tree( parent, style );
-     
-    tree.setLayoutData( createFillAll() );
-    tree.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( tree, infoPopid_ + "." + infopop );
-    
-    return tree;      
-    
-  }
-  
-  public Table createTable( Composite parent, String tooltip, String infopop, int style )
-  {
-    
-    tooltip = tooltip == null ? "" : tooltip;
-    
-    Table table = new Table( parent, style );
-     
-    //table.setLayoutData( createFillAll() );
-    table.setToolTipText( msgUtils_.getMessage(tooltip));
-    
-    if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( table, infoPopid_ + "." + infopop );
-    
-    return table;      
-    
-  }  
-  
-  public Label createHorizontalSeparator( Composite parent, int spacing )
-  {
-    Composite composite = createComposite( parent, 1, spacing, -1 );
-     
-	Label separator = new Label( composite, SWT.SEPARATOR | SWT.HORIZONTAL );
-	
-	GridData griddata  = new GridData( GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL );
-	separator.setLayoutData( griddata );
-   
-	return separator;
-  }
-  
-  public GridData createFillAll()
-  {
-	GridData data = new GridData( GridData.HORIZONTAL_ALIGN_FILL |
-			                      GridData.GRAB_HORIZONTAL |
-			                      GridData.VERTICAL_ALIGN_FILL |
-			                      GridData.GRAB_VERTICAL );
-    return data;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
deleted file mode 100644
index 84eaf015d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
+++ /dev/null
@@ -1,245 +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.ui.dialog;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-
-/**
-* Contains utility methods for launching various common dialogs.
-*/
-public final class DialogUtils
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  /**
-  * Raises a dialog for browsing containers.
-  * @param parentShell The parent shell, optionally null.
-  * @param initialPathname The initial selection.
-  * @return The selected container or null if the dialog
-  * is cancelled, or there is no selection, or the selection
-  * is not a project or a folder.
-  */
-  public static String browseContainers ( Shell parentShell, String initialPathname )
-  {
-    String selectedPathname = null;
-    IPath initialPath = new Path(initialPathname);
-    IResource initialResource = ResourceUtils.getWorkspaceRoot().findMember(initialPath);
-    if (initialResource == null)
-    {
-      if (initialPath.segmentCount() == 1)
-      {
-        initialResource = ResourceUtils.getWorkspaceRoot().getProject(initialPath.segment(0));
-      }
-      else if (initialPath.segmentCount() > 1)
-      {
-        initialResource = ResourceUtils.getWorkspaceRoot().getFolder(initialPath);
-      }
-    }
-    else
-    {
-      if (initialResource.getType() == IResource.FILE)
-      {
-        initialResource = initialResource.getParent();
-      }
-    }
-    ContainerSelectionDialog dialog = new ContainerSelectionDialog(parentShell,(IContainer)initialResource,true,null);
-    dialog.open();
-    Object[] result = dialog.getResult();
-    if (result != null && result.length > 0)
-    {
-      if (result[0] instanceof IPath)
-      {
-        IPath path = (IPath)result[0];
-        selectedPathname = path.toString();
-      }
-    }
-    return selectedPathname;
-  }
-
-  /**
-  * Raises a dialog for browsing resources.
-  * @param parentShell The parent shell, optionally null.
-  * @param topResource The resource under which to browse.
-  * If null, all resources in the workspace are browsed.
-  * @param initialSelection The initial selection, or null for none.
-  * If the initial selection is not null and exists in the set of
-  * resources found by the browser, that resource is selected by default.
-  * @param filter The resource filter object.
-  * @return The selected resource.
-  */
-  public static IResource browseResources ( Shell parentShell, IResource topResource, IResource initialSelection, Filter filter)
-  {
-    ResourceSelectionDialog rds = new ResourceSelectionDialog(parentShell,topResource,initialSelection,filter);
-    rds.setMultipleSelectionEnabled(false);
-    if (rds.open() == Dialog.OK)
-    {
-      IResource[] resources = rds.getResult();
-      if (resources != null && resources.length > 0)
-      {
-        return resources[0];
-      }
-    }
-    return null;
-  }
-
-  /**
-  * <b>Implementation remains TBD.</b><br>
-  * Raises a dialog for browsing classes on a project's class path.
-  * @param parentShell The parent shell, optionally null.
-  * @param project The project.
-  * @return The qualified name of the selected java class.
-  */
-  public static String browseClasses ( Shell parentShell, IProject project )
-  {
-    return browseClasses(parentShell, project, (IRunnableContext)null);
-  }
-
-  public static String browseClasses ( Shell parentShell, IProject project, IWizardContainer container)
-  {
-    return browseClasses(parentShell, project, (IRunnableContext)container);
-  }
-
-  /**
-  * Raises a dialog for browsing classes on a project's class path.
-  * @param parentShell The parent shell, optionally null.
-  * @param project The project.
-  * @param container The container of the launching wizard.
-  * @return The qualified name of the selected java class.
-  */
-  public static String browseClasses ( Shell parentShell, 
-                                       IProject project, 
-                                       IRunnableContext ctxt) 
-  {
-    return browseClasses(parentShell, new IResource[] {project}, ctxt);
-  }
-  
-  public static String browseClasses(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
-  {
-    IType itype = browseClassesAsIType(parentShell, resources, ctxt);
-    if (itype != null)
-      return itype.getFullyQualifiedName();
-    else
-      return null;
-  }
-  
-  public static IType browseClassesAsIType(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
-  {
-	Vector javaElements = new Vector();
-	for (int i = 0; i < resources.length; i++)
-	{
-	  IJavaElement javaElement = JavaCore.create(resources[i]);
-	  if (javaElement != null)
-	    javaElements.add(javaElement);
-	}
-	IJavaElement[] elements = (IJavaElement[])javaElements.toArray(new IJavaElement[0]);
-	
-    IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
-    scope.setIncludesClasspaths(true);
-    scope.setIncludesBinaries(true);
-
-    //Creating and opening a TypeSelectionDialog
-    try
-	{
-      SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, ctxt, scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false);
-      dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));
-      dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));    
-      dialog.open();
-
-      //Getting the result and returning it
-      Object[] results = dialog.getResult();
-      if (results != null && results.length > 0)
-      {
-        if (results[0] instanceof IType)
-        {
-          return (IType)results[0];
-        }
-      }
-    }
-    catch (JavaModelException jme)
-	{
-    }
-    return null;
-  }
-
-  /**
-  * Raises a dialog for browsing interfaces on a project's class path.
-  * @param parentShell The parent shell, optionally null.
-  * @param project The project.
-  * @param container The container of the launching wizard.
-  * @return The qualified name of the selected java interface.
-  */
-  public static String browseInterfaces( Shell parentShell, 
-                                         IProject project, 
-                                         IWizardContainer container) 
-  									    
-  {
-    String interfaceName = null;
-
-    //Limiting search scope to the project
-    IResource[] resources = new IResource[1];
-    resources[0]=project;
-	IJavaElement[] elements = new IJavaElement[1];
-	elements[0] = JavaCore.create(resources[0]);
-    IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
-    scope.setIncludesClasspaths(true);
-    scope.setIncludesBinaries(true);
-
-    //Creating and opening a TypeSelectionDialog
-    try
-	{
-    	SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, container, scope, IJavaElementSearchConstants.CONSIDER_TYPES, false);
-    	dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));
-    	dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));    
-    	dialog.open();
-
-    	//Getting the result and returning it
-    	Object[] results = dialog.getResult();
-    	if (results != null && results.length > 0)
-    	{
-    		if (results[0] instanceof IType)
-    		{
-    			IType resultInterface = (IType)results[0];
-    			interfaceName = resultInterface.getFullyQualifiedName();
-    		}
-    	}
-    }
-    catch (JavaModelException jme)
-	{
-    }
-    
-    return interfaceName;
-  } 
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
deleted file mode 100644
index 2a819c993..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,323 +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.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-/**
-* This class provides a dialog for browsing workspace resources.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class ResourceSelectionDialog extends Dialog implements Listener
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  //
-  // Dialog controls.
-  //
-  private Label filterLabel_;
-  private Combo filterCombo_;
-  /*CONTEXT_ID DRES0001 for the Resource Type combo box of the Resource Selection Dialog*/
-  private static final String INFOPOP_DRES_COMBO_RESOURCE_TYPE = WebServiceUIPlugin.ID + ".DRES0001";
-  private static final String TOOLTIP_DRES_COMBO_RESOURCE_TYPE = "%TOOLTIP_DRES_COMBO_RESOURCE_TYPE";
-  //
-  private Tree resourceTree_;
-  private TreeViewer fileViewer_;
-  /*CONTEXT_ID DRES0002 for the Resource tree of the Resource Selection Dialog*/
-  private static final String INFOPOP_DRES_TREE_RESOURCE = WebServiceUIPlugin.ID + ".DRES0002";
-  private static final String TOOLTIP_DRES_TREE_RESOURCE = "%TOOLTIP_DRES_TREE_RESOURCE";
-
-  //
-  // Essential goodies.
-  //
-  private IResource root_;
-  private IResource initialSelection_;
-  private Filter[] filters_;
-  private Filter currentFilter_;
-  private IResource[] selection_;
-  private boolean multipleSelectionEnabled_;
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code>.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection )
-  {
-    this(parent,root,initialSelection,new Filter[] {new AnyFilter()});
-  }
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code> that
-  * are accepted by the given filter.
-  * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  * @param filter The {@link org.eclipse.jst.ws.internal.common.Filter},
-  * or null to default to all resources under the <code>root</code>.
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter filter )
-  {
-    this(parent,root,initialSelection,new Filter[] {filter});
-  }
-
-  /**
-  * Constructs a new <code>ResourceSelectionDialog</code>
-  * under the given <code>parent Shell</code>.
-  * The dialog renders all resources including and
-  * under the given <code>root IResource</code> that
-  * are accepted by the given filters.
-  * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
-  * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
-  * or null to create a top-level shell.
-  * @param root The root {@link org.eclipse.core.resources.IResource},
-  * or null to begin with the workspace root.
-  * @param initialSelection The initially selected object or null if none.
-  * @param filters An array of {@link org.eclipse.jst.ws.internal.common.Filter}
-  * objects.
-  * If the array is null or of length zero, then all resources are accepted
-  * (ie. equivalent to <code>ResourceSelectionDialog(parent,root)</code>.
-  * If the array is of length one, then the dialog will consist of a single
-  * control showing a list of all filtered resources.
-  * If the array is of length greater than one, then the dialog will
-  * consist of a combo box containing the names of the filters and with the
-  * first filter (ie. <code>filters[0]</code>) selected by default, followed
-  * by a control showing a list of all resources filtered by the selected filter. 
-  */
-  public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter[] filters )
-  {
-    super(parent);
-    root_ = root == null ? ResourceUtils.getWorkspaceRoot() : root;
-    initialSelection_ = initialSelection;
-    filters_ = (filters == null || filters.length == 0) ? new Filter[] {new AnyFilter()} : filters;
-    currentFilter_ = filters_[0];
-    multipleSelectionEnabled_ = false;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-
-  /**
-  * Enables or disables multiple selection in the tree view.
-  * Multiple selection is disabled by default.
-  * @param multipleSelectionEnabled True to enabled or false to disable.
-  */
-  public void setMultipleSelectionEnabled ( boolean multipleSelectionEnabled )
-  {
-    multipleSelectionEnabled_ = multipleSelectionEnabled;
-  }
-
-  /**
-  * Returns the selections made in the dialog if OK was pressed,
-  * or null if Cancel was pressed. Returns null if the dialog
-  * has never been opened.
-  * @return An array of selected resources, possibly empty, possibly null.
-  */
-  public IResource[] getResult ()
-  {
-    return selection_;
-  }
-
-  /**
-  * Called when the Cancel button is pressed.
-  * Insures that {@link #getResult} will return null.
-  */
-  protected void cancelPressed ()
-  {
-    selection_ = null;
-    setReturnCode(Dialog.CANCEL);
-    super.cancelPressed();
-  }
-
-  /**
-  * Called when the OK button is pressed.
-  * Squirrels away the list of zero or more selected
-  * <code>IResource</code>s to be returned by {@link #getResult}.
-  */
-  protected void okPressed ()
-  {
-    ISelection selection = fileViewer_.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      selection_ = new IResource[structuredSelection.size()];
-      int i=0;
-      Iterator iter = structuredSelection.iterator();
-      while (iter.hasNext())
-      {
-        Object object = iter.next();
-        if (object instanceof IResource)
-        {
-          selection_[i++] = (IResource)object;
-        }
-      }
-    }
-    setReturnCode(Dialog.OK);
-    super.okPressed();
-  }
-
-  /**
-  * See {@link org.eclipse.jface.window.Window#configureShell}.
-  * @param shell The shell.
-  */
-  protected void configureShell ( Shell shell )
-  {
-    super.configureShell(shell);
-    shell.setText(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_RESOURCE_BROWSE"));
-  }
-
-  /** 
-  * Creates the dialog area.
-  * @param parent The parent composite.
-  * @return The control area.
-  */
-  protected Control createDialogArea ( Composite parent )
-  {
-    GridLayout gl;
-    GridData gd;
-
-    Composite composite = (Composite)super.createDialogArea(parent);
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.widthHint = 400;
-    gd.heightHint = 300;
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(gd);
-
-    if (filters_.length > 1)
-    {
-      Composite f = new Composite(composite,SWT.NONE);
-      gl = new GridLayout();
-      gl.numColumns = 2;
-      gl.marginHeight = 0;
-      gl.marginWidth = 0;
-      f.setLayout(gl);
-      gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-      f.setLayoutData(gd);
-
-      filterLabel_ = new Label(f,SWT.WRAP);
-      filterLabel_.setText(WebServiceUIPlugin.getMessage("%LABEL_RESOURCE_FILTER"));
-      filterLabel_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
-
-      filterCombo_ = new Combo(f,SWT.DROP_DOWN | SWT.READ_ONLY);
-      gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-      filterCombo_.setLayoutData(gd);
-      filterCombo_.addListener(SWT.Selection,this);
-      filterCombo_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(filterCombo_,INFOPOP_DRES_COMBO_RESOURCE_TYPE);
-    }
-
-    if (multipleSelectionEnabled_)
-    {
-      resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    else
-    {
-      resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-    }
-    gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
-    gd.grabExcessVerticalSpace = true;
-    gd.grabExcessHorizontalSpace = true;
-    resourceTree_.setLayoutData(gd);
-//  resourceTree_.addListener(SWT.Selection,this);
-    resourceTree_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_TREE_RESOURCE));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_,INFOPOP_DRES_TREE_RESOURCE);
-
-    fileViewer_ = new TreeViewer(resourceTree_);
-    fileViewer_.setContentProvider(new WorkbenchContentProvider());
-    fileViewer_.setLabelProvider(
-                new DecoratingLabelProvider(
-				        new WorkbenchLabelProvider(), 
-				        WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
-    fileViewer_.addFilter(
-      new ViewerFilter ()
-      {
-        public boolean select ( Viewer viewer, Object parentObject, Object object )
-        {
-          return
-          (
-            ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
-            || (ResourceSelectionDialog.this.currentFilter_.accepts(object))
-          );
-        }
-      }
-    );
-    fileViewer_.setInput(root_);
-    fileViewer_.addSelectionChangedListener(
-      new ISelectionChangedListener ()
-      {
-        public void selectionChanged ( SelectionChangedEvent event )
-        {
-//        ResourceSelectionDialog.this.validatePageToStatus();
-        }
-      }
-    );
-    if (initialSelection_ != null)
-    {
-      fileViewer_.setSelection(new StructuredSelection(ResourceSelectionDialog.this.initialSelection_),true);
-    }
-
-    return composite;
-  }
-
-  /**
-  * Called when an event occurs on the page.
-  * Handles the event and revalidates the page.
-  * @param event The event that occured.
-  */
-  public void handleEvent ( Event event )
-  {
-//  validatePageToStatus();
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 7462e176b..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,131 +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.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.ui.preferences.PersistentActionDialogsContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* 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 WebServiceUIPlugin extends AbstractUIPlugin
-{
-	// Copyright
-	public static final String copyright =
-		"(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws.ui";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServiceUIPlugin instance_;
-
-  private PersistentActionDialogsContext actionDialogsContext_;
-  
-  /**
-   * Constructs a runtime plugin object for this plugin.
-   */
-  public WebServiceUIPlugin() {
-	super();
-	instance_ = this;
-  }
-
-  /**
-  * Returns the singleton instance of this plugin. Equivalent to calling
-  * (WebServiceUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
-  * @return The WebServiceUIPlugin singleton.
-  */
-  static public WebServiceUIPlugin getInstance() {
-    return instance_;
-  }
-
-
-  public PersistentActionDialogsContext getActionDialogsContext() 
-  	{
-  	  if (actionDialogsContext_ == null)
-  	  	{
-  	  		actionDialogsContext_ = new PersistentActionDialogsContext();
-  	  		actionDialogsContext_.load();
-  	  	}
-  	  return actionDialogsContext_;
-  	}
-		
-  /**
-  * 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) 
-	{
-	    MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.ui.plugin", instance_ );
-	    
-	    if( key.startsWith("%"))
-	    {
-	      key = key.substring( 1, key.length() );
-	    }
-	    
-	    return msgUtils.getMessage(key);
-    }
-
-  /**
-  * Returns the message string identified by the given key from
-  * the plugin.properties file for the appropriate locale.
-  * Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See java.text.MessageFormat for
-  * further details on substitution.
-  * @param key The message key string prefixed by a "%" symbol.
-  * That is, the string passed in must be of the form "%KEY"
-  * where the plugin.properties file contains a line of the
-  * form: "KEY = value".
-  * @param args The substitution values for the message
-  * as required by the message in plugin.properties and
-  * by the rules of class java.text.MessageFormat.
-  * @return The locale-specific message.
-  */
-	public static String getMessage(String key, Object[] args) {
-		return MessageFormat.format(getMessage(key), args);
-  }
-
-  /**
-  * Returns an image descriptor for the named resource
-  * as relative to the plugin install location.
-  * @return An image descriptor, possibly null.
-  */
-	public static ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL installURL = instance_.getBundle().getEntry("/");
-			URL imageURL = new URL(installURL, name);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-      return null;
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index 7e2ba9c7d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-public class ActionDialogPreferenceType {
-
-    private String id_;
-	public void setId (String id) {
-		id_ = id;
-	}
-	public String getId() {
-    	return id_;
-	}
-
-	private String name_;
-	public void setName(String name) {
-		name_ = name;
-	}
-	public String getName() {
-    	return name_;
-	}
-
-	private String infopop_;
-    public void setInfopop (String infopop) {
-    	infopop_ = infopop;
-    	}
-    public String getInfopop () {
-    	return infopop_;
-    	}
-
-	private String tooltip_;
-    public void setTooltip (String tooltip) {
-    	tooltip_= tooltip;
-    	}
-    public String getTooltip () {
-    	return tooltip_;
-    	}
-
- }
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index e6a3a3f39..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,114 +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.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ActionDialogPreferenceTypeRegistry
-{
-  private static ActionDialogPreferenceTypeRegistry instance_;
-
-  private Hashtable typesByName_;
-
-  //
-  // Loads WebServiceType objects into this registry.
-  // This is done by querying the plugin registry for all extensions
-  // hanging on the webServiceType extension point. Extensions
-  // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceType
-  // interface.
-  //
-  private void loadDialogsPreferences ()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.ui",
-                                     "actionDialogPreferenceType");
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      try 
-      {
-        Object actionDialogPreferenceType = elem.createExecutableExtension("class");
-        if (actionDialogPreferenceType instanceof ActionDialogPreferenceType) 
-        {
-          ActionDialogPreferenceType dialog = (ActionDialogPreferenceType) actionDialogPreferenceType;
-          dialog.setId((String)elem.getAttribute("id"));
-          dialog.setName((String)elem.getAttribute("name"));
-          dialog.setInfopop((String)elem.getAttribute("infopop"));
-          dialog.setTooltip((String)elem.getAttribute("tooltip"));
-          add(dialog);
-        }
-      } catch (CoreException e)
-      {
-      }
-    }
-  }
-
-  //
-  // Loads actionDialogPreferenceType objects into this registry.
-  // See method getInstance().
-  //
-  private void load ()
-  {
-    typesByName_ = new Hashtable();
-    loadDialogsPreferences();
-  }
-
-  //
-  // Add the given WebServiceType to this registry.
-  // See method load().
-  //
-  private void add ( ActionDialogPreferenceType dialog )
-  {
-    typesByName_.put(dialog.getId(),dialog);
-  }
-
-  /**
-  * Returns a singleton instance of this class.
-  * @return A singleton WebServiceTypeRegistry object.
-  */
-  public static ActionDialogPreferenceTypeRegistry getInstance ()
-  {
-    if (instance_ == null)
-    {
-      instance_ = new ActionDialogPreferenceTypeRegistry();
-      instance_.load();
-    }
-    return instance_;
-  }
-
-  /**
-  * Returns all registered <code>WebServiceType</code> objects.
-  * @return All registered <code>WebServiceType</code> objects.
-  */
-  public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
-  {
-    ActionDialogPreferenceType[] dialogs = new ActionDialogPreferenceType[typesByName_.size()];
-    Enumeration e = typesByName_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      dialogs[i] = (ActionDialogPreferenceType)e.nextElement();
-    }
-    return dialogs;
-  }
-
-  public ActionDialogPreferenceType getActionDialogPrefrenceTypeByName (String name)
-  {
-  	return (name == null ? null : (ActionDialogPreferenceType)typesByName_.get(name));
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index fa7bc4aa1..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,219 +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.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-;
-
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
-  /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_PAGE = WebServiceUIPlugin.ID + ".PPAD0001";
-  //
-  private Button showAll;
-  /*CONTEXT_ID PPAD0002 for the  show all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_SHOW_ALL = WebServiceUIPlugin.ID + ".PPAD0002";
-  //
-  private Button hideAll;
-  /*CONTEXT_ID PPAD0003 for the  hide all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_HIDE_ALL = WebServiceUIPlugin.ID + ".PPAD0003";
-
-  private Hashtable checkBoxes_;
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    checkBoxes_ = new Hashtable();
-    addOptionalDialogsCheckBoxes (superparent);
-	new Label(superparent, SWT.HORIZONTAL);
-	
-	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PPAD_PAGE"));
-    helpSystem.setHelp(parent,INFOPOP_PPAD_PAGE);
-	
-    showAll = new Button(parent, SWT.NONE);
-    showAll.setText(getMessage("%BUTTON_SHOW_ALL_DIALOGS"));
-    showAll.addListener(SWT.Selection, this);
-    showAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_SHOW_ALL"));
-    helpSystem.setHelp(showAll,INFOPOP_PPAD_BUTTON_SHOW_ALL);
-   
-    hideAll = new Button(parent, SWT.NONE);
-    hideAll.setText(getMessage("%BUTTON_HIDE_ALL_DIALOGS"));
-    hideAll.addListener ( SWT.Selection, this);
-    hideAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_HIDE_ALL"));
-    helpSystem.setHelp(hideAll,INFOPOP_PPAD_BUTTON_HIDE_ALL);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-    return parent;
-  }
-
-  private String getMessage(String key) 
-  {
-  		return WebServiceUIPlugin.getMessage(key);
-  }
-
- public void handleEvent (Event event) 
- {
-    if (showAll == event.widget)
-		handleShowAllEvent();
-    
-    else if ( hideAll == event.widget)
-    	handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
-    Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( true );
-    	}                      
- }
-
- private void handleHideAllEvent ()
- {
- 	Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( false );
-    	}
- }
- 
- private void addOptionalDialogsCheckBoxes ( Composite parent)
-  {
-    PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-    ActionDialogPreferenceType[] dialogs = context.getDialogs();
-    for (int i = 0; i < dialogs.length; i++) {
-    	Button checkBox = createCheckBox(parent , dialogs[i].getName());
-    	checkBox.setToolTipText(getMessage(dialogs[i].getTooltip()));
-    	PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox,dialogs[i].getInfopop());
-    	checkBoxes_.put(dialogs[i].getId(), checkBox);
-    }
-  }
-  
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * The proxy information is stored in the preference store.
-   */
-  public IPreferenceStore getPreferenceStore()
-  {
-    return WebServiceUIPlugin.getInstance().getPreferenceStore();
-  }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    Enumeration e = checkBoxes_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      Button dialog = (Button) e.nextElement();
-      dialog.setSelection(true);
-    }
-  }
-
-  /**
-   * Initializes states of the controls from the preferences.
-   */
-  private void initializeValues()
-  {
-    PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      Button button = (Button) checkBoxes_.get(id);
-      button.setSelection(context.isActionDialogEnabled(id));
-    }
-  }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
-    }
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
deleted file mode 100644
index cabefe40f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,52 +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.ui.preferences;
-
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
- private ActionDialogPreferenceType [] dialogs_;
-
-public PersistentActionDialogsContext () 
-{
-	super(  WebServiceUIPlugin.getInstance());
-}
-public void load() 
-{
-    ActionDialogPreferenceTypeRegistry reg = ActionDialogPreferenceTypeRegistry.getInstance();
-    dialogs_ = reg.getActionDialogsPrefrences();
-    for (int i = 0; i < dialogs_.length; i++) {
-    	setDefault(dialogs_[i].getId(), true);
-   }
-}
-
-public ActionDialogPreferenceType[] getDialogs()
-{
-  return dialogs_;
-}
-
-public void setActionDialogEnabled ( String id, boolean value)
-{
- 	setValue (id, value);
-}
-
-public boolean isActionDialogEnabled( String id)
-{
-     if (id == null ) 
-     	return true;
-	 return getValueAsBoolean(id);
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
deleted file mode 100644
index c4b0fdcff..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,307 +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.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ProjectTopologyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-  /*CONTEXT_ID PPSD0001 for the Project Topology Preference Page*/
-  private String INFOPOP_PTPP_PAGE = WebServiceUIPlugin.ID + ".PPTP0001";
-
-  private TableViewer clientTypeViewer_;
-  private Button moveUp_;
-  private Button moveDown_;
-  private Vector clientTypes_;
-
-  private Button twoEAR_;
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PTPP_PAGE"));
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PTPP_PAGE);    
-
-    Text clientTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
-    clientTypeLabel.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
-    clientTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL));
-
-    Composite clientTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    clientTypeComposite.setLayout(gl);
-    clientTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-
-    Table table= new Table(clientTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.widthHint = 256;
-    table.setLayoutData(gd);
-    table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
-    clientTypes_ = new Vector();
-    clientTypeViewer_ = new TableViewer(table);
-    clientTypeViewer_.setContentProvider(new ClientTypeContentProvider());
-    clientTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
-    clientTypeViewer_.setInput(clientTypes_);
-
-    TableLayout tableLayout = new TableLayout();
-    TableColumn tableColumn = new TableColumn(table, SWT.NONE);
-    tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE"));
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    table.setLayout(tableLayout);
-
-    Composite c = new Composite(clientTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
-    moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveUp_.addSelectionListener(this);
-    moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
-    moveDown_ = new Button(c, SWT.PUSH);
-    moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
-    twoEAR_ = new Button(parent, SWT.CHECK | SWT.WRAP );
-    twoEAR_.setText(getMessage("%LABEL_ENABLE_TWO_EARS"));
-    twoEAR_.setToolTipText(getMessage("%TOOLTIP_ENABLE_TWO_EARS"));
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-  
-  private String getMessage(String key) 
-  {
-      	return WebServiceUIPlugin.getMessage(key);
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls to their burned-in defaults.
-   */
-  private void initializeDefaults()
-  {
-    clientTypes_.clear();
-    String[] types = ProjectTopologyDefaults.getClientTypes();
-    for (int i = 0; i < types.length; i++)
-      clientTypes_.add(types[i]);
-    clientTypeViewer_.refresh();
-    twoEAR_.setSelection(true);
-  }
-
-  /**
-   * Initializes states of the controls from the preference helper.
-   */
-  private void initializeValues()
-  {
-    ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
-    String[] types = context.getClientTypes();
-    for (int i = 0; i < types.length; i++)
-      clientTypes_.add(types[i]);
-    // check whether we missed any types from the default list
-    boolean missed = false;
-    types = ProjectTopologyDefaults.getClientTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (clientTypes_.indexOf(types[i]) == -1)
-      {
-        clientTypes_.add(types[i]);
-        missed = true;
-      }
-    }
-    if (missed)
-    {
-      types = new String[clientTypes_.size()];
-      clientTypes_.copyInto(types);
-      context.setClientTypes(types);
-    }
-    // refresh viewer
-    clientTypeViewer_.refresh();
-    twoEAR_.setSelection(context.isUseTwoEARs());
-   }
-
-  /**
-   * Stores the values of the controls back to the preference helper.
-   */
-  private void storeValues()
-  {
-    ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
-    String[] types = new String[clientTypes_.size()];
-    clientTypes_.copyInto(types);
-    context.setClientTypes(types);
-    context.setUseTwoEARs(twoEAR_.getSelection());
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    int index = clientTypeViewer_.getTable().getSelectionIndex();
-    if (index != -1)
-    {
-      if (e.widget == moveUp_ && index > 0)
-      {
-        Object object = clientTypes_.remove(index);
-        clientTypes_.insertElementAt(object, index-1);
-        clientTypeViewer_.refresh();
-      }
-      else if (e.widget == moveDown_ && index < clientTypes_.size()-1)
-      {
-        Object object = clientTypes_.remove(index);
-        clientTypes_.insertElementAt(object, index+1);
-        clientTypeViewer_.refresh();
-      }
-    }
-  }
-
-  private class ClientTypeContentProvider implements IStructuredContentProvider
-  {
-    /**
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-     */
-    public Object[] getElements(Object value) 
-    {
-      return ((Vector)value).toArray(new String[0]);
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose() 
-    {
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-     */
-    public void inputChanged(Viewer arg0, Object arg1, Object arg2) 
-    {
-    }
-  }
-
-  private class ClientTypeLabelProvider extends LabelProvider
-  {
-    private IConfigurationElement[] configElements_;
-
-    public ClientTypeLabelProvider()
-    {
-      IExtensionRegistry reg = Platform.getExtensionRegistry();
-      configElements_ = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
-    }
-
-    private IConfigurationElement getElementByAttribute(String name, String value)
-    {
-      for (int i = 0; i < configElements_.length; i++)
-        if (configElements_[i].getAttribute(name).equals(value))
-          return configElements_[i];
-      return null;
-    }
-
-    /**
-    * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-    */
-    public Image getImage(Object arg0) 
-    { 
-      return null;
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-     */
-    public String getText(Object value) 
-    {
-      return getElementByAttribute("id", value.toString()).getAttribute("label"); 
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
deleted file mode 100644
index deb26ba7d..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
+++ /dev/null
@@ -1,156 +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.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceDefaults;
-
-
-
-public class ResourceManagmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
-  /*CONTEXT_ID PPRM0001 for the Resource Managment Preference Page*/
-  private String INFOPOP_PPRM_PAGE = WebServiceUIPlugin.ID + ".PPRM0001";
-  //
-  private Button overWriteFiles;
-  /*CONTEXT_ID PPRM0002 for the file overwrite check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES = WebServiceUIPlugin.ID + ".PPRM0002";
-  //
-  private Button createFolders;
-  /*CONTEXT_ID PPRM0003 for the create folders check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS = WebServiceUIPlugin.ID + ".PPRM0003";
-  //
-  private Button checkoutFiles;
-  /*CONTEXT_ID PPRM0004 for the checkout files check box on the Resource Management Preference Page*/
-  private String INFOPOP_PPRM_CHECKBOX_CHECK_OUT = WebServiceUIPlugin.ID + ".PPRM0004";
-
- /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-  	IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-  	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PPRM_PAGE"));
-    helpSystem.setHelp(parent, INFOPOP_PPRM_PAGE);
-
-    overWriteFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_OVERWRITE_FILES" ));
-    overWriteFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES"));
-    helpSystem.setHelp(overWriteFiles, INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES);
-
-    createFolders  = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CREATE_FOLDERS" ));
-    createFolders.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS"));
-    helpSystem.setHelp(createFolders, INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS);
-
-    checkoutFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CHECKOUT_FILES" ));    
-    checkoutFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CHECK_OUT"));
-    helpSystem.setHelp(checkoutFiles, INFOPOP_PPRM_CHECKBOX_CHECK_OUT);
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
- 
-  private String getMessage(String key) 
-  {
-  		return WebServiceUIPlugin.getMessage(key);
-  }
-
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    overWriteFiles.setSelection( ResourceDefaults.getOverwriteFilesDefault());
-    createFolders.setSelection( ResourceDefaults.getCreateFoldersDefault());
-    checkoutFiles.setSelection( ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues()
-  {
-    // get the persistent context from the plugin
-    ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-    overWriteFiles.setSelection( context.isOverwriteFilesEnabled());
-    createFolders.setSelection( context.isCreateFoldersEnabled());
-    checkoutFiles.setSelection( context.isCheckoutFilesEnabled());    
-   }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    // get the persistent context from the plugin
-    ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
-    context.setOverwriteFilesEnabled( overWriteFiles.getSelection() );
-    context.setCreateFoldersEnabled( createFolders.getSelection() );
-    context.setCheckoutFilesEnabled( checkoutFiles.getSelection() );    
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index d08a8a7a9..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,316 +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.ui.preferences;
-
-import java.util.Vector;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-  
-  private TableViewer webServiceTestTypeViewer_; 
-  private Button moveUp_;
-  private Button moveDown_;
-  private Vector webServiceTestTypes_;
-  
-  /*CONTEXT_ID PPSD0001 for the Scenario Defaults Preference Page*/
-  private String INFOPOP_PPSD_PAGE = WebServiceUIPlugin.ID + ".PPSD0001";
-  //
-  private Button launchSample;
-  /*CONTEXT_ID PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page*/
-  private final String INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE = WebServiceUIPlugin.ID + ".PPSD0002";
-  //
-
-  /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    
-  	Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 1;
-    parent.setLayout( layout );
-    parent.setToolTipText(getMessage("%TOOLTIP_PPSD_PAGE"));
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PPSD_PAGE);    
-
-    launchSample = createCheckBox(parent, getMessage("%BUTTON_LAUNCH_SAMPLE"));
-    launchSample.setToolTipText(getMessage("%TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(launchSample, INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE);
-
-    
-    Text testServiceTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
-    testServiceTypeLabel.setText(getMessage("%LABEL_SAMPLE_TYPES"));
-    testServiceTypeLabel.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
-    Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    webServiceTestTypeComposite.setLayout(gl);
-    webServiceTestTypeComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
-
-    Table table= new Table(webServiceTestTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
-    GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
-    gd.widthHint = 256;
-    table.setLayoutData(gd);
-    table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
-    webServiceTestTypes_ = new Vector();
-    webServiceTestTypeViewer_ = new TableViewer(table);
-    webServiceTestTypeViewer_.setContentProvider(new WebServiceTestTypeContentProvider());
-    webServiceTestTypeViewer_.setLabelProvider(new WebServiceTestTypeLabelProvider());
-    webServiceTestTypeViewer_.setInput(webServiceTestTypes_);
-
-    TableLayout tableLayout = new TableLayout();
-    TableColumn tableColumn = new TableColumn(table, SWT.NONE);
-    tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
-    ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
-    tableLayout.addColumnData(columnData);
-    table.setLayout(tableLayout);
-
-    Composite c = new Composite(webServiceTestTypeComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.numColumns = 1;
-    gl.marginHeight = 10;
-    gl.marginWidth = 0;
-    c.setLayout(gl);
-
-    moveUp_ = new Button(c, SWT.PUSH);
-    moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
-    moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveUp_.addSelectionListener(this);
-    moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
-    moveDown_ = new Button(c, SWT.PUSH);
-    moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
-    moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-    moveDown_.addSelectionListener(this);
-    moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);    
-
-    return parent;
-  }
-
-  private String getMessage(String key) 
-  {
-      	return WebServiceUIPlugin.getMessage(key);
-  }
- 
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    try{
-      storeValues();
-    }catch (Exception exc){
-    	exc.printStackTrace();}
-    return true;
-  }
-
-  protected void performApply()
-  {
-    try{
-  	performOk();
-    }catch(NullPointerException exc){
-      exc.printStackTrace();
-    }
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls to their burned-in defaults.
-   */
-  private void initializeDefaults()
-  {
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
-    
-    webServiceTestTypes_.clear();
-    String[] types = defaults.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-      webServiceTestTypes_.add(types[i]);
-    webServiceTestTypeViewer_.refresh();
-  }
-
-  /**
-   * Initializes states of the controls from the preference helper.
-   */
-  private void initializeValues()
-  {
-  	ScenarioContext  context  = WebServicePlugin.getInstance().getScenarioContext();
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    //pgm launchSample.setSelection( context.isLaunchSampleEnabled());
-        
-    String[] types = context.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-      webServiceTestTypes_.add(types[i]);
-    // check whether we missed any types from the default list
-    boolean missed = false;
-    types = defaults.getWebServiceTestTypes();
-    for (int i = 0; i < types.length; i++)
-    {
-      if (webServiceTestTypes_.indexOf(types[i]) == -1)
-      {
-        webServiceTestTypes_.add(types[i]);
-        missed = true;
-      }
-    }
-    if (missed)
-    {
-      types = new String[webServiceTestTypes_.size()];
-      webServiceTestTypes_.copyInto(types);
-      context.setWebServiceTestTypes(types);
-    }
-    // refresh viewer
-    webServiceTestTypeViewer_.refresh();
-   }
-
-  /**
-   * Stores the values of the controls back to the preference helper.
-   */
-  private void storeValues()
-  {
-    ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-    String[] types = new String[webServiceTestTypes_.size()];
-    webServiceTestTypes_.copyInto(types);
-    context.setWebServiceTestTypes(types);
-    
-    //pgm context.setLaunchSampleEnabled(launchSample.getSelection());
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    int index = webServiceTestTypeViewer_.getTable().getSelectionIndex();
-    if (index != -1)
-    {
-      if (e.widget == moveUp_ && index > 0)
-      {
-        Object object = webServiceTestTypes_.remove(index);
-        webServiceTestTypes_.insertElementAt(object, index-1);
-        webServiceTestTypeViewer_.refresh();
-      }
-      else if (e.widget == moveDown_ && index < webServiceTestTypes_.size()-1)
-      {
-        Object object = webServiceTestTypes_.remove(index);
-        webServiceTestTypes_.insertElementAt(object, index+1);
-        webServiceTestTypeViewer_.refresh();
-      }
-    }
-  }
-
-  private class WebServiceTestTypeContentProvider implements IStructuredContentProvider
-  {
-    /**
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
-     */
-    public Object[] getElements(Object value) 
-    {
-      return ((Vector)value).toArray(new String[0]);
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose() 
-    {
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
-     */
-    public void inputChanged(Viewer arg0, Object arg1, Object arg2) 
-    {
-    }
-  }
-
-  private class WebServiceTestTypeLabelProvider extends LabelProvider
-  {
-    public WebServiceTestTypeLabelProvider()
-    {
-    }
-
-    /**
-    * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
-    */
-    public Image getImage(Object arg0) 
-    { 
-      return null;
-    }
-
-    /**
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
-     */
-    public String getText(Object value) 
-    {
-      //return getElementByAttribute("id", value.toString()).getAttribute("label"); 
-      return value.toString();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
deleted file mode 100644
index e37abc3d3..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,21 +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.ui.uddi;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-public interface PrivateUDDIRegistryType
-{
-    public boolean isPrivateUDDIRegistryInstalled();
-    public String[] getPrivateUDDIRegistryInquiryAPI();
-    public String[] getPrivateUDDIRegistryPublishAPI();
-    public CommandWidgetBinding getBinding();
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
deleted file mode 100644
index 76e4e9aca..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
+++ /dev/null
@@ -1,143 +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.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_VENDOR=International Business Machines Corp.
-PLUGIN_DESC=\
-The Web services GUI plugin delivers the graphical \
-user interface to the Web services function of the \
-Web services plugin.
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-#	Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-PREFERENCE_CATEGORY_CODE_GENERATION=Code Generation
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_DRIVER_JARS=JDBC drivers
-
-
-#
-#Scenario Defaults
-BUTTON_LAUNCH_SAMPLE=Launch the sample when generated
-LABEL_UDDI_CAT_DATA_COLUMN_DELIM=User defined UDDI Category data column delimiter:
-LABEL_UDDI_CAT_DATA_STRING_DELIM=User defined UDDI Category data string delimiter:
-MSG_ERROR_COLUMN_STRING_DELIMS_IDENTICAL=IWAB0481E UDDI column and string delimiters must not be identical.
-LABEL_MOVE_UP=Move up
-LABEL_MOVE_DOWN=Move down
-
-#
-# Preferences Tooltips
-#
-
-#Scenario Defaults
-TOOLTIP_PPSD_PAGE=Set the defaults for the Web service scenarios.
-TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE=Launch the sample application after generation.
-TOOLTIP_PPSD_COMBO_SAMPLE_GEN=Select the type of sample JSP to be generated.
-TOOLTIP_PPSD_COMBO_EXPLORER=Select the type of the Web services explorer to be used.
-TOOLTIP_PPSD_UDDI_CAT_DATA_COLUMN_DELIM=column delimiter for user defined UDDI category data
-TOOLTIP_PPSD_UDDI_CAT_DATA_STRING_DELIM=string delimiter for user defined UDDI category data
-TOOLTIP_CLIENT_TYPE_TABLE_VIEWER=Preferred order of the list of client types
-TOOLTIP_MOVE_UP=Move the selected client type up the list
-TOOLTIP_MOVE_DOWN=Move the selected client type down the list
-
-#
-# Resource Managment
-TOOLTIP_PPRM_PAGE=Set preferences that control resources used/generated by the Web service.
-TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES=Overwrite files without warning.
-TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS=Create folders when necessary.
-TOOLTIP_PPRM_CHECKBOX_CHECK_OUT=Check out files without warning.
-BUTTON_CREATE_FOLDERS=Create folders when necessary
-BUTTON_OVERWRITE_FILES=Overwrite files without warning
-BUTTON_CHECKOUT_FILES=Check out files without warning
-
-#
-# General messages.
-#
-ISTATUS_WITHOUT_EXCEPTION={0}
-ISTATUS_WITH_EXCEPTION={0}\nException: {1}
-MSG_INFO_SAVED_STATUS=IWAB0297I Press the Details button to see informational messages.
-
-#
-# TypeSelectionDialog
-#
-DIALOG_TITLE_CLASS_BROWSE=Browse Classes
-DIALOG_TITLE_INTERFACE_BROWSE=Browse Interfaces
-
-#
-# Common wizard strings.
-#
-LABEL_WSEXPLORER_TYPES=Web Services Explorer
-LABEL_SAMPLE_TYPES=Java proxy sample
-
-#
-# ResourceSelectionDialog
-#
-DIALOG_TITLE_RESOURCE_BROWSE=Browse Files
-LABEL_RESOURCE_FILTER=Filter:
-
-#
-# Tooltips for dialog.ResourceSelectionDialog
-# DRES=Dialog/RESources
-#
-TOOLTIP_DRES_COMBO_RESOURCE_TYPE=Type of resources to browse.
-TOOLTIP_DRES_TREE_RESOURCE=Resources available for selection.
-
-
-
-#
-# HTTP Basic Authentication
-#
-PREFERENCE_CATEGORY_HTTP_BASIC_AUTH=HTTP Basic Auth
-CHECKBOX_PREFERENCE_ENABLE_HTTP_BASIC_AUTH=Enable HTTP basic authentication
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_USERNAME=HTTP basic auth user name:
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_PASSWORD=HTTP basic auth password:
-
-TOOLTIP_ENABLE_HTTP_BASIC_AUTH=Specify HTTP basic authentication setting for Web services toolings.
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=User name for HTTP basic authentication.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Password for HTTP basic authentication.
-
-
-#
-# Messages for project topology preference page
-#
-TOOLTIP_PTPP_PAGE=Preference that control the project topology of your Web service and client scenarios.
-TOOLTIP_ENABLE_TWO_EARS=Enable this option if you want to generate your Web service and Web service client in different EAR projects.
-
-LABEL_ENABLE_TWO_EARS=Generate Web service and Web service client in different EAR projects
-LABEL_CLIENT_TYPE_NAME=Client type:
-
-
-#
-#	ActionDialogs Page
-#
-PREFERENCE_CATEGORY_DIALOGS=Dialogs
-
-#
-# Resource Browser
-#
-DIALOG_TITLE_RESOURCE_BROWSER=Resource browser
-TOOLTIP_RESOURCE_TREE=Choose a resource.
-
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.jst.ws/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws/.cvsignore b/bundles/org.eclipse.jst.ws/.cvsignore
deleted file mode 100644
index 3c261aa37..000000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
-@dot
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index b3091849c..000000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.ws</name>
-	<comment></comment>
-	<projects>
-		<project>org.eclipse.wst.command.env</project>
-		<project>org.eclipse.wst.command.env.core</project>
-		<project>org.eclipse.wst.wsdl</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/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
deleted file mode 100644
index e17f8edca..000000000
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws,
- org.eclipse.jst.ws.internal.command,
- org.eclipse.jst.ws.internal.common,
- org.eclipse.jst.ws.internal.context,
- org.eclipse.jst.ws.internal.data,
- org.eclipse.jst.ws.internal.dialog,
- org.eclipse.jst.ws.internal.ext,
- org.eclipse.jst.ws.internal.ext.test,
- org.eclipse.jst.ws.internal.plugin
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.jem,
- org.eclipse.jdt.core,
- org.eclipse.emf.common,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.debug.core,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.web,
- org.eclipse.wst.common.modulecore,
- org.uddi4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem.util,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws/about.html b/bundles/org.eclipse.jst.ws/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.jst.ws/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index cbb23103c..000000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-src.includes = component.xml
-bin.includes = plugin.properties,\
-               plugin.xml,\
-               .,\
-               META-INF/,\
-               about.html
-source.. = src/
diff --git a/bundles/org.eclipse.jst.ws/component.xml b/bundles/org.eclipse.jst.ws/component.xml
deleted file mode 100644
index a90bf17d8..000000000
--- a/bundles/org.eclipse.jst.ws/component.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.ws">
-   <component-depends unrestricted="true">
-   </component-depends>
-   <plugin id="org.eclipse.jst.ws" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.axis.consumption.core" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.axis.consumption.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.axis.creation.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.consumption" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.consumption.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.creation.ejb.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.creation.ui" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.uddiregistry" fragment="false"/>
-   <plugin id="org.eclipse.jst.ws.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.jst.ws/plugin.properties b/bundles/org.eclipse.jst.ws/plugin.properties
deleted file mode 100644
index 505a8be08..000000000
--- a/bundles/org.eclipse.jst.ws/plugin.properties
+++ /dev/null
@@ -1,16 +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
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
deleted file mode 100644
index c0454d107..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /dev/null
@@ -1,61 +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.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A NullStatusRenderer throws away IStatus information.
-*/
-public class NullStatusMonitor implements StatusMonitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  protected boolean result;
-
-  /**
-  * Default constructor.
-  */
-  public NullStatusMonitor ()  {}
-  /**
-  * Does nothing.
-  */
-  public int reportStatus(IStatus status, Vector options) { return 0; }
-  public boolean reportStatus(IStatus status) 
-  { 
-    switch (status.getSeverity())
-    {
-      case IStatus.ERROR:
-      case IStatus.WARNING:
-      		result = false;
-      		break;
-	  case IStatus.INFO:
-      default: //IStatus.OK
-      		result = true; 
-      		break;
-     }
- 	return result;
-  }
-  public void dumpSavedStatus() { }
-  public boolean canContinue() 
-  { 
-	return result;
-  }
-
-  public void reset () {
-  		result = true;
-  	}
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
deleted file mode 100644
index de0758f77..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
+++ /dev/null
@@ -1,37 +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.command;
-
-import java.util.Vector;
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusMonitor reports IStatus information to a display system.
-*/
-public interface StatusMonitor
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * reports the contents of the given status object.
-  * Subclasses must implement this method to report
-  * IStatus information to a given display system,
-  * such as SWT, the command line, or a trace file.
-  */
-  public int reportStatus(IStatus status, Vector options);
-  public boolean reportStatus(IStatus status);
-  public void dumpSavedStatus();
-  public boolean canContinue();
-  public void reset();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
deleted file mode 100644
index 0cff3a6b8..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
+++ /dev/null
@@ -1,32 +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.command;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusRenderer renders IStatus information to a display system.
-*/
-public interface StatusRenderer
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Renders the contents of the given status object.
-  * Subclasses must implement this method to render
-  * IStatus information to a given display system,
-  * such as SWT, the command line, or a trace file.
-  */
-  public void render ( IStatus status );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
deleted file mode 100644
index ba00a104c..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
+++ /dev/null
@@ -1,85 +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.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts all objects,
-* and is a suitable base class for new <code>Filters</code>.
-*/
-public class AnyFilter implements Filter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Constructs a new <code>AnyFilter</code>.
-  */
-  public AnyFilter ()
-  {
-  }
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ()
-  {
-    return WebServicePlugin.getMessage("%ANY_FILTER_NAME");
-  }
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ()
-  {
-    return WebServicePlugin.getMessage("%ANY_FILTER_DESC");
-  }
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * See {@link Filter#statusOf} for general comments.
-  * The default implementation of <code>AnyFilter</code>
-  * returns a status with severity <code>IStatus.OK</code>.
-  * Subclasses may override.
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}.
-  */
-  public IStatus statusOf ( Object object )
-  {
-    return new Status(IStatus.OK,WebServicePlugin.ID,0,"",null);
-  }
-
-  /**
-  * Returns true if and only if {@link #statusOf} returns
-  * an {@link org.eclipse.core.runtime.IStatus} with a
-  * severity of less than <code>IStatus.ERROR</code>.
-  * Subclasses may override to provide a higher-performance
-  * implementation.
-  * @param object The object to filter.
-  * @return True if and only if {@link #statusOf} returns
-  * an {@link org.eclipse.core.runtime.IStatus} with a
-  * severity of less than <code>IStatus.ERROR</code>.
-  */
-  public boolean accepts ( Object object )
-  {
-    return !statusOf(object).matches(IStatus.ERROR);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
deleted file mode 100644
index 91f0bf8a7..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
+++ /dev/null
@@ -1,89 +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.common;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface Filter
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * Returns the locale-specific name of this filter.
-  * @return The locale-specific name of this filter.
-  */
-  public String getName ();
-
-  /**
-  * Returns the locale-specific description of this filter.
-  * @return The locale-specific description of this filter.
-  */
-  public String getDescription ();
-
-  /**
-  * Returns an {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  * The severity of the
-  * returned <code>IStatus</code> is as follows:
-  * <ul>
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#OK}
-  * if the <code>Filter</code> accepts the <code>object</code>
-  * with no further information for the caller (meaning the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods
-  * are ignored).
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#INFO}
-  * if the <code>Filter</code> accepts the <code>object</code>
-  * Additional information may be available from the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods.
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#WARNING}
-  * if the <code>Filter</code> accepts the <code>object</code>.
-  * Additional information may be available from the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods.
-  * <li>
-  * {@link org.eclipse.core.runtime.IStatus#ERROR}
-  * if the <code>Filter</code> does not accept the <code>object</code>.
-  * Additional information may be available from the
-  * {@link org.eclipse.core.runtime.IStatus#getMessage} and
-  * {@link org.eclipse.core.runtime.IStatus#getException} methods.
-  * </ul>
-  * @param object The object to filter.
-  * @return An {@link org.eclipse.core.runtime.IStatus}
-  * describing the <code>Filter</code>'s assessment of
-  * the given <code>object</code>.
-  */
-  public IStatus statusOf ( Object object );
-
-  /**
-  * Returns true if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>. This method
-  * must return true if and only if {@link #statusOf}
-  * returns an <code>IStatus</code> with a severity of
-  * less than <code>IStatus.ERROR</code>.
-  * @param object The object to filter.
-  * @return True if and only if this <code>Filter</code>
-  * accepts the given <code>object</code>.
-  */
-  public boolean accepts ( Object object );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
deleted file mode 100644
index 2804c0d7f..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
+++ /dev/null
@@ -1,28 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-
-/**
- * Transfroms a org.eclipse.core.runtime.IProject to java.lang.String
- */
-public class IProjectToStringTransformer implements Transformer {
-	
-	  public Object transform(Object value)
-	  {
-	  	IProject project = (IProject)value;
-	    return project.getName();
-	  }	
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
deleted file mode 100644
index 63b9f9ab5..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
+++ /dev/null
@@ -1,98 +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
- *******************************************************************************/
-/*
- * Created on May 8, 2004
- */
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-
-/**
- * @author gilberta
- */
-public class J2EEActionAdapterFactory {
-	
- 	
-  public static String getWSDLURI(ServiceImpl serviceImpl)
-  {
-  	Definition definition = serviceImpl.getEnclosingDefinition();
-  	String location = definition.getLocation();
-  	
-  	return location;
-  }
-   
-  //has to be under the webcontent
-  public static String WEB_CONTENT = "WebContent";
-  public static String getWSDLURI(ServiceRef serviceImpl)
-  {
-  	IProject project = ProjectUtilities.getProject(serviceImpl);
-  	IPath path = project.getLocation().addTrailingSeparator();
-  	path = path.append(WEB_CONTENT).addTrailingSeparator();
-  	path = path.append(serviceImpl.getWsdlFile());
-  	File file = new File(path.toString());
-  	try{
-  	  URL url = file.toURL();
-  	  return url.toString();
-  	}catch(MalformedURLException e){return null;}
-  	
- }
-  
-  public static String getWSDLURI(WSDLResourceImpl wsdlRI)
-  {
-  	Definition definition = wsdlRI.getDefinition();
-  	String location = definition.getLocation();
-  	
-  	return location;
-  }
-  
-  public static String getWSILPath(WSDLResourceImpl wsdlRI)
-  {
-  	return convertToRelative(getWSDLURI(wsdlRI));
-  }
-  
-  public static String getWSILPath(ServiceRef serviceImpl)
-  {
-  	return convertToRelative(getWSDLURI(serviceImpl));
-  }
-  
-  public static String getWSILPath(ServiceImpl serviceImpl)
-  {
-  	return convertToRelative(getWSDLURI(serviceImpl));
-  }
-  
-  public static String FILE="file:/";
-  public static String FILEL="file:"; 
-  public static String convertToRelative(String uri)
-  {
-  	//remove file:
-  	String root = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
-    root = FILE + root;
-  	String rootL = FILEL + root;
-    if(uri.startsWith(root) || uri.startsWith(rootL)){
-      return uri.substring(root.length());  	
-    }
-    return uri;
-  }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
deleted file mode 100644
index e1fd2ecdf..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-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.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.common.componentcore.util.ComponentUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- * This class contains some useful J2EE utilities for Web services internal use.
- */
-public final class J2EEUtils {
-	
-	public final static int WEB = 1;
-	public final static int EJB = 2;
-	public final static int APPCLIENT = 4;
-	public final static int EAR = 8;	
-	
-	/**
-	 * Returns an IVirtualComponent
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IVirtualComponent getVirtualComponent(IProject project, String componentName){
-		return ComponentCore.createComponent(project, componentName);
-	}
-	
-	/**
-	 * 
-	 * @param projectName
-	 * @param componentName
-	 * @return
-	 */
-	public static IVirtualComponent getVirtualComponent(String projectName, String componentName){
-		IProject project = null;
-		if (projectName!=null && projectName.length() > 0 )
-      project = ProjectUtilities.getProject(projectName);
-		
-		return ComponentCore.createComponent(project, componentName);
-	}
-	
-
-	/**
-	 * Returns the J2EE version
-	 * @param p project
-	 * @param component name
-	 * @return int
-	 */
-	public static int getJ2EEVersion(IProject p, String componentName){
-		int j2eeVer = -1;
-		try {
-          IVirtualComponent vc = ComponentCore.createComponent(p, componentName);
-          if (vc!=null){
-            j2eeVer = getJ2EEVersion(vc);
-          }
-		}
-		catch (Exception e){
-			//handle exception
-		}
-
-		return j2eeVer;	
-	}
-	
-	public static int getJ2EEVersion(IVirtualComponent ch){
-      int j2eeVer = -1;
-      //check type
-      if (ch!=null) {
-        if (isWebComponent(ch))
-          j2eeVer = getWebComponentJ2EEVersion(ch);
-        else if (isAppClientComponent(ch))
-          j2eeVer = getAppClientComponentJ2EEVersion(ch);
-        else if (isEJBComponent(ch))
-          j2eeVer = getEJBComponentJ2EEVersion(ch);
-        else if (isEARComponent(ch))
-          j2eeVer = getEARComponentJ2EEVersion(ch);
-        
-      }
-      return j2eeVer; 
-	}
-	
-	/**
-	 * Return's the EAR module's J2EEVersion
-	 * @param wbc
-	 * @return
-	 */
-	private static int getEARComponentJ2EEVersion(IVirtualComponent ch){
-		EARArtifactEdit edit = null;
-		int nVersion = 12;
-		try {
-			edit = EARArtifactEdit.getEARArtifactEditForRead(ch);
-			if (edit != null) {
-				nVersion = edit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return nVersion;		
-	}
-	
-	/**
-	 * Returns the J2EEVersion
-	 * @param p IProject
-	 * @param compName
-	 * @return String
-	 */
-	public static String getJ2EEVersionAsString(IProject p, String compName){
-		int j2eeVer = getJ2EEVersion(p, compName);
-		if (j2eeVer!=-1){
-			return J2EEVersionUtil.getJ2EETextVersion(j2eeVer);
-		}
-		else 
-			return null;
-	}
-	
-	/**
-	 * Returns the Web Module's J2EE version
-	 * @param wbModule
-	 * @return the J2EE version id
-	 */
-	private static int getWebComponentJ2EEVersion(IVirtualComponent ch) {
-		WebArtifactEdit webEdit = null;
-		int nVersion = 12;
-		try {
-          webEdit = WebArtifactEdit.getWebArtifactEditForRead(ch);
-          if (webEdit != null) {
-			nVersion = webEdit.getJ2EEVersion();
-          }
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (webEdit != null)
-				webEdit.dispose();
-		}
-		return nVersion;
-	}
-
-	/**
-	 * Returns Application client's J2EE version
-	 * @param wbc
-	 * @return
-	 */
-	private static int getAppClientComponentJ2EEVersion(IVirtualComponent ch){
-		AppClientArtifactEdit edit = null;
-		int nVersion = 12;
-		try {
-      edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(ch);
-			if (edit != null) {
-				nVersion = edit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return nVersion;		
-	}
-	
-	/**
-	 * Returns EJB component's J2EE version
-	 * @param wbc
-	 * @return
-	 */
-	private static int getEJBComponentJ2EEVersion(IVirtualComponent ch){
-		EJBArtifactEdit edit = null;
-		int nVersion = 12;
-		try {
-      edit = EJBArtifactEdit.getEJBArtifactEditForRead(ch);
-			if (edit != null) {
-				nVersion = edit.getJ2EEVersion();
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			if (edit != null)
-				edit.dispose();
-		}
-		return nVersion;			
-	}	
-	
-	public static IVirtualComponent[] getAllComponents(){
-		List v = new ArrayList();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-          IVirtualComponent vc = ComponentCore.createComponent(projects[i]);
-          if(vc != null)
-        	  v.add(vc);
-          }
-
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	/**
-	 * Returns all the EAR components in the workspace
-	 * @return IVirtualComponent[]; empty if none
-	 */
-	public static IVirtualComponent[] getAllEARComponents() {
-		List v = new ArrayList();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-				IVirtualComponent[] components = getEARComponentsFromProject(projects[i]);
-				for (int j=0; j<components.length; j++) {
-					if (components[j]!=null)
-						v.add(components[j]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	public static IVirtualComponent[] getAllWebComponents(){
-		List v = new ArrayList();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-				IVirtualComponent[] components = getWebComponents(projects[i]);
-				for (int j=0; j<components.length; j++) {
-					if (components[j]!=null)
-						v.add(components[j]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);		
-	}
-	
-	/**
-	 * Returns the EAR components in a given IProject
-	 * @param project
-	 * @return empty if no EAR components; must not return null
-	 */
-	public static IVirtualComponent[] getEARComponentsFromProject(IProject project){
-		//get all components in the project
-		List v = new ArrayList();		
-		try {
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			if (component != null && isEARComponent(component)){
-				v.add(component);
-			}
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	/**
-	 * Returns Web components in a project
-	 * @param project
-	 * @return empty array if no web components; must not return null
-	 */
-	public static IVirtualComponent[] getWebComponents(IProject project){
-		
-		//get all components in the project
-		List v = new ArrayList();
-		try {
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			
-				if (component != null && isWebComponent(component)){
-					v.add(component);
-				}		
-
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	} 
-	
-	public static String[] getWebComponentNames(IProject project){
-		IVirtualComponent[] vcs = getWebComponents(project);
-		return toComponentNamesArray(vcs);
-	}
-	
-	public static String[] getEARComponentNames(IProject project){
-		IVirtualComponent[] vcs = getEARComponentsFromProject(project);
-		return toComponentNamesArray(vcs);
-	}
-	
-	/**
-	 * Returns all components of type, componentType in the project.
-	 * @param project
-	 * @param componentType i.e. J2EEUtils.WEB
-	 * @return
-	 */
-	public static IVirtualComponent[] getComponentsByType(IProject project, int componentType){
-		
-		List v = new ArrayList();
-		if ( (WEB & componentType)==WEB ){
-			IVirtualComponent[] webVC = getWebComponents(project);
-			addToArrayListHelper(webVC, v);
-		}
-		if ( (EJB & componentType)==EJB ){
-			IVirtualComponent[] ejbVC = getEJBComponents(project);
-			addToArrayListHelper(ejbVC, v);
-		}
-		if ( (APPCLIENT & componentType)==APPCLIENT ) {
-			IVirtualComponent[] appClientVC = getAppClientComponents(project);
-			addToArrayListHelper(appClientVC, v);
-		}
-		if ( (EAR & componentType)==EAR ) {
-			IVirtualComponent[] earVC = getEARComponentsFromProject(project);
-			addToArrayListHelper(earVC, v);
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);		
-	}
-	
-	/**
-	 * Returns all components of type, componentType in the project.
-	 * @param project
-	 * @param componentTypeId as defined in IModuleConstants.
-	 * @return
-	 */
-	public static IVirtualComponent[] getComponentsByType(IProject project, String componentTypeId){
-		
-		//get all components in the project of type componentTypeId
-		List v = new ArrayList();
-		try {
-
-			IVirtualComponent vc = ComponentCore.createComponent(project);	
-			if ( vc != null && vc.getComponentTypeId().equals(componentTypeId))
-			{
-				v.add(vc);
-			}
-			//if (isWebComponent(project, components[i].getName())){
-				//v.add(components[i]);
-			//}		
-
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	}
-	
-	public static String[] getProjectsContainingComponentOfType(String componentTypeId)
-	{
-	    Vector v = new Vector(); 
-	    IVirtualComponent[] comps = getAllComponents();
-	    for (int i = 0; i < comps.length; i++) {
-			if (comps[i].getComponentTypeId().equals(componentTypeId))
-			{
-				//Add the project name to the vector if it has not been added already
-				String name = comps[i].getProject().getName();
-				if (!v.contains(name))
-				{
-					v.add(name);	
-				}		        			
-			}
-
-        }
-
-        return (String[])v.toArray(new String[0]);
-	}
-   
-	/**
-	 * Helper method for getComponentsByType
-	 * @param vcs
-	 * @param vect
-	 */
-	private static void addToArrayListHelper(IVirtualComponent[] vcs, List al){
-		for (int i=0;i<vcs.length;i++){
-			al.add(vcs[i]);
-		}		
-	}
-
-	
-	/**
-	 * Essentially, returns all projects in the workspace
-	 * @return
-	 */
-	public static IProject[] getAllFlexibleProjects(){
-
-		List v = new ArrayList();
-		try {
-			IProject[] projects = ProjectUtilities.getAllProjects();
-			for(int i=0; i<projects.length;i++) {
-				if (ModuleCoreNature.getModuleCoreNature(projects[i])!=null){
-					v.add(projects[i]);
-				}
-			}
-		}
-		catch(Exception e){
-		}
-
-		return (IProject[])v.toArray(new IProject[0]);
-	}
-	
-	
-	/**
-	 * True if there exists a underlying resource backing up the component and project 
-	 * @param projectName
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean exists(String projectName, String componentName){
-		IProject project = null;
-		if (projectName!=null && projectName.length() > 0 ) {
-		  project = ProjectUtilities.getProject(projectName);
-        }
-        else
-          return false;
-		
-		return exists(project, componentName);
-	}
-	
-	/**
-	 * True if there exists a underlying resource backing up the component and project
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean exists(IProject project, String componentName){
-		if (project!=null && componentName!=null &&	componentName.length() > 0) {
-            if (!project.exists())
-              return false;
-            
-			IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-			return vc.exists();
-		}
-		else 
-			return false;
-		
-	}	
-
-	/**
-	 * Returns an array of EAR components which are referenced by the component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingEARComponents(IProject project, String componentName){
-		List ears = new ArrayList();
-		try{
-			IVirtualComponent targetVC = ComponentCore.createComponent(project, componentName);
-			
-			IVirtualComponent[] earVC = getAllEARComponents();
-			for (int i=0; i<earVC.length;i++) {
-				IVirtualReference[] refs = earVC[i].getReferences();
-				for (int k=0;k<refs.length;k++) {
-					if (targetVC.equals(refs[k].getReferencedComponent())){
-						ears.add(refs[k].getEnclosingComponent());
-					}
-				}
-			}
-
-		}
-		catch (Exception e){
-		}
-
-		return (IVirtualComponent[])ears.toArray(new IVirtualComponent[0]);
-	}
-	
-	
-	/**
-	 * Returns the EJB Components referenced by the ear
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project, String earComponentName){
-
-		List ejbComps = new ArrayList();
-		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
-			IVirtualReference[] refs = vc.getReferences();
-			for (int i=0;i<refs.length;i++){
-				if (isEJBComponent(refs[i].getReferencedComponent())){
-					ejbComps.add(refs[i].getReferencedComponent());
-				}
-			}
-		}
-		catch(Exception e){
-		}
-		
-		return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);		
-	}
-
-	
-	/**
-	 * 
-	 * @param jar
-	 * @return  Vector of bean String names.
-	 */
-	public static Vector getBeanNames(EJBJar jar) {
-		// We currently only support Stateless session beans.
-		// List cmpBeans = jar.getBeanManagedBeans();
-		// List bmpBeans = jar.getContainerManagedBeans();
-		List sessionBeans = jar.getSessionBeans();
-
-		Vector names = new Vector();
-
-		// getBeanNames( names, cmpBeans );
-		// getBeanNames( names, bmpBeans );
-		getBeanNames(names, sessionBeans);
-
-		return names;
-	}
-
-	/**
-	 * @param names
-	 *            specifies that vector of strings that will be used to add bean
-	 *            names to.
-	 * @param beans
-	 *            specifies a list of beans.
-	 */
-	private static void getBeanNames(Vector names, List beans) {
-		Iterator iterator = beans.iterator();
-
-		while (iterator.hasNext()) {
-			EnterpriseBean bean = (EnterpriseBean) (iterator.next());
-
-			if (bean.isSession()) {
-				Session sessionBean = (Session) bean;
-
-				if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
-					names.add(bean.getName());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Uses jem ProjectUtilities to get the project
-	 * @param ejb eObject
-	 * @return IProject
-	 */
-	public static IProject getProjectFromEJB(EnterpriseBean ejb) {
-		return ProjectUtilities.getProject(ejb);
-	}
-
-	/**
-	 * Returns a default J2EE 1.3 EAR component in the workspace
-	 * @return EAR component name
-	 */
-	public static IVirtualComponent getDefault13EARComponent(){
-		IVirtualComponent[] allEARComponents = getAllEARComponents();
-		for (int j=0;j<allEARComponents.length;j++){
-			int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
-			if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
-				 return allEARComponents[j];
-		 }	
-		return null;
-	}
-	
-	/**
-	 * Returns a default J2EE 1.4 EAR component in the workspace
-	 * @return EAR component name
-	 */
-	public static IVirtualComponent getDefault14EARComponent(){
-		IVirtualComponent[] allEARComponents = getAllEARComponents();
-		for (int j=0;j<allEARComponents.length;j++){
-			int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
-			if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID)
-				 return allEARComponents[j];
-		 }	
-		return null;
-	}
-	
-	/**
-	 * Returns the first EAR component of the J2EE version
-	 * @param versionId
-	 * @return
-	 */
-	public static IVirtualComponent getEARComponentofJ2EEVersion(int versionId){
-		IVirtualComponent[] components = getAllEARComponents();
-		for (int i=0; i<components.length; i++){
-			if (getJ2EEVersion(components[i]) == versionId)
-				return components[i];
-		}
-		return null;
-	}
-	
-
-	/**
-	 * 
-	 * @param j2eeVersionInt
-	 * @return
-	 */
-	public static String getLabelFromJ2EEVersion(String j2eeVersionInt) {
-		if (j2eeVersionInt == null || j2eeVersionInt.length() == 0)
-			return "";
-
-		int j2eeVersion = Integer.parseInt(j2eeVersionInt);
-		switch (j2eeVersion) {
-			case J2EEVersionConstants.J2EE_1_2_ID :
-				return J2EEVersionConstants.VERSION_1_2_TEXT;
-			case J2EEVersionConstants.J2EE_1_3_ID :
-				return J2EEVersionConstants.VERSION_1_3_TEXT;
-			case J2EEVersionConstants.J2EE_1_4_ID :
-				return J2EEVersionConstants.VERSION_1_4_TEXT;
-			default :
-				return "";
-		}
-	}
-
-	public static String getJ2EEVersionFromLabel(String j2eeLabel) {
-		String j2ee12String = String.valueOf(J2EEVersionConstants.J2EE_1_2_ID);
-		String j2ee13String = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
-		String j2ee14String = String.valueOf(J2EEVersionConstants.J2EE_1_4_ID);
-		if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			return j2ee12String;
-
-		if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			return j2ee13String;
-
-		if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			return j2ee14String;
-
-		return "";
-
-	}
-	
-	/**
-	 * Returns String representations of J2EE versions
-	 * @param aVersion
-	 * @return
-	 */
-	public static String getJ2EEIntVersionAsString(String aVersion) {
-		if (aVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
-			return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
-		if (aVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
-			return new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString();
-		if (aVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
-			return new Integer(J2EEVersionConstants.J2EE_1_2_ID).toString();		
-		// default
-		return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
-	}	
-
-	// ----------------------------------------------------------------------
-
-
-
-	/**
-	 * 
-	 * @return
-	 * 
-	 * @deprecated  // use getALLEARComponents
-	 */
-	public static IProject[] getEARProjects() {
-		Vector v = new Vector();
-		IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
-		for (int i = 0; i < projects.length; i++) {
-			try {
-//				if (projects[i].hasNature(IEARNatureConstants.NATURE_ID)) {
-				if (ResourceUtils.isEARProject(projects[i])) {
-					v.add(projects[i]);
-				}
-			} catch (Exception e) {
-				e.printStackTrace();
-				//handle exception
-			}
-
-		}
-
-		return (IProject[])v.toArray(new IProject[0]);
-	}
-	
-	
-	/**
-	 * Returns the first EAR project associated with the project and server
-	 * @param serviceProject
-	 * @param server
-	 * @return
-	 * 
-	 * @deprecated  // to be simplified
-	 */
-	public static IProject getDefaultEARProject(IProject serviceProject, IServer server) {
-
-		IProject[] earProjects = null;
-		IProject ear = null;
-
-		if (serviceProject != null && serviceProject.exists()) {
-			try {
-
-				boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
-						||  ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
-						||  ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
-				if (!isWebEJBOrAppClient) {
-					return null;
-				}
-
-				IProject[] ears = getEARProjects();
-
-				// separate EARs which are already deployed to the existing
-				// server
-				if (ears != null && ears.length >= 1) {
-					ArrayList preferredEARList = new ArrayList();
-					ArrayList secondaryEARList = new ArrayList();
-					for (int i = 0; i < ears.length; i++) {
-						ear = ears[i];
-						IModule module = ResourceUtils.getModule(ear);
-						if (module != null) {
-							if (server != null
-									|| ServerUtil.containsModule(server,
-											module, new NullProgressMonitor())) {
-								preferredEARList.add(ear);
-							} else {
-								secondaryEARList.add(ear);
-							}
-						}
-					}
-					// add secondaryEARList items to end of primary list
-					for (int j = 0; j < secondaryEARList.size(); j++) {
-						preferredEARList.add(secondaryEARList.get(j));
-					}
-					// toArray
-					if (preferredEARList != null) {
-						earProjects = (IProject[]) preferredEARList.toArray(new IProject[0]);
-					}
-				}
-			} catch (Exception ce) {
-				Log log = EnvironmentService.getEclipseLog();
-				log.log(Log.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
-			}
-		}
-		return earProjects[0];
-	}
-
-	/**
-	 * Gets the EJB Components in the project
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getEJBComponents(IProject project){
-		
-		//get all components in the project
-		List v = new ArrayList();
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		try {
-			if (component != null && isEJBComponent(component)){
-				v.add(component);
-			}	
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	} 
-	
-	/**
-	 * Gets the Application Client components in a project.
-	 * @param project
-	 * @return
-	 */
-	public static IVirtualComponent[] getAppClientComponents(IProject project){
-		
-		//get all components in the project
-		List v = new ArrayList();
-		try {
-			IVirtualComponent component = ComponentCore.createComponent(project);
-			
-				if (component != null && isAppClientComponent(component)){
-					v.add(component);
-				}	
-		}
-		catch (Exception e){
-			//handle exception
-		}
-		
-		return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
-	} 	
-	
-	/**
-	 * 
-	 * @param project
-	 * @param earComponentName
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project, String earComponentName){
-		 
-		List ejbComps = new ArrayList();
-		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
-			IVirtualReference[] refs = vc.getReferences();
-			for (int i=0; i<refs.length;i++) {
-				if (isEJB20Component(refs[i].getReferencedComponent()))
-					ejbComps.add(refs[i].getReferencedComponent());
-			}
-		}
-		catch (Exception e){
-		}
-		
-		return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);		
-	}
-	
-	
-	/**
-	 * Utility method to combine two IProject[]
-	 * @param projectArray1
-	 * @param projectArray2
-	 * @return
-	 */
-	public static IProject[] combineProjectArrays(IProject[] projectArray1,
-			IProject[] projectArray2) {
-
-		// check if either or both arrays are null.
-		if (projectArray1 == null && projectArray2 == null)
-			return null;
-		else if (projectArray1 != null && projectArray2 == null)
-			return projectArray1;
-		else if (projectArray1 == null && projectArray2 != null)
-			return projectArray2;
-
-		IProject[] combinedProjects = new IProject[projectArray1.length
-				+ projectArray2.length];
-
-		System.arraycopy(projectArray1, 0, combinedProjects, 0,
-				projectArray1.length);
-		if (projectArray2.length > 0) {
-			System.arraycopy(projectArray2, 0, combinedProjects,
-					projectArray1.length, projectArray2.length);
-		}
-
-		return combinedProjects;
-	}
-
-	/**
-	 * 
-	 * @param earComponents
-	 * @return
-	 */
-	public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project, String earComponentName){
-		List webComps = new ArrayList();
-		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
-			IVirtualReference[] refs = vc.getReferences();
-			for (int i=0; i<refs.length;i++) {
-				if (isWebComponent(refs[i].getReferencedComponent()))
-					webComps.add(refs[i].getReferencedComponent());
-			}			
-		}
-		catch(Exception e){
-		}
-		
-		return (IVirtualComponent[])webComps.toArray(new IVirtualComponent[0]);	
-	}
-	
-
-	
-	/**
-	 * 
-	 * @param ejbComponent
-	 * @return
-	 */
-	public static boolean isEJB20Component(IVirtualComponent ejbComponent){
-		return isEJB20Component(ejbComponent.getProject(), ejbComponent.getName());
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isEJB20Component(IProject project, String componentName){
-		boolean isEJB = false;
-		try {
-      IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-		  if (EJBArtifactEdit.isValidEJBModule(vc)) {
-			  EJBArtifactEdit  ejbEdit = null;
-			  try {
-				  ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(vc);
-				  EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
-				  if (ejbRes.getModuleVersionID()== J2EEVersionConstants.EJB_2_0_ID) {
-					  return true;
-				  }
-			  }
-			  finally {
-				  if (ejbEdit!=null)
-					  ejbEdit.dispose();
-			  }
-		  }
-		}
-		catch(Exception ex){}
-		
-		return isEJB;			
-	}
-
-	
-	/**
-	 * Checks if the component at compName is referenced by the ear at earCompName
-	 * @param earProject
-	 * @param earCompName
-	 * @param project
-	 * @param compName
-	 * @return
-	 */
-	public static boolean isComponentAssociated(IProject earProject, String earCompName,
-								IProject project, String compName) {
-		IVirtualComponent vc1 = ComponentCore.createComponent(earProject, earCompName);
-		IVirtualComponent vc2 = ComponentCore.createComponent(project, compName);
-		return isComponentAssociated(vc1, vc2);
-	}
-	
-	/**
-	 * Checks if the component is referenced by the ear
-	 * @param ear 
-	 * @param component
-	 * @return
-	 */
-	private static boolean isComponentAssociated(IVirtualComponent ear, IVirtualComponent component){
-		boolean isAssociated = false;
-		
-		// Note: not implemented by J2EE yet.. to be used later.
-		IVirtualReference[] compRefs = ear.getReferences();
-		if (compRefs!= null) {
-			for (int i=0;i<compRefs.length;i++){
-				IVirtualReference vref = compRefs[i];
-				if (component.equals(vref.getReferencedComponent()))
-						isAssociated = true;
-			}
-		}
-		return isAssociated;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @param componentName
-	 * @param earProject
-	 * @param earComponentName
-	 */
-	public static void associateComponentToEAR(IProject project, String componentName,
-							IProject earProject, String earComponentName) {
-		
-        IDataModel addComponentToEARDataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-		IVirtualComponent earComp = ComponentCore.createComponent(earProject);
-        addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
-        List modList = (List) addComponentToEARDataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-        IVirtualComponent targetComp = ComponentCore.createComponent(project);
-        modList.add(targetComp);
-		addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, modList);
-        
-		try {
-			addComponentToEARDataModel.getDefaultOperation().execute(null, null);
-		} catch (ExecutionException e) {
-			Logger.getLogger().log(e);
-		}
-            
-	}
-
-	
-
-	
-	/**
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IPath getWebInfPath(IProject project, String componentName){
-		
-		IVirtualComponent component = ComponentCore.createComponent(project, componentName);
-		IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
-		IPath modulePath = webInfDir.getWorkspaceRelativePath();
-	
-		return modulePath;
-	}
-	
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 */
-	public static IPath getFirstWebContentPath(IProject project){
-		
-		IPath modulePath = null;
-		try {
-          IVirtualComponent vc = ComponentCore.createComponent(project);
-		  if (ModuleCoreNature.isFlexibleProject(project)) {
-            modulePath = vc.getRootFolder().getWorkspaceRelativePath();
-		  }
-		}
-		catch(Exception ex){}
-
-		return modulePath;			
-	}
-	
-	/**
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IPath getWebContentPath(IProject project, String componentName){
-		IVirtualComponent component = ComponentCore.createComponent(project, componentName);
-		IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
-		return modulePath;
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 */
-	public static IContainer getFirstWebContentContainer(IProject project){
-		IContainer container = null;
-		IPath modulePath = getFirstWebContentPath(project);
-		IResource res = ResourceUtils.findResource(modulePath);
-		if (res!=null){
-		  container = res.getParent();
-		}		
-		  
-		return container;
-	}
-	
-	/**
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IContainer getWebContentContainer(IProject project, String componentName){
-		IContainer container = null;
-		IPath modulePath = getWebContentPath(project, componentName);
-		IResource res = ResourceUtils.findResource(modulePath);
-		if (res instanceof IContainer){
-		  container = (IContainer)res;
-		}		
-		return container;
-	}
-	
-	
-	/**
-	 * Returns the first Module name 
-	 * @param project
-	 * @return
-	 * 
-	 */
-	public static String getFirstWebModuleName(IProject project){
-      String moduleName = null;
-      try {
-        IVirtualComponent vc = ComponentCore.createComponent(project);
-        moduleName = vc.getName();
-      }
-      catch(Exception ex){}
-  
-      return moduleName;  			
-	}
-	
-	
-	public static boolean isWebComponent(IVirtualComponent comp){
-    if (IModuleConstants.JST_WEB_MODULE.equals(comp.getComponentTypeId())){
-      return true;
-    }
-    return false;
-  }
-	
-	public static boolean isEARComponent(IVirtualComponent comp){
-    if (IModuleConstants.JST_EAR_MODULE.equals(comp.getComponentTypeId())){
-      return true;
-    }
-    return false;
-	}
-
-	/**
-	 * True if the component is a valid EJB component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isEJBComponent(IProject project, String componentName) {
-    IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-    return isEJBComponent(vc);
-	}
-
-	public static boolean isEJBComponent(IVirtualComponent comp){
-    if (IModuleConstants.JST_EJB_MODULE.equals(comp.getComponentTypeId())){
-      return true;
-    }
-    return false;
-	}	
-
-	public static boolean isAppClientComponent(IVirtualComponent comp){
-    if (IModuleConstants.JST_APPCLIENT_MODULE.equals(comp.getComponentTypeId())){
-      return true;
-    }
-    return false;
-	}
-	
-	public static boolean isJavaComponent(IVirtualComponent comp){
-    if (IModuleConstants.JST_UTILITY_MODULE.equals(comp.getComponentTypeId())){
-      return true;
-    }
-    return false;
-	}	
-	
-  public static String getComponentTypeId(IProject project, String componentName)
-  {
-    IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-    return vc.getComponentTypeId();
-  }
-  
-	public static String[] toComponentNamesArray(IVirtualComponent[] components){
-		String[] ecNames = new String[components.length];
-		for(int i=0; i<components.length; i++){
-			ecNames[i] = components[i].getName();
-		}
-		return ecNames;		
-	}
-	
-	public static IProject[] toProjectArray(IVirtualComponent[] components){
-		IProject[] projects = new IProject[components.length];
-		for (int i=0; i<components.length; i++){
-			projects[i] = components[i].getProject();
-		}
-		return projects;
-	}
-	
-	/**
-	 * Given a J2EE level, this method returns the highest supported servlet level
-	 * @param j2eeLevel
-	 * @return web app version
-	 */
-	public static Integer getServletVersionForJ2EEVersion(String j2eeLevel){
-		int aVersion = Integer.valueOf(j2eeLevel).intValue();
-		switch (aVersion) {
-		case J2EEVersionConstants.J2EE_1_2_ID:
-			return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-
-		case J2EEVersionConstants.J2EE_1_3_ID:
-			return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-
-		case J2EEVersionConstants.J2EE_1_4_ID:
-			return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-			
-		default:
-			return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-		}		
-	}
-	
-	/**
-	 * Given a J2EE level, this method returns the highest supported EJB version
-	 * @param j2eeLevel
-	 * @return ejb spec version
-	 */
-	public static Integer getEJBVersionForJ2EEVersion(String j2eeLevel){
-		int aVersion = Integer.valueOf(j2eeLevel).intValue();
-		switch (aVersion) {
-		case J2EEVersionConstants.J2EE_1_2_ID:
-			return new Integer(J2EEVersionConstants.EJB_1_1_ID);
-
-		case J2EEVersionConstants.J2EE_1_3_ID:
-			return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-
-		case J2EEVersionConstants.J2EE_1_4_ID:
-			return new Integer(J2EEVersionConstants.EJB_2_1_ID);
-			
-		default:
-			return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-		}			
-	}
-
-	/**
-	 * True if the component is a valid Java component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isJavaComponent(IProject project, String componentName) {
-	IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-	return isJavaComponent(vc);
-	}
-
-	/**
-	 * True if the component is a valid Web component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isWebComponent(IProject project, String componentName) {
-	IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-	return isWebComponent(vc);
-	}
-
-	/**
-	 * True if the component is a true Application client component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isAppClientComponent(IProject project, String componentName) {
-	IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-	return isAppClientComponent(vc);
-	}
-
-	/**
-	 * True is the component is a valid EAR component
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static boolean isEARComponent(IProject project, String componentName){
-	IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-	return isEARComponent(vc);
-	}
-	
-	public static IFolder getOutputContainerRoot (IVirtualComponent component) {
-		return (IFolder)ComponentUtilities.getOutputContainers(component)[0];
-	}
-	
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
deleted file mode 100644
index 02ee57941..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,225 +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.common;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-
-/**
-* This class contains some useful utilities for dealing with the JavaMOF
-*/
-
-public final class JavaMOFUtils
-{
- /**
-  * Determine whether this class of the given name is loadable in the given
-  * project.
-  * @param className The fully qualified name of the class
-  * @param project The project
-  * @return True if the class is loadable and no exceptions are thrown. 
-  */
-  public static boolean isClassLoadable(String className, IProject project) throws CoreException
-  {
-   	return isClassLoadable(getJavaClass(className,project));
-  }
-
-  public static boolean isClassLoadable(JavaClass javaClass)
-  {
-	return javaClass.isExistingType();    
-  }
-
-  /**
-  * Determine whether the specified class has a public constructor
-  * with an empty parameter list.
-  * @param className The fully qualified name of the class
-  * @param project The project
-  * @return True if the class is loadable from the project and the 
-  *         class has a public constructor with an empty parameter list  
-  */
-  public static boolean hasPublicDefaultCtor(String className, IProject project) throws CoreException
-  {
-    return hasPublicDefaultCtor(getJavaClass(className, project));
-  }
-
-
- public static boolean hasPublicDefaultCtor(JavaClass javaClass)
-  {
-   
-    List methodList = javaClass.getMethods();
-    if (methodList==null)
-      return true;
-
-    Iterator iMethods = methodList.iterator();
-    boolean userDefinedCtor = false;
-    while (iMethods.hasNext())
-    {
-      Method thisMethod = (Method)iMethods.next();
-
-      if (thisMethod.isConstructor())
-      {
-        userDefinedCtor = true; 
-
-        //Since the user has defined a ctor, the default ctor is no longer available.
-        //We must ensure that the user has provided a public ctor with no parameters.
-
-        //check if public
-        if (thisMethod.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
-        {
-          //see if parameter list is empty
-          List paramList = thisMethod.getParameters();
-          if (paramList.isEmpty() )
-          {
-	        return true;             
-          }
-        }
-      }
-
-    }
-
-    if (userDefinedCtor)
-    {
-	  return false; //if the user defined a ctor and we still haven't
-	  	            //returned true, none of them were public with no parameters.
-    }
-    else
-    { 
-       return true;    
-    }
-
-  }
-  /**
-  * Determine whether the specified class implements the specified interface.
-  * @param className The fully qualified name of the class
-  * @param interfaceName The fully qualified name of the interface
-  * @param project The project
-  * @return True if the class and interface are loadable from the project and
-  *         the class implements the interface.
-  */
-  public static boolean implementsInterface(String className, String interfaceName, IProject project)
-  			throws CoreException
-  {
-   return implementsInterface(getJavaClass(className, project), getJavaClass(interfaceName, project));
-  }
-
-public static boolean implementsInterface(JavaClass javaClass, JavaClass interfaceClass)
-  {
-   
-    if (!javaClass.isExistingType())     return false;
-
-    if (!interfaceClass.isExistingType())  return false;
-        
-    return javaClass.implementsInterface(interfaceClass);
-  }
-
-  /**
-  * Determine whether the specified class extends the specified superclass
-  * @param className The fully qualified name of the class
-  * @param superClassName The fully qualified name of the superclass
-  * @param project The project
-  * @return True if the class and superClass are loadable from the project and
-  *         the class extends the superClass
-  */
-  public static boolean extendsClass(String className, String superClassName, IProject project)
-         throws CoreException
-  {
-    return extendsClass(getJavaClass(className,project), getJavaClass(superClassName, project));
-  }
-
-  public static boolean extendsClass(JavaClass javaClass, JavaClass superClass)
-  {
-    return superClass.isAssignableFrom(javaClass);
-  }
-
-  /**
-  * Determine whether the specified class is actually an interface
-  * @param className The fully qualified name of the class
-  * @param project The project
-  * @return True if the class is loadable from the project and is 
-  *         actually an interface
-  */
-  public static boolean isInterface(String className, IProject project) throws CoreException
-  {
-     return isInterface(getJavaClass(className, project));
-  }
-
- public static boolean isInterface(JavaClass javaClass)
-  {
-      return javaClass.isInterface();
-  }
- public static boolean hasAbstractMethods (String className, IProject project) throws CoreException
- 	{
-	    return hasAbstractMethods(getJavaClass(className, project));
-  	}
-
-  public static boolean hasAbstractMethods (JavaClass javaClass)
- 	{
-	   List methodList = javaClass.getMethods();
-       if (methodList==null)
-      	return false;
-
-	   Iterator iMethods = methodList.iterator();
-	   while (iMethods.hasNext())
-    	{
-      		Method thisMethod = (Method)iMethods.next();
-			if ( thisMethod.isAbstract()) return true;
-	   	}
-		return false;
- 	}
-
- public static JavaClass getJavaClass(String className , IProject project) throws CoreException
- 	{
- 		JavaEMFNature jMOF = (JavaEMFNature)JavaEMFNature.createRuntime(project);
-    	return (JavaClass)JavaRefFactory.eINSTANCE.reflectType(className,jMOF.getResourceSet());
- 	}
-
- public static boolean isValidSEIFile(JavaClass beanClass, JavaClass seiClass)
- 	{
- 		if (!seiClass.isInterface())
- 			return false;
-
-		Vector beanMethodsList = new Vector();
- 		List beanMethods = beanClass.getMethods();
-		Iterator beanMethodsIterator = beanMethods.iterator();
-	   	while (beanMethodsIterator.hasNext())
-    	{
-      		Method thisMethod = (Method)beanMethodsIterator.next();
-			beanMethodsList.add(thisMethod.getMethodElementSignature());
-	   	}
-
-		List seiMethods = seiClass.getMethods();
- 		if (beanMethods == null ) {
- 			if ( seiMethods == null) return true;
- 			else	return false;
- 		}
-		if (seiMethods == null) return false;
-
-		Iterator seiMethodsIterator = seiMethods.iterator();
-	   	while (seiMethodsIterator.hasNext())
-    	{
-      		Method thisMethod = (Method)seiMethodsIterator.next();
-			if ( !beanMethodsList.contains(thisMethod.getMethodElementSignature())) {
-				return false;
-			}
-	   	}
-		return true;
- 		
- 	}
- 
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
deleted file mode 100644
index 6a4b6efc1..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,1849 +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.common;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Enumeration;
-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.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Eclipse resources.
- */
-public final class ResourceUtils {
-
-	// Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
-	private static IWorkspaceRoot root_ = null;
-
-	// Keeps the IWorkspace hanging around. See getWorkspace().
-
-	private static IWorkspace workspace_ = null;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has no Java or Web nature.
-	 */
-	public static byte PROJECT_TYPE_NONE = 0;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has a Java project nature.
-	 */
-	public static byte PROJECT_TYPE_JAVA = 1;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has a Web project nature.
-	 */
-	public static byte PROJECT_TYPE_WEB = 2;
-
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has an EJB project nature.
-	 */
-	public static byte PROJECT_TYPE_EJB = 4;
-	
-	/**
-	 * As returned by {@link #getProjectType getProjectType()}, indicates that
-	 * the given project has an Application client project nature.
-	 */	
-	public static byte PROJECT_TYPE_APPCLIENT = 8;
-
-	/**
-	 * The SOAP rpcrouter servlet extension to be added to web project URL
-	 */
-	public static String SERVLET_EXT = "/servlet/rpcrouter";
-
-	private static final String DEFAULT_CLIENT_WEB_PROJECT_EXT = "Client";
-    private static final String DEFAULT_CLIENT_EJB_PROJECT_EXT = "EJBClient";
-	private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject";
-    private static final String DEFAULT_EJB_COMPONENT_NAME = "WebServiceEJB";
-	private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject";
-    private static final String DEFAULT_WEB_COMPONENT_NAME = "WebServiceProject";
-	private static final String DEFAULT_ROUTER_PROJECT_EXT = "Router";
-
-	private static final String DEFAULT_SERVICE_EAR_PROJECT_NAME = "WebServiceProjectEAR";
-    private static final String DEFAULT_SERVICE_EAR_COMPONENT_NAME = "WebServiceProjectEAR";
-	private static final String DEFAULT_CLIENT_EAR_PROJECT_NAME = "WebServiceProjectClientEAR";
-    private static final String DEFAULT_CLIENT_EAR_COMPONENT_NAME = "WebServiceProjectClientEAR";
-
-	/**
-	 * Returns the IWorkspaceRoot object.
-	 * @return The IWorkspaceRoot object.
-	 */
-	public static IWorkspaceRoot getWorkspaceRoot() {
-		if (root_ == null) {
-			root_ = ResourcesPlugin.getWorkspace().getRoot();
-		}
-		return root_;
-	}
-
-	/**
-	 * Returns the IWorkspace object.
-	 * @return The IWorkspace object.
-	 */
-	public static IWorkspace getWorkspace() {
-		if (workspace_ == null) {
-			if (root_ == null) {
-				root_ = ResourcesPlugin.getWorkspace().getRoot();
-			}
-			workspace_ = root_.getWorkspace();
-		}
-		return workspace_;
-	}
-
-	/**
-	 * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
-	 * given absolute pathname or null if no such resource exists.
-	 * 
-	 * @param absolutePathname
-	 *            The absolute path of the resource.
-	 * @return The <code>IResource</code>.
-	 */
-	public static IResource findResource(String absolutePathname) {
-		if (absolutePathname == null) {
-			return null;
-		}
-		return findResource(new Path(absolutePathname));
-	}
-
-	/**
-	 * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
-	 * given absolute path or null if no such resource exists.
-	 * 
-	 * @param absolutePath
-	 *            The absolute <code>IPath</code> of the resource.
-	 * @return The <code>IResource</code>.
-	 */
-	public static IResource findResource(IPath absolutePath) {
-		if (absolutePath == null) {
-			return null;
-		}
-		return ResourceUtils.getWorkspaceRoot().findMember(absolutePath);
-	}
-
-	/**
-	 * Validates the given string as a name for a resource of the given type(s).
-	 * This method obeys the contract of
-	 * {@link org.eclipse.core.resources.IWorkspace#validateName IWorkspace.validateName()}.
-	 * 
-	 * @param segment
-	 *            The path to validate.
-	 * @param typeMask
-	 *            The <code>IResource</code> type or types.
-	 * @return The status with a value if <code>IStatus.OK</code> if the path
-	 *         is valid, or with appropriate severity and message information if
-	 *         the path is not valid.
-	 *         
-	 * @deprecated not used         
-	 */
-	public static IStatus validateName(String segment, int typeMask) {
-		return getWorkspace().validateName(segment, typeMask);
-	}
-
-	/**
-	 * Validates the given string as the path of a resource of the given
-	 * type(s). This method obeys the contract of
-	 * {@link org.eclipse.core.resources.IWorkspace#validatePath IWorkspace.validatePath()}.
-	 * 
-	 * @param path
-	 *            The path to validate.
-	 * @param typeMask
-	 *            The <code>IResource</code> type or types.
-	 * @return The status with a value if <code>IStatus.OK</code> if the path
-	 *         is valid, or with appropriate severity and message information if
-	 *         the path is not valid.
-	 * @deprecated not used 
-	 */
-	public static IStatus validatePath(String path, int typeMask) {
-		return getWorkspace().validatePath(path, typeMask);
-	}
-
-	/**
-	 * Validates the given Java type name.
-	 * 
-	 * @param typeName
-	 *            The Java type name.
-	 * @return The status with a value of <code>IStatus.OK</code> if the name
-	 *         is valid, or with appropriate severity and message information if
-	 *         name is not valid. The primitive types (boolean, char, byte,
-	 *         short, int, long, float, double) are valid. Arrays of valid types
-	 *         are themselves valid.
-	 * @deprecated use JavaConventions in the jdt core 
-	 */
-	public static IStatus validateJavaTypeName(String typeName) {
-		//
-		// Strip off the trailing array bits, if any.
-		//
-		int a = typeName.indexOf('[');
-		if (a > 0) {
-			typeName = typeName.substring(0, a);
-		}
-		//
-		// Allow primitives.
-		//
-		if (isPrimitiveJavaType(typeName)) {
-			return new Status(IStatus.OK, WebServicePlugin.ID, 0, "", null);
-		}
-		//
-		// Defer to JavaConventions.
-		//
-		return JavaConventions.validateJavaTypeName(typeName);
-	}
-
-	/**
-	 * Returns true if the given <code>typeName</code> is a Java primitive
-	 * (boolean, char, byte, short, int, long, float, double).
-	 * 
-	 * @return True if the type name is a Java primitive.
-	 * 
-	 * @deprecated
-	 */
-	public static boolean isPrimitiveJavaType(String typeName) {
-		return (typeName.equals("boolean") || typeName.equals("char")
-				|| typeName.equals("byte") || typeName.equals("short")
-				|| typeName.equals("int") || typeName.equals("long")
-				|| typeName.equals("float") || typeName.equals("double"));
-	}
-
-	/**
-	 * Returns the handle of the IProject at the beginning of the given
-	 * <code>absolutePath</code>. Neither the given path nor the project need
-	 * exist in the workspace. The path must be absolute, and must consist of at
-	 * least one segment.
-	 * 
-	 * @return An IProject handle for the project at the beginning of the given
-	 *         <code>absolutePath</code>, or null if the path does not
-	 *         specify a project.
-	 */
-	public static IProject getProjectOf(IPath absolutePath) {
-		if (absolutePath.isAbsolute()) {
-			String projectName = absolutePath.segment(0);
-			if (projectName != null) {
-				return getWorkspaceRoot().getProject(projectName);
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param absolutePath
-	 * @return
-	 */
-	public static IVirtualComponent getComponentOf(IPath absolutePath){
-		if (absolutePath.isAbsolute()) {
-			String componentName = absolutePath.segment(1);
-			if (componentName != null) {
-				String projectName = absolutePath.segment(0);
-				IProject project = getWorkspaceRoot().getProject(projectName);
-				if (projectName != null) {
-					return ComponentCore.createComponent(project, componentName);
-				}
-			}
-		}
-		return null;
-	}
-	
-	public static IVirtualComponent getComponentOf(IResource res)
-	{
-		IVirtualResource[] vresources = ComponentCore.createResources(res);
-		IVirtualComponent vcomp = null;
-		if (vresources != null && vresources.length>0)
-		{
-			IVirtualResource vres = vresources[0];
-			vcomp = vres.getComponent();
-		}
-		return vcomp;
-	}
-	
-	
-	/**
-	 * Returns true if the given <code>project</code> is a Java Project.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return True if the project is a Java Project.
-	 */
-	public static boolean isJavaProject(IProject project) {
-		return (JavaCore.create(project) != null);
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is a Java Project.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return True if the project is a Java Project.
-	 */
-	public static boolean isTrueJavaProject(IProject project) {
-		return (!isWebProject(project) && !isAppClientProject(project) && !isEARProject(project)
-				&& !isEJBProject(project) && isJavaProject(project));
-		/*
-		 * try { String[] natures = project.getDescription().getNatureIds();
-		 * return (natures.length == 1 &&
-		 * natures[0].equals(JavaCore.NATURE_ID)); } catch (CoreException e) { }
-		 * return false;
-		 */
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is a Web Project.
-	 * Note: For components; use J2EEUtils.isWebComponent()
-	 * @param project
-	 *            The project.
-	 * @return True if the project is a Web Project.
-   * 
-   * @deprecated
-	 */
-	public static boolean isWebProject(IProject project) {
-		boolean isWeb = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			  //isWeb = WebArtifactEdit.isValidWebModule(wbcs[0]);
-		  }
-		}
-		catch(Exception ex){
-			// handle exception
-		}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-
-		return isWeb;
-	}
-
-	/**
-	 * Note: for components; use J2EEUtils.isEARComponent()
-	 * @param project
-	 * @return
-   * 
-   * @deprecated
-	 */
-	public static boolean isEARProject(IProject project){
-		boolean isEAR = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			EARArtifactEdit earEdit = null;
-			try {
-			  //earEdit = EARArtifactEdit.getEARArtifactEditForRead(wbcs[0]);
-			  if (earEdit!=null){
-				isEAR = true;
-			  }
-			}
-			finally{
-				if (earEdit!=null)
-					earEdit.dispose();
-			}
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isEAR;
-	}
-	/**
-	 * Returns true if the given <code>project</code> is an EJB 1.1 or EJB 2.0
-	 * Project.
-	 * Note: for components, use J2EEUtils.isEJBComponent
-	 * @param project
-	 *            The project.
-	 * @return True if the project is an EJB 1.1 or an EJB 2.0 Project.
-   * 
-   * @deprecated
-   * 
-	 */
-	public static boolean isEJBProject(IProject project) {
-		boolean isEJB = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			EJBArtifactEdit ejbEdit = null;
-			try {
-			  //ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(wbcs[0]);
-			  if (ejbEdit!=null){
-				isEJB = true;
-			  }
-			}
-			finally{
-				if (ejbEdit!=null)
-					ejbEdit.dispose();
-			}
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isEJB;	
-	}
-
-	/**
-	 * Returns true if the given <code>project</code> is an Application Client
-	 * Project.
-	 * Note: for components, use J2EEUtils.isAppClientComponent()
-	 * @param project
-	 *            The project.
-	 * @return True if the project is an Application Client Project
-   * 
-   * @deprecated
-	 */
-	public static boolean isAppClientProject(IProject project) {
-		boolean isAppClient = false;
-		StructureEdit mc = null;
-		try {
-		  mc = StructureEdit.getStructureEditForRead(project);
-		  WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-		  if (wbcs.length!=0) {
-			AppClientArtifactEdit appClientEdit = null;
-			try {
-				//appClientEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbcs[0]);
-			  if (appClientEdit!=null){
-				  isAppClient = true;
-			  }
-			}
-			finally{
-				if (appClientEdit!=null)
-					appClientEdit.dispose();
-			}
-		  }
-		}
-		catch(Exception ex){}
-		finally{
-			if (mc!=null)
-				mc.dispose();
-		}
-		
-		return isAppClient;	
-	}
-
-	/**
-	 * Returns the type of the given <code>project</code> as a bitmask.
-	 * Relevant bitmask values are:
-	 * <ol>
-	 * <li>{@link #PROJECT_TYPE_JAVA PROJECT_TYPE_JAVA}
-	 * <li>{@link #PROJECT_TYPE_WEB PROJECT_TYPE_WEB}
-	 * <li>{@link #PROJECT_TYPE_EJB PROJECT_TYPE_EJB}
-	 * <li>{@link #PROJECT_TYPE_NONE PROJECT_TYPE_NONE}
-	 * </ol>
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The type bitmask of the project.
-	 * 
-	 * @deprecated use getComponentType
-	 */ 
-	public static byte getProjectType(IProject project) {
-		byte projectType = PROJECT_TYPE_NONE;
-		if (ResourceUtils.isJavaProject(project)) {
-			projectType |= PROJECT_TYPE_JAVA;
-		}
-		if (ResourceUtils.isWebProject(project)) {
-			projectType |= PROJECT_TYPE_WEB;
-		}
-		if (ResourceUtils.isEJBProject(project)) {
-			projectType |= PROJECT_TYPE_EJB;
-		}
-		return projectType;
-	}
-
-	/**
-	 * Returns the component type id as defined in IModuleConstants
-	 * i.e. IModuleConstants.JST_WEB_MODULE = "jst.web"
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static String getComponentType(IProject project, String componentName){
-		IVirtualComponent comp = ComponentCore.createComponent(project, componentName);
-		return getComponentType(comp);
-	}
-	
-	/**
-	 * Returns the component type
-	 * @param component
-	 * @return
-	 */
-	public static String getComponentType(IVirtualComponent component){
-		return component.getComponentTypeId();
-	}
-	
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated not used
-	 */
-	public static String getProjectTypeAsString(IProject project) {
-		if (ResourceUtils.isEJBProject(project))
-			return WebServicePlugin.getMessage("%LABEL_EJB");
-		else if (ResourceUtils.isWebProject(project))
-			return WebServicePlugin.getMessage("%LABEL_WEB");
-		else if (ResourceUtils.isJavaProject(project))
-			return WebServicePlugin.getMessage("%LABEL_JAVA");
-		else
-			return "";
-	}
-	
-
-	/**
-	 * Returns WebModule Deployable of the <code>project</code> as an
-	 * <code>IDeployable</code>, or null if the project has no Web nature.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return WebModule Deployable of the <code>project</code> or null if the
-	 *         project has no Web nature.
-	 * @deprecated  see ServerUtils.getModule(IProject, String)
-	 */
-	public static IModule getModule(IProject project) {
-		IModule[] modules = ServerUtil.getModules(project);
-		if (modules!=null && modules.length!=0) {
-			return modules[0];
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the build output location of the <code>project</code> as an
-	 * <code>IPath</code>, or null if the project has no Java nature.
-	 * i.e. WP\.deployables\webModule\WEB-INF\classes
-	 * @param project
-	 *            The project.
-	 * @return The build output location of the <code>project</code> or null
-	 *         if the project has no Java nature.
-	 * @deprecated not used 
-	 */
-	public static IPath getJavaOutputLocation(IProject project) {
-		IPath outputLocation = null;
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				outputLocation = javaProject.getOutputLocation();
-			}
-		} catch (JavaModelException e) {
-		}
-		Log log = EnvironmentService.getEclipseLog();
-		log.log(Log.INFO, 5032, ResourceUtils.class, "getJavaOutputLocation",
-				"project=" + project + ",outputLocation=" + outputLocation);
-
-		return outputLocation;
-	}
-	
-	/**
-	 * Returns a build source location of the <code>project</code> as an
-	 * <code>IPath</code>, or null if the project either has no Java nature
-	 * or if the project's build classpath contains no folders local to the
-	 * project. If the project has more than one of its own folders on the build
-	 * classpath, then one of them is chosen arbitrarily as the build source
-	 * location. To work with all entries on the build classpath, use
-	 * {@link #getJavaPackageFragmentRoots getJavaPackageFragmentRoots()}or
-	 * {@link #getJavaClasspath getJavaClasspath()}.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return A build source location of the <code>project</code> or null if
-	 *         the project has no Java nature or if the project's build
-	 *         classpath contains no folders local to the project.
-	 * @deprecated use getJavaSourceLocation(IProject project, String compName)
-	 */
-	public static IPath getJavaSourceLocation(IProject project) {
-		IPath sourceLocation = null;
-		IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-		for (int i = 0; i < fragmentRoots.length && sourceLocation == null; i++) {
-			try {
-				IResource fragmentRoot = fragmentRoots[i]
-						.getCorrespondingResource();
-				if (fragmentRoot != null
-						&& (fragmentRoot.getProject().equals(project))
-						&& (fragmentRoot.getType() != IResource.FILE)) {
-					sourceLocation = fragmentRoot.getFullPath();
-				}
-			} catch (JavaModelException e) {
-			}
-		}
-
-		Log log = EnvironmentService.getEclipseLog();
-		log.log(Log.INFO, 5030, ResourceUtils.class, "getJavaSourceLocation",
-				"project=" + project + ",sourceLocation=" + sourceLocation);
-		
-		return sourceLocation;
-	}
-
-	/**
-	 * Returns the "JavaSource" folder
-	 * @param project
-	 * @param compName
-	 * @return
-	 */
-	public static IPath getJavaSourceLocation(IProject project, String compName){
-		IVirtualComponent component = ComponentCore.createComponent(project, compName);
-		return getJavaSourceLocation(component);			
-	}
-	
-	/**
-	 * Returns the JavaSource location folder
-	 * @param comp
-	 * @return
-	 */
-	public static IPath getJavaSourceLocation(IVirtualComponent comp){
-		if (comp!=null){
-		   IVirtualFolder folder = comp.getRootFolder().getFolder(new Path("/WEB-INF/classes"));
-		   return folder.getWorkspaceRelativePath();
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the JavaSource locations in each project
-	 * @param project
-	 * @return
-	 */
-	public static IPath[] getAllJavaSourceLocations(IProject project) {
-		Vector pathVector = new Vector();
-		IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-
-		for (int i = 0; i < fragmentRoots.length; i++) {
-			try {
-				IResource fragmentRoot = fragmentRoots[i].getCorrespondingResource();
-				if (fragmentRoot != null && (fragmentRoot.getProject().equals(project))
-						&& (fragmentRoot.getType() != IResource.FILE)) {
-					pathVector.add(fragmentRoot.getFullPath());
-				}
-			} catch (JavaModelException e) {
-			}
-		}
-		return (IPath[]) pathVector.toArray(new Path[pathVector.size()]);
-	}
-
-	public static IPath[] getAllJavaSourceLocations(IVirtualComponent[] components) {
-
-		if (components!=null){
-			List javaSourcePaths = new ArrayList();
-			for (int i=0;i<components.length;i++){
-				IPath path = getJavaSourceLocation(components[i]);
-				javaSourcePaths.add(path);
-			}
-			return (IPath[])javaSourcePaths.toArray(new IPath[0]);
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns a build source package fragment root of the <code>project</code>
-	 * as an <code>IPackageFragmentRoot</code>, or null if the project either
-	 * has no Java nature or if the project's build classpath contains no
-	 * folders local to the project. If the project has more than one of its own
-	 * folders on the build classpath, then one of them is chosen arbitrarily as
-	 * the build source location.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return A build source package fragment root of the <code>project</code>
-	 *         or null if the project has no Java nature or if the project's
-	 *         build classpath contains no folders local to the project.
-	 *         
-	 * @deprecated not used
-	 */
-	public static IPackageFragmentRoot getJavaSourcePackageFragmentRoot(IProject project) {
-		IPackageFragmentRoot packageFragmentRoot = null;
-		IPath javaSourceLocation = getJavaSourceLocation(project);
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				packageFragmentRoot = javaProject.findPackageFragmentRoot(javaSourceLocation);
-			}
-		} catch (JavaModelException e) {
-		}
-		return packageFragmentRoot;
-	}
-
-	/**
-	 * Returns the package fragment roots of the <code>project</code> as an
-	 * array of <code>IPackageFragmentRoot</code> objects. If the project has
-	 * no Java nature then the returned array will be of length zero.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The package fragment roots of the <code>project</code>.
-	 */
-	public static IPackageFragmentRoot[] getJavaPackageFragmentRoots(IProject project) {
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IPackageFragmentRoot[] packageFragmentRoots = javaProject
-						.getPackageFragmentRoots();
-				return packageFragmentRoots;
-			}
-		} catch (JavaModelException e) {
-		}
-		return new IPackageFragmentRoot[0];
-	}
-
-	/**
-	 * Returns the build classpath entries of the <code>project</code> as an
-	 * array of <code>IClasspathEntry</code> objects. If the project has no
-	 * Java nature then the returned array will be of length zero.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The classpath entries of the <code>project</code>.
-	 * 
-	 * @deprecated not used
-	 */
-	public static IClasspathEntry[] getJavaClasspath(IProject project) {
-		try {
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
-				return classpathEntries;
-			}
-		} catch (JavaModelException e) {
-		}
-		return new IClasspathEntry[0];
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @param componentName
-	 * @return
-	 */
-	public static IFolder getWebComponentServerRoot(IProject project, String componentName){
-		
-      IFolder webModuleServerRoot = null;
-      IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
-      if (vc.exists())
-        webModuleServerRoot = J2EEUtils.getOutputContainerRoot(vc);
-
-	  return webModuleServerRoot;
-	}
-
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * project in a server instance or null if the project has no Web nature or
-	 * has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 * @deprecated use getWebComponentURL(..) which belongs in ServerUtils
-	 */
-	public static String getWebProjectURL(IProject project,
-			String serverFactoryId, IServer server) {
-
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			IServer serverInstance = ServerUtils.getServerForModule(module,
-					serverFactoryId, server, true, new NullProgressMonitor());
-			if (serverInstance != null) {
-//				URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-				URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
-				if (url != null) {
-					String s = url.toString();
-					webProjectURL = (s.endsWith("/") ? s.substring(0, s
-							.length() - 1) : s);
-				}
-			}
-		}
-		
-		Log log = EnvironmentService.getEclipseLog();
-		log.log(Log.INFO, 5036, ResourceUtils.class, "getWebProjectURL",
-				"project=" + project + ",webProjectURL=" + webProjectURL);
-
-		return webProjectURL;
-	}
-	
-	/**
-	 * Returns the forged URL string corresponding to the web server module root
-	 * of the project in a server instance or null if the project has no Web
-	 * nature or has no association to a server instance.
-	 * 
-	 * @param project
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 * @deprecated  not used
-	 */
-//	public static String getForgedWebProjectURL(IProject project, String serverFactoryId, IServer server){
-//  	
-//  	String webProjectURL = null;
-//  	IModule module = getModule(project);
-//  	if (module != null)
-//  	{
-//  		//IServer serverInstance = ServerUtils.getServerForModule(module,
-//		  // serverFactoryId, server, true, new NullProgressMonitor());
-//  		if (server != null)
-//  		{
-//  			String hostname = server.getHost();
-//
-//  			// get ServerPort
-//  			int portNumber = 0;
-//
-//  	          ServerPort[] ports = server.getServerPorts(null);
-//  	          ServerPort port = null;
-//  	          for (int it = 0; it<ports.length; it++)
-//  	          {
-//  	            ServerPort p = ports[it];
-//  	            String protocol = p.getProtocol();
-//  	            if (protocol != null && protocol.trim().toLowerCase().equals("http"))
-//  	            {
-//  	              port = p;
-//  	              portNumber = p.getPort();
-//  	              break;
-//  	            }
-//  	          }
-//  	          
-//  	        
-//  	        
-//  	        URL url = null;
-//  	        try {
-//  	        	url = new URL("http", hostname, portNumber, "");
-//  	        }
-//  	        catch(Exception e){
-//  	        	e.printStackTrace();
-//  	        }
-//
-//  	        
-//  			//URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-//  			
-//  			if (url != null)
-//  			{
-//  				String s = url.toString();
-//  				webProjectURL = s + "/"+project.getName();
-//  				//webProjectURL = (s.endsWith("/") ? s.substring(0,s.length()-1) : s);
-//  			}
-//  		}
-//  	}
-// 	Log log = new EclipseLog();
-//    log.log(Log.INFO, 5036, ResourceUtils.class, "getWebProjectURL", "project="+project+",webProjectURL="+webProjectURL);
-//  	return webProjectURL;  	
-//  }
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * project in a server instance or null if the project has no Web nature or
-	 * has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 * @deprecated belongs in ServerUtils
-	 *
-	 */
-	public static String getWebProjectURL(IProject project) {
-		String webProjectURL = null;
-		IModule module = getModule(project);
-		if (module != null) {
-			IServer serverInstance = ServerUtils.getServerForModule(module);
-			if (serverInstance != null) {
-				URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
-				if (url != null) {
-					String s = url.toString();
-					webProjectURL = (s.endsWith("/") ? s.substring(0, s
-							.length() - 1) : s);
-				}
-			}
-		}
-		Log log = EnvironmentService.getEclipseLog();
-		log.log(Log.INFO, 5037, ResourceUtils.class, "getWebProjectURL",
-				"project=" + project + ",webProjectURL=" + webProjectURL);
-
-		return webProjectURL;
-	}
-
-	/**
-	 * 
-	 * @param project
-	 * @return
-	 * 
-	 * @deprecated should be in ServerUtils
-	 */
-	public static String getEncodedWebProjectURL(IProject project) {
-		String url = getWebProjectURL(project);
-		if (url != null) {
-			int index = url.lastIndexOf('/');
-			if (index != -1) {
-				StringBuffer encodedURL = new StringBuffer();
-				encodedURL.append(url.substring(0, index + 1));
-				try {
-					String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
-					int plusIndex = ctxtRoot.indexOf('+');
-					while (plusIndex != -1) {
-						StringBuffer sb = new StringBuffer();
-						sb.append(ctxtRoot.substring(0, plusIndex));
-						sb.append("%20");
-						sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
-							.length()));
-						ctxtRoot = sb.toString();
-						plusIndex = ctxtRoot.indexOf('+');
-					}
-					encodedURL.append(ctxtRoot);
-				}catch (IOException io){
-					//handler exception
-				}				
-				url = encodedURL.toString();
-			}
-		}
-		return url;
-	}
-
-	/**
-	 * Given the <code>absolutePath</code> of a Java resource, returns the
-	 * package name of the resource or null if the resource is not properly
-	 * located in a project or folder on the build classpath or that is the
-	 * build output path.
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the Java resource.
-	 * @return the package name of the Java resource.
-	 */
-	public static String getJavaResourcePackageName(IPath absolutePath) {
-		try {
-			IPath javaFolderPath = absolutePath.removeLastSegments(1);
-			IProject project = getProjectOf(absolutePath);
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IPackageFragment fragment = javaProject
-						.findPackageFragment(javaFolderPath);
-				if (fragment != null) {
-					return fragment.getElementName();
-				}
-				IPath outputPath = getJavaOutputLocation(project);
-				if (outputPath.isPrefixOf(javaFolderPath)) {
-					IPath javaPackagePath = javaFolderPath
-							.removeFirstSegments(outputPath.segmentCount());
-					return javaPackagePath.isEmpty() ? null : javaPackagePath
-							.toString().replace(IPath.SEPARATOR, '.');
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return null;
-	}
-
-	/**
-	 * Given the <code>absolutePath</code> of a Java resource, returns the
-	 * package name of the resource as a relative pathname or null if the
-	 * resource is not properly located in a project or folder on the build
-	 * classpath.
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the Java resource.
-	 * @return the package name of the Java resource as a relative path.
-	 */
-	public static IPath getJavaResourcePackagePath(IPath absolutePath) {
-		String packageName = ResourceUtils
-				.getJavaResourcePackageName(absolutePath);
-		return (packageName == null ? null : new Path(packageName.replace('.',
-				IPath.SEPARATOR)));
-	}
-
-	/**
-	 * Given the <code>absolutePath</code> of a Java resource, returns the
-	 * absolute path of the project or folder that is on the build classpath or
-	 * is the build output path and that contains the fully qualified Java
-	 * resource, or null if no such project or folder exists.
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the Java resource.
-	 * @return The absolute path of the project or folder containing the fully
-	 *         qualified Java resource.
-	 * @deprecated not used
-	 */
-	public static IPath getJavaResourceRootPath(IPath absolutePath) {
-		try {
-			IProject project = getProjectOf(absolutePath);
-			IJavaProject javaProject = JavaCore.create(project);
-			if (javaProject != null) {
-				IPackageFragmentRoot[] pfrs = javaProject
-						.getPackageFragmentRoots();
-				for (int i = 0; i < pfrs.length; i++) {
-					IResource fragmentRoot = pfrs[i].getCorrespondingResource();
-					if (fragmentRoot != null) {
-						IPath fragmentPath = fragmentRoot.getFullPath();
-						if (fragmentPath.isPrefixOf(absolutePath)) {
-							return fragmentPath;
-						}
-					}
-				}
-				IPath outputPath = getJavaOutputLocation(project);
-				if (outputPath.isPrefixOf(absolutePath)) {
-					return outputPath;
-				}
-			}
-		} catch (JavaModelException e) {
-		}
-		return null;
-	}
-
-	/**
-	 * Determines an URL (HTTP or FILE) to an Eclipse resource, returning the
-	 * URL string if successful and false otherwise. A value of null will
-	 * definitely be returned if any of the following conditions are not met:
-	 * <ol>
-	 * <li>The absolute path begins with a Web Project.
-	 * <li>The leading portion of the absolute path matches the path of the
-	 * container returned by {#link #getWebModuleServerRoot
-	 * getWebModuleServerRoot} for the project.
-	 * <li>The path does not lead to the WEB-INF folder or any descendent
-	 * thereof.
-	 * <li>The Web Project is associated with an explicit or default server
-	 * instance.
-	 * </ol>
-	 * 
-	 * @param absolutePath
-	 *            The absolute path of the resource.
-	 * @return The URL of the file, or null if no URL can be determined.
-	 * @deprecated not used
-	 */
-//	public static String getURLFromPath(IPath absolutePath,
-//			String serverFactoryId, IServer server) {
-//		return getURLFromPath(absolutePath, getWebProjectURL(
-//				getProjectOf(absolutePath), serverFactoryId, server));
-//	}
-
-	/**
-	 * 
-	 * @param absolutePath
-	 * @param webProjectURL
-	 * @return
-	 * @deprecated not used
-	 */
-//	public static String getURLFromPath(IPath absolutePath, String webProjectURL) {
-//		StringBuffer url = new StringBuffer();
-//		IProject project = getProjectOf(absolutePath);
-//		IContainer webModuleServerRoot = getWebModuleServerRoot(project);
-//		if (webModuleServerRoot != null) {
-//			IPath webModuleServerRootPath = webModuleServerRoot.getFullPath();
-//			if (webModuleServerRootPath.isPrefixOf(absolutePath)) {
-//				int numSegment = webModuleServerRootPath.segmentCount();
-//				int numSegmentFromPath = absolutePath.segmentCount();
-//				if (numSegmentFromPath > numSegment) {
-//					String nextSegment = absolutePath.segment(numSegment);
-//					// check if the segment after the WebModuleServerRoot is
-//					// WEB-INF (ignoring case)
-//					if (nextSegment != null	&& !nextSegment.equalsIgnoreCase("WEB-INF")) {
-//						IPath relativePath = absolutePath.removeFirstSegments(numSegment);
-//						if (webProjectURL != null)
-//							url.append(webProjectURL).append(IPath.SEPARATOR).append(relativePath.toString());
-//					}
-//				} else if (numSegmentFromPath == numSegment)
-//					url.append(webProjectURL);
-//			}
-//		}
-//		if (url.length() < 1) {
-//			IWorkspaceRoot workspace = getWorkspaceRoot();
-//			url.append(getResourceURI(workspace.getFile(absolutePath)));
-//		}
-//		Log log = new EclipseLog();
-//		log.log(Log.INFO, 5038, ResourceUtils.class, "getURLFromPath",
-//				"absolutePath=" + absolutePath + ",url=" + url);
-//
-//		return url.toString();
-//	}
-
-	/**
-	 * Copies a set of files from a plugin's installation location to a native
-	 * directory. The files are named in an index file located relative to the
-	 * plugin's installation location.
-	 * 
-	 * @param plugin
-	 *            The plugin containing the files to copy. Must not be null.
-	 * @param sourcePath
-	 *            The path, relative to the <code>plugin</code> install
-	 *            location, containing the files to copy. If null, then the
-	 *            plugin install location is the source path (ie. null is
-	 *            equivalent to ".").
-	 * @param indexPathname
-	 *            A file containing a whitespace-delimitted list of pathnames of
-	 *            the files to copy. The pathnames are relative to the
-	 *            <code>plugin sourcePath</code>. Must not be null.
-	 * @param targetPath
-	 *            The absolute path of the native directory to which the files
-	 *            will be copied. The relative pathnames of the files named in
-	 *            the <code>indexPathname</code> file are preserved. Must not
-	 *            be null.
-	 * @param progressMonitor
-	 *            The progress monitor for the operation, or null.
-	 * @throws IOException
-	 *             An exception indicating an IO error has occured.
-	 */
-	static public void copyIndexedFilesToOS(Plugin plugin, IPath sourcePath,
-			IPath indexPathname, IPath targetPath,
-			IProgressMonitor progressMonitor) throws IOException {
-		InputStream input = plugin.openStream(indexPathname);
-		Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
-		copyEnumeratedFilesToOS(plugin, sourcePath, filenames, targetPath,
-				progressMonitor);
-	}
-
-	/**
-	 * Copies a set of files from a plugin's installation location to a native
-	 * directory. The files are named in an enumeration.
-	 * 
-	 * @param plugin
-	 *            The plugin containing the files to copy. Must not be null.
-	 * @param sourcePath
-	 *            The path, relative to the <code>plugin</code> install
-	 *            location, containing the files to copy. If null, then the
-	 *            plugin install location is the source path (ie. null is
-	 *            equivalent to ".").
-	 * @param pathnames
-	 *            An enumeration of pathnames of the files to copy. The
-	 *            pathnames are relative to the <code>plugin sourcePath</code>.
-	 *            Must not be null.
-	 * @param targetPath
-	 *            The absolute path of the native directory to which the files
-	 *            will be copied. The relative pathnames of the files named in
-	 *            the <code>pathnames</code> enumeration are preserved. Must
-	 *            not be null.
-	 * @param progressMonitor
-	 *            The progress monitor for the operation, or null.
-	 * @throws IOException
-	 *             An exception indicating an IO error has occured.
-	 */
-	static public void copyEnumeratedFilesToOS(Plugin plugin, IPath sourcePath,
-			Enumeration pathnames, IPath targetPath,
-			IProgressMonitor progressMonitor) throws IOException {
-		while (pathnames.hasMoreElements()) {
-			String filename = (String) pathnames.nextElement();
-			copyFileToOS(plugin, sourcePath, new Path(filename), targetPath,
-					progressMonitor);
-		}
-	}
-
-	/**
-	 * Copies a file from a plugin's installation location to a native
-	 * directory.
-	 * 
-	 * @param plugin
-	 *            The plugin containing the files to copy. Must not be null.
-	 * @param sourcePath
-	 *            The path, relative to the <code>plugin</code> install
-	 *            location, containing the files to copy. If null, then the
-	 *            plugin install location is the source path (ie. null is
-	 *            equivalent to ".").
-	 * @param pathname
-	 *            The pathname of the file to copy. The pathname is relative to
-	 *            the <code>plugin sourcePath</code>. Must not be null.
-	 * @param targetPath
-	 *            The absolute path of the native directory to which the file
-	 *            will be copied. The relative pathname of the file is
-	 *            preserved. Must not be null.
-	 * @param progressMonitor
-	 *            The progress monitor for the operation, or null.
-	 * @throws IOException
-	 *             An exception indicating an IO error has occured.
-	 */
-	static public void copyFileToOS(Plugin plugin, IPath sourcePath,
-			IPath pathname, IPath targetPath, IProgressMonitor progressMonitor)
-			throws IOException {
-		IPath target = targetPath.append(pathname);
-		IPath source = sourcePath == null ? pathname : sourcePath
-				.append(pathname);
-		InputStream input = plugin.openStream(source);
-		OutputStream output = new FileOutputStream(target.toOSString());
-		copyStream(input, output);
-		input.close();
-		output.close();
-	}
-
-	/**
-	 * Copies data from one stream to another.
-	 * 
-	 * @param input
-	 *            The input stream.
-	 * @param output
-	 *            The output stream.
-	 * @return The number of bytes copied.
-	 * @throws IOException
-	 *             An exception if an error occurs while processing either of
-	 *             the streams.
-	 */
-	static public int copyStream(InputStream input, OutputStream output)
-			throws IOException {
-		int t = 0;
-		byte[] buffer = new byte[1024];
-		int n = input.read(buffer);
-		while (n >= 0) {
-			output.write(buffer, 0, n);
-			t += n;
-			n = input.read(buffer);
-		}
-		return t;
-	}
-
-	/**
-	 * Creates a native directory path equal to the parent portion of the given
-	 * <code>pathname</code>. If the directory already exists, then no action
-	 * is taken.
-	 * 
-	 * @param pathname
-	 *            The pathname to the file whose parent directory should be
-	 *            created.
-	 * @throws IOException
-	 *             An exception if an IO error occurs.
-	 */
-	static public void createParentDirectoryFor(String pathname)
-			throws IOException {
-		File file = new File(pathname);
-		File parent = file.getParentFile();
-		if (parent != null) {
-			parent.mkdirs();
-		}
-	}
-
-	/**
-	 * Returns the IResource represented by the given selection.
-	 * 
-	 * @param object
-	 *            The selection
-	 * @return IResource if the selection represents an IResource. Returns null
-	 *         otherwise.
-	 * @throws CoreException
-	 */
-	static public IResource getResourceFromSelection(Object obj)
-			throws CoreException {
-		IResource res = null;
-		if (obj != null) {
-			if (obj instanceof IResource) {
-				res = (IResource) obj;
-			} else if (obj instanceof IJavaElement) {
-				IJavaElement javaElement = (IJavaElement) obj;
-				res = javaElement.getCorrespondingResource();
-			} else if (obj instanceof EnterpriseBean) {
-				EnterpriseBean ejbBean = (EnterpriseBean) obj;
-				IProject ejbProject = ProjectUtilities.getProject(ejbBean);
-				if (ejbProject != null)
-					res = ejbProject;
-			}
-
-		}
-
-		return res;
-	}
-
-	//----------------------------------------------------------------------
-	// Naughty bits...
-	//----------------------------------------------------------------------
-
-	//
-	// Creates a path of folders.
-	// Do not call with an absolutePath of less than one segment.
-	//
-	//  private static IContainer makeFolderPath (
-	//        ResourceContext resourceContext,
-	//    IPath absolutePath,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    if (absolutePath.segmentCount() <= 1)
-	//    {
-	//      return getWorkspaceRoot().getProject(absolutePath.segment(0));
-	//    }
-	//    else
-	//    {
-	//      IContainer parent = makeFolderPath(resourceContext,
-	// absolutePath.removeLastSegments(1), progressMonitor, statusMonitor);
-	//      String folderName = absolutePath.lastSegment();
-	//      return makeFolder(resourceContext, parent,folderName, progressMonitor ,
-	// statusMonitor);
-	//    }
-	//  }
-	//
-	// Creates a folder under a container.
-	// The container must already exist.
-	//
-	// private static IFolder makeFolder (
-	//        ResourceContext resourceContext,
-	//    IContainer parent,
-	//    String folderName,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    IResource child = parent.findMember(folderName);
-	//    if (child == null)
-	//    {
-	//      if (!resourceContext.isCreateFoldersEnabled()) {
-	//        int result = statusMonitor.reportStatus(new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                         WebServicePlugin.getMessage("%MSG_ERROR_FOLDER_CREATION_DISABLED",
-	//                                                         new Object[] {parent.getFullPath().toString(),folderName}),null),
-	// getThreeStateFileOptions());
-	//        if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return null;
-	//
-	//          if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                        resourceContext.setCreateFoldersEnabled(true);
-	//
-	//      }
-	//      IFolder folder = parent.getFolder(new Path(folderName));
-	//      folder.create(true,true,progressMonitor);
-	//      return folder;
-	//    }
-	//    else if (child.getType() == IResource.FOLDER)
-	//    {
-	//      return (IFolder)child;
-	//    }
-	//    else
-	//    {
-	//      throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FOLDER",new
-	// Object[] {parent.getFullPath().append(folderName).toString()}),null));
-	//    }
-	//  }
-
-	//
-	// Creates a file under a container.
-	// The container must already exist.
-	//
-	// private static IFile makeFile (
-	//    ResourceContext resourceContext,
-	//    IContainer parent,
-	//    String fileName,
-	//    InputStream inputStream,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    IResource child = parent.findMember(fileName);
-	//    if (child != null)
-	//    {
-	//      if (child.getType() == IResource.FILE)
-	//      {
-	//        if (!resourceContext.isOverwriteFilesEnabled()) {
-	//          int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                         WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
-	//                                                         new Object[] {parent.getFullPath().toString(),fileName}),null),
-	// getThreeStateFileOptions());
-	//
-	//          if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return null;
-	//
-	//          if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                        resourceContext.setOverwriteFilesEnabled(true);
-	//        }
-	//        //We have permission to overwrite so check if file is read-only
-	//        if (child.isReadOnly())
-	//        {
-	//          if (!resourceContext.isCheckoutFilesEnabled()) {
-	//
-	//            int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                         WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
-	//                                                         new Object[] {parent.getFullPath().toString(),fileName}),null),
-	// getThreeStateFileOptions());
-	//
-	//            if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return null;
-	//
-	//            if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                        resourceContext.setCheckoutFilesEnabled(true);
-	//          }
-	//
-	//          IFile[] files = new IFile[1];
-	//          files[0] = (IFile)child;
-	//
-	//          if (
-	// !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
-	//                                return null;
-	//        }
-	//
-	//        //Change the contents of the existing file.
-	//            IFile file = parent.getFile(new Path(fileName));
-	//        file.setContents(inputStream,true,true,progressMonitor);
-	//        return file;
-	//
-	//      }
-	//      else
-	//      {
-	//        throw new CoreException(new
-	// Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FILE",new
-	// Object[] {parent.getFullPath().append(fileName)}),null));
-	//      }
-	//    }
-	//    else
-	//    {
-	//        //Create a new file.
-	//        IFile file = parent.getFile(new Path(fileName));
-	//        file.create(inputStream,true,progressMonitor);
-	//        return file;
-	//    }
-	//  }
-
-	/**
-	 * Deletes a file under a container. The container must already exist.
-	 * 
-	 * @param file -
-	 *            the IFile to be deleted
-	 * @param progressMonitor
-	 * @param statusMonitor
-	 * @return True if the file does not exist or if it exists and is
-	 *         successfully deleted. False otherwise.
-	 */
-	//  public static boolean deleteFile (
-	//        ResourceContext resourceContext,
-	//    IFile file,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor )
-	//    throws CoreException
-	//    {
-	//        if (file.exists())
-	//        {
-	//                if (!resourceContext.isOverwriteFilesEnabled()) {
-	//                        int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                                 WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
-	//                                                                 new Object[]
-	// {file.getParent().getFullPath().toString(),file.getName()}),null),
-	// getThreeStateFileOptions());
-	//
-	//                            if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return false;
-	//
-	//                if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                                resourceContext.setOverwriteFilesEnabled(true);
-	//                        }
-	//                //We have permission to overwrite so check if file is read-only
-	//                if (file.isReadOnly())
-	//                {
-	//                        if (!resourceContext.isCheckoutFilesEnabled()) {
-	//                                        int result = statusMonitor.reportStatus( new
-	// Status(IStatus.WARNING,WebServicePlugin.ID,0,
-	//                                                                 WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
-	//                                                                 new Object[]
-	// {file.getParent().getFullPath().toString(),file.getName()}),null),
-	// getThreeStateFileOptions());
-	//                        if (result == IStatusDialogConstants.CANCEL_ID)
-	//                        return false;
-	//
-	//                        if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
-	//                                resourceContext.setCheckoutFilesEnabled(true);
-	//
-	//                                }
-	//                        IFile[] files = new IFile[1];
-	//                        files[0] = file;
-	//
-	//                        if (
-	// !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
-	//                                            return false;
-	//                }
-	//                file.delete(true,progressMonitor);
-	//                }
-	//        //At this point, either the file did not exist or we successfully deleted
-	// it. Return success.
-	//        return true;
-	//  }
-	/**
-	 * Deletes a folder under a container.
-	 * 
-	 * @param folder -
-	 *            the IFolder to be deleted
-	 * @param progressMonitor
-	 * @param statusMonitor
-	 * @return True if the folder does not exist or if it exists and is
-	 *         successfully deleted along with its members. False otherwise.
-	 */
-	//  public static boolean deleteFolder (
-	//    ResourceContext resourceContext,
-	//    IFolder folder,
-	//    IProgressMonitor progressMonitor,
-	//    StatusMonitor statusMonitor
-	//  )
-	//  throws CoreException
-	//  {
-	//    if (!folder.exists()) return true;
-	//
-	//    boolean deleted = true;
-	//    IResource[] resources = folder.members();
-	//    for (int i=0; i<resources.length; i++)
-	//    {
-	//      IResource resource = resources[i];
-	//      if (resource instanceof IFile)
-	//      {
-	//        deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor,
-	// statusMonitor);
-	//      }
-	//      if (resource instanceof IFolder)
-	//      {
-	//        deleted = deleteFolder( resourceContext, (IFolder)resource,
-	// progressMonitor, statusMonitor);
-	//      }
-	//
-	//      if (!deleted) break;
-	//    }
-	//    if (deleted) {
-	//      folder.delete(true, true, progressMonitor);
-	//      return true;
-	//    }
-	//    else
-	//      return false;
-	//
-	//  }
-	/**
-	 * Deletes a set of files that are named in an index file located relative
-	 * to the plugin's installation location.
-	 * 
-	 * @param plugin
-	 *            The plugin containing the indexed file Must not be null.
-	 * @param sourcePath -
-	 *            relative path of the indexed file passing a null in has the
-	 *            same effect as passing a "." in
-	 * @param indexFilePath -
-	 *            the indexed filename Must not be null
-	 * @param targetPath -
-	 *            path containing the files named in the indexed file Must not
-	 *            be null, this path must end with a trailing separator
-	 * @param progressMonitor
-	 */
-	//  public static void deleteIndexFilesFromOS (
-	//    Plugin plugin,
-	//    IPath indexFilePath,
-	//    IPath targetPath
-	//  )
-	//  throws IOException {
-	//    InputStream input = plugin.openStream(indexFilePath);
-	//    Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
-	//    while (filenames.hasMoreElements()) {
-	//      File targetFile =
-	// targetPath.append((String)filenames.nextElement()).toFile();
-	//      if (targetFile.exists())
-	//        targetFile.delete();
-	//    }
-	//  }
-	/**
-	 * Returns a URI reference to the given Eclipse resource, or null if no such
-	 * reference can be determined (for example, if the resource does not exist
-	 * in the underlying filesystem).
-	 * 
-	 * @param resource
-	 *            The resource.
-	 * @return The URI as a string, or null if there is no URI to the resource.
-	 */
-	public static String getResourceURI(IResource resource) {
-		String uri = null;
-		IPath location = resource.getLocation();
-		if (location != null) {
-			uri = "file:" + location.toString();
-		}
-		return uri;
-	}
-
-	/**
-	 * Returns a URI reference to the given Eclipse resource using the
-	 * "platform:" protocol, or null if no such reference can be determined (for
-	 * example, if the resource does not exist in the underlying filesystem).
-	 * 
-	 * @param resource
-	 *            The resource.
-	 * @return The URI as a string, or null if there is no URI to the resource.
-	 */
-	public static String getPlatformResourceURI(IResource resource) {
-		String uri = null;
-		IPath location = resource.getFullPath();
-		if (location != null) {
-			uri = "platform:/resource" + location.toString();
-		}
-		return uri;
-	}
-
-	/**
-	 * Returns the default binding namespace string given a Java bean name
-	 * (using the convention used by CTC in GM). e.g. Java bean MyClass result
-	 * in binding namespace of
-	 * "http://www.myclass.com/definitions/MyClassRemoteInterface"
-	 * 
-	 * @param beanName
-	 *            The java bean.
-	 * @return The binding namespace as a string.
-	 */
-	public static String getBindingNamespace(String beanName) {
-		return "http://www." + beanName.toLowerCase() + ".com/definitions/"
-				+ beanName + "RemoteInterface";
-	}
-
-	/**
-	 * Returns the default schema namespace string given a Java bean name (using
-	 * the convention used by CTC in GM). e.g. Java bean MyClass result in
-	 * schema namespace of
-	 * "http://www.myclass.com/schemas/MyClassRemoteInterface"
-	 * 
-	 * @param beanName
-	 *            The java bean.
-	 * @return The schemas namespace as a string.
-	 */
-	public static String getSchemaNamespace(String beanName) {
-		return "http://www." + beanName.toLowerCase() + ".com/schemas/"
-				+ beanName + "RemoteInterface";
-	}
-
-	//  public static Vector getThreeStateFileOptions() {
-	//        Vector options = new Vector();
-	//    options.add(new
-	// StatusOption(IStatusDialogConstants.YES_ID,IStatusDialogConstants.YES_LABEL,"",""));
-	//    options.add(new
-	// StatusOption(IStatusDialogConstants.YES_TO_ALL_ID,IStatusDialogConstants.YES_TO_ALL_LABEL,"",""));
-	//    options.add(new
-	// StatusOption(IStatusDialogConstants.CANCEL_ID,IStatusDialogConstants.CANCEL_LABEL,"",""));
-	//    return options;
-	//  }
-
-	//----------------------------------------------------------------------
-
-	/**
-	 * Gets the SOAP rpcrouter servlet URL for the service project
-	 * 
-	 * @param project
-	 *            The project.
-	 * @param serverFactoryId
-	 *            The server factory id
-	 * @param server
-	 *            The server
-	 * @return The URL, possibly null.
-	 */
-
-	public static String getServletURL(IProject project,
-			String serverFactoryId, IServer server) {
-		return getServletURL(getWebProjectURL(project, serverFactoryId, server));
-	}
-
-	public static String getServletURL(String webProjectURL) {
-		if (webProjectURL == null)
-			return null;
-		else
-			return webProjectURL + SERVLET_EXT;
-	}
-
-	/**
-	 * Gets the client Web project name
-	 * 
-	 * @param projectName
-	 *            The project name to base on.
-	 * @param typeId the webservice type id.
-	 * @return The client Web project name.
-	 * 
-	 * @deprecated
-	 */
-	public static String getClientWebProjectName(String projectName, String typeId) 
-	{
-		String   baseClientWebProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-		IPath    projectPath;
-		IProject project;
-		boolean  foundWebProject     = false;
-		int      i                   = 1;
-		
-		if( isSkeletonEJBType( typeId ) )
-		{
-		  // For the skeleton EJB scenario we need to create a slightly different
-		  // base name.  When the EJB project is created another project
-		  // is created with "Client" tacked onto the end.  We will
-		  // add "WS" to our client so we don't collide with the other
-		  // client project.
-		  baseClientWebProjectName = projectName + "WS" + DEFAULT_CLIENT_WEB_PROJECT_EXT;    
-		}
-		
-		String  clientWebProjectName = baseClientWebProjectName;
-		
-		while (!foundWebProject) 
-		{
-		  projectPath = new Path(clientWebProjectName).makeAbsolute();
-		  project = ResourceUtils.getProjectOf(projectPath);
-		  
-		  if (project.exists() && !ResourceUtils.isWebProject(project)) 
-		  {
-			clientWebProjectName = baseClientWebProjectName + i;
-			i++;
-		  }
-		  else 
-		  {
-			foundWebProject = true;
-		  }
-		}
-		
-		return clientWebProjectName;
-	}
-
-  public static String[] getClientProjectComponentName(String projectName, String componentName, boolean isEJB)
-  {
-    String clientProjectName = null;
-    String clientComponentName = null;
-    if (isEJB)
-    {
-      clientProjectName = projectName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
-      clientComponentName = componentName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
-    }
-    else
-    {
-      clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-//      String baseName = clientProjectName;
-      clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-//      String baseCompName = clientComponentName;
-    }
-    
-    //TODO we may want to remove this if statement once defect 103366 is resolved.
-    //TODO:  Defect 107997 - Revisit prject and module creation logic
-//    if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
-//    {
-//      clientComponentName = clientProjectName;	
-//    }
-    
-//    boolean  foundWebProject     = false;
-//    int      i                   = 1;
-//    
-//    while (!foundWebProject) 
-//    {
-//      IPath projectPath = new Path(clientProjectName).makeAbsolute();
-//      IProject project = ResourceUtils.getProjectOf(projectPath);
-//      
-//      if (project.exists()) 
-//      {
-//        clientProjectName = baseName + i;
-//        clientComponentName = baseCompName + i;
-//        i++;
-//      }
-//      else 
-//      {
-//        foundWebProject = true;
-//      }
-//    }
-    
-    return new String[]{clientProjectName, clientComponentName};
-  }
-  
-    /**
-     * 
-     * @param typeID
-     * @return
-     * 
-     * @deprecated
-     */
-	public static boolean isSkeletonEJBType( String typeID )
-	{
-	  return typeID.equals( "org.eclipse.jst.ws.type.wsdl.ejb" );    
-	}
-	
-	public static String getDefaultEJBProjectName() {
-		return DEFAULT_EJB_PROJECT_NAME;
-	}
-  
-  public static String getDefaultEJBComponentName() {
-    return DEFAULT_EJB_COMPONENT_NAME;
-  }  
-
-	public static String getDefaultWebProjectName() {
-		return DEFAULT_WEB_PROJECT_NAME;
-	}
-  
-  public static String getDefaultWebComponentName() {
-    return DEFAULT_WEB_COMPONENT_NAME;
-  }
-
-  public static String getDefaultClientExtension() {
-    return DEFAULT_CLIENT_WEB_PROJECT_EXT;
-  }
-  
-	/**
-	 * 
-	 * @param projectName
-	 * @return
-	 * 
-	 */
-	public static String getRouterProjectName(String projectName) {
-		return projectName + DEFAULT_ROUTER_PROJECT_EXT;
-	}
-
-	public static String getDefaultServiceEARProjectName() {
-		return DEFAULT_SERVICE_EAR_PROJECT_NAME;
-	}
-  
-  public static String getDefaultServiceEARComponentName() {
-    return DEFAULT_SERVICE_EAR_COMPONENT_NAME;
-  }
-
-	public static String getDefaultClientEARProjectName() {
-		return DEFAULT_CLIENT_EAR_PROJECT_NAME;
-	}
-
-  public static String getDefaultClientEARComponentName() {
-    return DEFAULT_CLIENT_EAR_COMPONENT_NAME;
-  }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
deleted file mode 100644
index dcab1439a..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,69 +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.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class SelectionToResource implements Transformer
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform(Object value)
-  {
-    IStructuredSelection selection = (IStructuredSelection)value;
-    IResource            resource  = null;
-    
-    if( selection != null )
-    {
-      Object object = selection.getFirstElement();
-      
-      if( object != null )
-      {
-        if( object instanceof IResource)
-        {
-          resource = (IResource)object;
-        }
-        else if( object instanceof ICompilationUnit )
-        {
-          ICompilationUnit compUnit = (ICompilationUnit)object;
-          
-          try
-          {
-            resource = compUnit.getCorrespondingResource();
-          }
-          catch( JavaModelException exc)
-          {
-          }
-        }
-        else if( object instanceof EnterpriseBean ) 
-        {
-          EnterpriseBean ejbBean    = (EnterpriseBean)object;
-          IProject       ejbProject = ProjectUtilities.getProject( ejbBean );
-          
-          if( ejbProject != null )
-          {
-            resource = ejbProject;
-          }
-        }
-      }
-    }
-
-    return resource;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
deleted file mode 100644
index 3c36524f3..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,730 +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.common;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Server plugin functions
- */
-public final class ServerUtils {
-
-	private MessageUtils msgUtils_;
-
-	private Hashtable serverIdToLabel_;
-
-	private Hashtable serverLabelToId_;
-
-	private static ServerUtils instance_;
-
-	public static ServerUtils getInstance() {
-		if (instance_ == null) {
-			instance_ = new ServerUtils();
-		}
-		return instance_;
-
-	}
-
-	public ServerUtils() {
-		String pluginId = "org.eclipse.jst.ws";
-		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	}
-
-	// Gets the Server labels given the server factory id
-	public void getServerLabelsAndIds() {
-		serverIdToLabel_ = new Hashtable();
-		serverLabelToId_ = new Hashtable();
-		IServerType[] serverTypes = ServerCore.getServerTypes();
-		for (int idx = 0; idx < serverTypes.length; idx++) {
-
-			IServerType serverType = (IServerType) serverTypes[idx];
-
-			String id = serverType.getId();
-			String serverLabel = serverType.getName();
-			if (!(id == null) && !(serverLabel == null)) {
-				serverIdToLabel_.put(id, serverLabel);
-				serverLabelToId_.put(serverLabel, id);
-			}
-		}
-	}
-
-	public String getServerLabelForId(String factoryId) {
-		if (serverIdToLabel_ == null)
-			this.getServerLabelsAndIds();
-		return (String) serverIdToLabel_.get(factoryId);
-	}
-
-	public String getServerIdForLabel(String factoryLabel) {
-		if (serverLabelToId_ == null)
-			this.getServerLabelsAndIds();
-		return (String) serverLabelToId_.get(factoryLabel);
-	}
-
-	public IStatus modifyModules(Environment env, IServer server,
-			IModule module, boolean add, IProgressMonitor monitor) {
-
-		IServerWorkingCopy wc = null;
-		IStatus status = Status.OK_STATUS;
-    
-		try {
-
-			if (module == null || !module.getProject().exists()) {
-				return status;
-			}
-
-			// check if module is a true Java project
-			if (module instanceof IModule) {
-				IModule pm = (IModule) module;
-				if (pm != null) {
-					IProject project = pm.getProject();
-					if (project == null
-							|| ResourceUtils.isTrueJavaProject(project)) {
-						return status;
-					}
-				}
-			}
-
-			wc = server.createWorkingCopy();
-			if (wc != null) {
-//				Object x = server.getAdapter(IRunningActionServer.class);
-//				if (x != null && x instanceof IRunningActionServer) {
-//					int state = server.getServerState();
-//					if (state == IServer.STATE_STOPPED
-//							|| state == IServer.STATE_UNKNOWN) {
-//						String mode = ILaunchManager.RUN_MODE;
-//						server.synchronousStart(mode, monitor);
-//					}
-//				}
-
-				List list = Arrays.asList(server.getModules());
-				if (add) {
-					if (!list.contains(module)) {
-						ServerUtil.modifyModules(wc, new IModule[] { module },
-								new IModule[0], monitor);
-					}
-				} else { // removes module
-					if (list.contains(module)) {
-						ServerUtil.modifyModules(wc, new IModule[0],
-								new IModule[] { module }, monitor);
-					}
-				}
-			} else {
-				// handle case of Null WC; non-issue for now
-			}
-		} 
-    catch (CoreException exc ) 
-    {
-			status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), exc );
-			env.getStatusHandler().reportError(status);
-			return status;
-		} finally {
-			if (wc != null) {
-				// Always saveAll and release the serverWorkingCopy
-				try 
-        {
-					wc.saveAll(true, monitor);
-				} 
-        catch (CoreException exc ) 
-        {
-					status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), exc );
-					env.getStatusHandler().reportError(status);
-					return status;
-				}
-			}
-		}
-		return status;
-	}
-
-	public static IServer getServerForModule(IModule module, String serverTypeId, 
-								IServer server, boolean create, IProgressMonitor monitor) {
-		if (server != null)
-			return server;
-		else
-			return getServerForModule(module, serverTypeId, create, monitor);
-	}
-
-	public static IServer getServerForModule(IModule module,
-			String serverTypeId, boolean create, IProgressMonitor monitor) {
-		try {
-
-			IServer[] servers = ServerUtil.getServersByModule(module, monitor);
-
-			if (servers != null && servers.length > 0) {
-				if (serverTypeId == null || serverTypeId.length() == 0)
-					return servers[0]; // WSAD v4 behavior
-
-				for (int i = 0; i < servers.length; i++) {
-					if (servers[i].getServerType().getId().equalsIgnoreCase(
-							serverTypeId))
-						return servers[i];
-				}
-			}
-
-			return createServer(module, serverTypeId, monitor);
-
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	public static IServer getServerForModule(IModule module) {
-		try {
-			IServer[] servers = ServerUtil.getServersByModule(module, null);
-			return ((servers != null && servers.length > 0) ? servers[0] : null);
-		} catch (Exception e) {
-			return null;
-		}
-	}
-
-	/**
-	 * 
-	 * @param env
-	 * @param module
-	 * @param serverTypeId
-	 * @param monitor
-	 * @return
-	 * 
-	 * @deprecated
-	 */
-	public IServer createServer(Environment env, IModule module,
-			String serverTypeId, IProgressMonitor monitor) {
-		IServerWorkingCopy serverWC = null;
-		IServer server = null;
-		try {
-			IServerType serverType = ServerCore.findServerType(serverTypeId);
-			serverWC = serverType.createServer(serverTypeId, null, monitor);
-			try {
-				if (serverWC != null) {
-					server = serverWC.saveAll(true, monitor);
-				}
-			} catch (CoreException ce) 
-      {
-				IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), ce);
-				env.getStatusHandler().reportError(status);
-				return null;
-			}
-
-			if (server != null) {
-
-//				Object x = server.getAdapter(IRunningActionServer.class);
-//				if (x != null && x instanceof IRunningActionServer) {
-//					int state = server.getServerState();
-//					if (state == IServer.STATE_STOPPED
-//							|| state == IServer.STATE_UNKNOWN) {
-//						String mode = ILaunchManager.RUN_MODE;
-//						server.synchronousStart(mode, monitor);
-//					}
-//				}
-
-				if (module != null && module.getProject().exists()) {
-					IModule[] parentModules = server.getRootModules(module,
-							monitor);
-					if (parentModules != null && parentModules.length != 0) {
-						module = (IModule) parentModules[0];
-					}
-					serverWC.modifyModules(new IModule[] { module },
-							new IModule[0], monitor);
-				}
-
-			}
-
-			return server;
-		} 
-    catch (Exception e) 
-    {
-			IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), e);
-			env.getStatusHandler().reportError(status);
-			return null;
-		} finally {
-			try {
-				if (serverWC != null) {
-					serverWC.saveAll(true, monitor);
-				}
-			} catch (CoreException ce) {
-				IStatus status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_SERVER"), ce);
-				env.getStatusHandler().reportError(status);
-				return null;
-			}
-		}
-	}
-
-	/**
-	 * createServer This creates a server but does not report errors. @param
-	 * module 
-	 * @param serverTypeId 
-	 * @param monitor progress monitor 
-	 * @return IServer returns null if unsuccessful
-	 * 
-	 * @deprecated
-	 */
-	public static IServer createServer(IModule module, String serverTypeId,
-			IProgressMonitor monitor) {
-		IServerWorkingCopy serverWC = null;
-		IServer server = null;
-		try {
-			IServerType serverType = ServerCore.findServerType(serverTypeId);
-			serverWC = serverType.createServer(serverTypeId, null, monitor);
-
-			try {
-				if (serverWC != null) {
-					server = serverWC.saveAll(true, monitor);
-				}
-			} catch (CoreException ce) {
-				return null;
-			}
-
-			if (server != null) {
-
-//				Object x = server.getAdapter(IRunningActionServer.class);
-//				if (x != null && x instanceof IRunningActionServer) {
-//					int state = server.getServerState();
-//					if (state == IServer.STATE_STOPPED
-//							|| state == IServer.STATE_UNKNOWN) {
-//						String mode = ILaunchManager.RUN_MODE;
-//						server.synchronousStart(mode, monitor);
-//					}
-//				}
-				if (module != null) {
-					IModule[] parentModules = server.getRootModules(module,
-							monitor);
-					if (parentModules != null && parentModules.length != 0) {
-						module = (IModule) parentModules[0];
-					}
-					serverWC.modifyModules(new IModule[] { module },
-							new IModule[0], monitor);
-				}
-
-			}
-
-			return server;
-		} catch (Exception e) {
-			return null;
-		} finally {
-			try {
-				if (serverWC != null) {
-					serverWC.saveAll(true, monitor);
-				}
-			} catch (CoreException ce) {
-				return null;
-				// handler core exception
-			}
-		}
-	}
-
-	public static String[] getServerTypeIdsByModule(IVirtualComponent component) {
-		IProject project = component.getProject();
-		String[] serverIds = null;
-
-		if (project != null) {
-			IServer[] servers = ServerUtil.getServersByModule(getModule(project, component.getName()), null);
-			if (servers != null) {
-				serverIds = new String[servers.length];
-
-				for (int index = 0; index < servers.length; index++) {
-					serverIds[index] = servers[index].getId();
-
-				}
-			}
-		}
-
-		if (serverIds == null) {
-			serverIds = new String[0];
-		}
-
-		return serverIds;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 * @deprecated should be using getServerTypeIdsByModule( IVirtualComponent )
-	 */
-	public static String[] getServerTypeIdsByModule(IProject project) {
-		Vector serverIds = new Vector();
-		if (project != null) {
-			IServer[] servers = ServerUtil.getServersByModule(ResourceUtils
-					.getModule(project), null);
-			if (servers != null && servers.length > 0) {
-				for (int i = 0; i < servers.length; i++) {
-					serverIds.add(servers[i].getId());
-				}
-			}
-		}
-		return (String[]) serverIds.toArray(new String[serverIds.size()]);
-	}
-
-	public static IModule getModule(IProject project, String componentName) {
-		IModule[] modules = ServerUtil.getModules(project);
-		IModule moduleFound = null;
-
-		for (int index = 0; index < modules.length; index++) {
-			if (modules[index].getName().equals(componentName)) {
-				moduleFound = modules[index];
-				break;
-			}
-		}
-
-		return moduleFound;
-	}
-  
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * component in a server instance or null if the project has no Web nature
-	 * or has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 */
-	public static String getWebComponentURL(IProject project, String componentName) {
-		String webProjectURL = null;
-		IModule module = getModule(project, componentName);
-		if (module != null) {
-			IServer serverInstance = getServerForModule(module);
-			if (serverInstance != null) {
-				IURLProvider urlProvider = (IURLProvider) serverInstance.loadAdapter(IURLProvider.class, null);
-				if (urlProvider!=null) {
-					URL url = urlProvider.getModuleRootURL(module);
-					if (url != null) {
-						String s = url.toString();
-						webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
-					}
-				}
-			}
-			else {
-				IRuntime projectTarget = ServerCore.getProjectProperties(project).getRuntimeTarget();
-				if (projectTarget!=null)
-				{
-					String projectTargetId = projectTarget.getRuntimeType().getId();
-					String serverFactoryId = getFactoryIdFromRuntimeTargetId(projectTargetId);
-					IServerType serverType = ServerCore.findServerType(serverFactoryId);
-					try {
-						if (serverType!=null) {
-							IServerWorkingCopy serverWC = serverType.createServer(null, null, projectTarget, null);
-							IURLProvider urlProvider = (IURLProvider) serverWC.loadAdapter(IURLProvider.class, null);
-							if (urlProvider!=null) {
-								URL url = urlProvider.getModuleRootURL(module);							
-								if (url != null) {
-									String s = url.toString();
-									webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
-								}				
-							}
-						}
-					} catch(CoreException ce){
-                        Logger.getLogger().log(ce);
-					}
-					
-				}
-			}
-		}
-		return webProjectURL;
-	}
-
-	/**
-	 * Returns the URL string corresponding to the web server module root of the
-	 * project in a server instance or null if the project has no Web nature or
-	 * has no association to a server instance.
-	 * 
-	 * @param project
-	 *            The project.
-	 * @return The web server module root URL or null if the project has no Web
-	 *         nature or has no association to a server instance.
-	 */
-	public static String getWebComponentURL(IProject project,
-			String componentName, String serverFactoryId, IServer server) {
-
-		String webProjectURL = null;
-		IModule module = getModule(project, componentName);
-		if (module != null) {
-			IServer serverInstance = ServerUtils.getServerForModule(module, serverFactoryId, server, true, new NullProgressMonitor());
-			if (serverInstance != null) {
-                IURLProvider urlProvider = (IURLProvider) serverInstance.loadAdapter(IURLProvider.class, null);
-                if (urlProvider!=null) {
-                    URL url = urlProvider.getModuleRootURL(module);              
-					if (url != null) {
-					  String s = url.toString();
-					  webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
-                    }
-				}
-			}
-		}
-		return webProjectURL;
-	}
-
-	public static String getEncodedWebComponentURL(IProject project, String componentName) {
-		String url = getWebComponentURL(project, componentName);
-		if (url != null) {
-			int index = url.lastIndexOf('/');
-			if (index != -1) {
-				StringBuffer encodedURL = new StringBuffer();
-				encodedURL.append(url.substring(0, index + 1));
-				try {
-					String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
-					int plusIndex = ctxtRoot.indexOf('+');
-					while (plusIndex != -1) {
-						StringBuffer sb = new StringBuffer();
-						sb.append(ctxtRoot.substring(0, plusIndex));
-						sb.append("%20");
-						sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
-							.length()));
-						ctxtRoot = sb.toString();
-						plusIndex = ctxtRoot.indexOf('+');
-					}
-					encodedURL.append(ctxtRoot);
-				}catch (IOException io){
-					//handler exception
-				}				
-				url = encodedURL.toString();
-			}
-		}
-		return url;
-	}	
-
-	public static IServer getDefaultExistingServer(IVirtualComponent component) {
-		IProject project = component.getProject();
-		IModule module = getModule(project, component.getName());
-		IServer preferredServer = ServerCore.getDefaultServer(module);
-		if (preferredServer != null)
-			return preferredServer;
-		
-		IServer[] configuredServers = ServerUtil.getServersByModule(module,
-				null);
-
-		if (configuredServers != null && configuredServers.length > 0) {
-			preferredServer = configuredServers[0];
-		} else {
-			IServer[] nonConfiguredServers = ServerUtil
-					.getAvailableServersForModule(module, false, null);
-
-			if (nonConfiguredServers != null
-					&& nonConfiguredServers.length > 0) {
-				preferredServer = nonConfiguredServers[0];
-			}
-		}
-
-		return preferredServer;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 * @deprecated should be using getDefaultExistingServer( IVirtualComponent )
-	 */
-	public static IServer getDefaultExistingServer(IProject project) {
-    
-        IModule[] modules = ServerUtil.getModules(project);
-        IServer preferredServer = null;
-        if (modules.length > 0){
-          preferredServer = ServerCore.getDefaultServer(modules[0]);
-        }
-  
-		if (preferredServer != null)
-			return preferredServer;
-
-		IServer[] configuredServers = ServerUtil.getServersByModule(
-				ResourceUtils.getModule(project), null);
-		if (configuredServers != null && configuredServers.length > 0) {
-			return configuredServers[0];
-		}
-
-		IServer[] nonConfiguredServers = ServerUtil
-				.getAvailableServersForModule(ResourceUtils.getModule(project),
-						false, null);
-		if (nonConfiguredServers != null && nonConfiguredServers.length > 0) {
-			return nonConfiguredServers[0];
-		}
-		return null;
-	}
-
-	/*
-	 * @param moduleType - ad defined in IServerTargetConstants (i.e. EAR_TYPE,
-	 * WEB_TYPE, etc.) @param j2eeVersion String representation of the int
-	 * values in J2EEVersionConstants i.e. "12" or "13" or "14" @return String
-	 * the id of the server target - to be used in project creation operations.
-	 */
-	public static String getServerTargetIdFromFactoryId(String serverFactoryId,
-			String moduleType, String j2eeVersion) {
-		IServerType serverType = ServerCore.findServerType(serverFactoryId);
-		if (serverType == null)
-			return null;
-
-		String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-
-		String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-        List runtimes = Arrays.asList(ServerUtil.getRuntimes(moduleType, stJ2EEVersion));    
-		for (int i = 0; i < runtimes.size(); i++) {
-			IRuntime runtime = (IRuntime) runtimes.get(i);
-			String thisRuntimeTypeId = runtime.getRuntimeType().getId();
-			if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) {
-				return runtime.getId();
-			}
-		}
-
-		return null;
-	}
-
-	/*
-	 * @param serverFactoryId the server's factory id @returns the runtime type
-	 * id given the server's factory id. Returns a blank String if the no
-	 * ServerType exists for the given factory id.
-	 */
-	public static String getRuntimeTargetIdFromFactoryId(String serverFactoryId) {
-		IServerType serverType = ServerCore.findServerType(serverFactoryId);
-		if (serverType != null) {
-			String serverRuntimeId = serverType.getRuntimeType().getId();
-			return serverRuntimeId;
-		} else
-			return "";
-	}
-	
-	public static String getFactoryIdFromRuntimeTargetId(String runtimeTargetId){
-		IServerType[] serverTypes = ServerCore.getServerTypes();
-		for (int i=0;i<serverTypes.length;i++) {
-			IRuntimeType runtimeTyp = serverTypes[i].getRuntimeType();
-			if (runtimeTyp!=null){
-				if (runtimeTyp.getId().equals(runtimeTargetId))
-					return serverTypes[i].getId();
-			}
-		}
-		return "";
-		
-	}
-	
-
-	/*
-	 * @param serverFactoryId the server's factory id @returns the server type
-	 * id given the server's factory id. Returns a blank String if the no
-	 * ServerType exists for the given factory id.
-	 */
-	public static String getServerTypeIdFromFactoryId(String serverFactoryId) {
-		IServerType serverType = ServerCore.findServerType(serverFactoryId);
-		if (serverType != null) {
-			String serverTypeId = serverType.getId();
-			return serverTypeId;
-		} else
-			return "";
-	}
-
-	/*
-	 * @param j2eeVersion String representation of the int values in
-	 * J2EEVersionConstants i.e. "12" or "13" or "14"
-	 */
-	public static boolean isTargetValidForEAR(String runtimeTargetId,
-			String j2eeVersion) {
-		if (runtimeTargetId == null)
-			return false;
-
-		String earModuleType = IServerTargetConstants.EAR_TYPE;
-		String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-        List runtimes = Arrays.asList(ServerUtil.getRuntimes(earModuleType, stJ2EEVersion));
-		for (int i = 0; i < runtimes.size(); i++) {
-			IRuntime runtime = (IRuntime) runtimes.get(i);
-			String thisId = runtime.getRuntimeType().getId();
-			if (thisId.equals(runtimeTargetId))
-				return true;
-		}
-
-		return false;
-	}
-
-	/*
-	 * @param j2eeVersion String representation of the int values in
-	 * J2EEVersionConstants i.e. "12" or "13" or "14" @param the project type
-	 * from IServerTargetConstants
-	 */
-	public static boolean isTargetValidForProjectType(String runtimeTargetId,
-			String j2eeVersion, String projectType) {
-		if (runtimeTargetId == null)
-			return false;
-
-		if (projectType == null || projectType.length() == 0)
-			return false;
-
-		String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
-        List runtimes = Arrays.asList(ServerUtil.getRuntimes(projectType, stJ2EEVersion));    
-		for (int i = 0; i < runtimes.size(); i++) {
-			IRuntime runtime = (IRuntime) runtimes.get(i);
-			String thisId = runtime.getRuntimeType().getId();
-			if (thisId.equals(runtimeTargetId))
-				return true;
-		}
-
-		return false;
-	}
-
-	public static String getServerTargetJ2EEVersion(String j2eeVersion) {
-
-		if (j2eeVersion == null || j2eeVersion.length() == 0)
-			return null;
-
-		int j2eeVersionInt = Integer.parseInt(j2eeVersion);
-		switch (j2eeVersionInt) {
-		case (J2EEVersionConstants.J2EE_1_2_ID):
-			return IServerTargetConstants.J2EE_12;
-		case (J2EEVersionConstants.J2EE_1_3_ID):
-			return IServerTargetConstants.J2EE_13;
-		case (J2EEVersionConstants.J2EE_1_4_ID):
-			return IServerTargetConstants.J2EE_14;
-		default:
-			return null;
-		}
-	}
-	
-	//Converts a module type from J2EEUtils to a module type like
-	//the one in IServerTargetConstants.
-	public static String getServerTargetModuleType(int moduleType)
-	{
-		switch (moduleType)
-    {
-    case J2EEUtils.WEB :
-      return IServerTargetConstants.WEB_TYPE;
-    case J2EEUtils.EJB :
-      return IServerTargetConstants.EJB_TYPE;
-    case J2EEUtils.APPCLIENT :
-      return IServerTargetConstants.APP_CLIENT_TYPE;
-    case J2EEUtils.EAR :
-      return IServerTargetConstants.EAR_TYPE;
-    default:
-      return null;
-      
-    }      			
-	}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
deleted file mode 100644
index 1111d76c7..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
+++ /dev/null
@@ -1,140 +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.common;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-public class StatusObjectHandler
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  private static final int MAX_DETAILS = 16;
-
-  public static IStatus generateTreeStatus (IStatus status) 
-  	{
-    //
-    // There could be lots of Throwables, CoreExceptions,
-    // WrappedExceptions and IStatus objects beneath the
-    // given status. Find them.
-    //
-    LinkedList statusList = new LinkedList();
-    appendStatus(MAX_DETAILS, statusList, status, status.getSeverity());
-    if (statusList.size() > 0)
-    {
-      IStatus newStatus = (IStatus)statusList.removeFirst();
-      if (statusList.size() > 0)
-      {
-        IStatus[] secondaryStatusArray = new IStatus[statusList.size()];
-        int n = 0;
-        Iterator i = statusList.iterator();
-        while (i.hasNext())
-        {
-          secondaryStatusArray[n++] = (IStatus)i.next();
-        }
-        newStatus = new MultiStatus(status.getPlugin(),status.getCode(),secondaryStatusArray,status.getMessage(),status.getException());
-      }
-      return newStatus;
-    }
-    else 
-    	return null;
-  }
-
-  //
-  // Appends zero or more IStatus objects to the list of IStatus objects
-  // based upon an IStatus.
-  //
-  private static int appendStatus ( int max, List statusList, IStatus status, int severity )
-  {
-    if (max > 0 && status != null)
-    {
-      //
-      // Append an IStatus object for the given status' message.
-      //
-      if (status.getMessage() != null)
-      {
-        max = append(statusList,max,severity,status.getPlugin(),status.getCode(),status.getMessage(),status.getException());
-      }
-      //
-      // Append the IStatus' Throwable, if any.
-      //
-      max = appendThrowable(max,statusList,status.getException(),severity);
-      //
-      // If the IStatus is a multi status, append the children.
-      //
-      IStatus[] children = status.getChildren();
-      for (int i=0; i<children.length && max>0; i++)
-      {
-        max = appendStatus(max,statusList,children[i],severity);
-      }
-    }
-    return max;
-  }
-
-  //
-  // Appends zero or more IStatus objects to the list of IStatus objects
-  // based upon a Throwable. WrappedExceptions and CoreExceptions are
-  // given special treatment.
-  //
-  private static int appendThrowable ( int max, List statusList, Throwable throwable, int severity )
-  {
-    if (max > 0 && throwable != null)
-    {
-      //
-      // Append an IStatus object for the exception's message.
-      //
-      if (throwable.getLocalizedMessage() != null)
-      {
-        max = append(statusList,max,severity,WebServicePlugin.ID,0,throwable.getLocalizedMessage(),throwable);
-      }
-      //
-      // If the exception is a WrappedException, append the wrapped Exception.
-      //
-      if (throwable instanceof WrappedException)
-      {
-        WrappedException wexc = (WrappedException)throwable;
-        max = appendThrowable(max,statusList,wexc.exception(),severity);
-      }
-      //
-      // If the exception is a CoreException, append the enclosed IStatus.
-      //
-      if (throwable instanceof CoreException)
-      {
-        CoreException cexc = (CoreException)throwable;
-        max = appendStatus(max,statusList,cexc.getStatus(),severity);
-      }
-    }
-    return max;
-  }
-
-  //
-  // Creates and appends an IStatus to the list of IStatus objects.
-  //
-  private static int append ( List statusList, int max, int severity, String id, int code, String message, Throwable throwable )
-  {
-    if (max > 0)
-    {
-      IStatus status = new Status(severity,id,code,message,throwable);
-      statusList.add(status);
-      max--;
-    }
-    return max;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
deleted file mode 100644
index 9dc1a6e16..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
+++ /dev/null
@@ -1,41 +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.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-/**
- * Transfroms a java.lang.String to an org.eclipse.core.runtime.IProject
- */
-public class StringToIProjectTransformer implements Transformer
-{
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
-   * @param Object This must be a java.lang.String
-   * @return Object Returns an IProject
-   */
-
-  public Object transform(Object value)
-  {
-	String project     = (String)value;
-	int    slashIndex  = project.indexOf( '/' );
-	String projectName = project;
-	
-	if( slashIndex != -1 )
-	{
-	  projectName = project.substring( 0, slashIndex );
-	}
-	
-    return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
deleted file mode 100644
index 0c4bd2dc9..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
+++ /dev/null
@@ -1,288 +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.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Vector;
-import org.eclipse.jdt.core.JavaConventions;
-
-/**
-  * This class contains some useful string utilities that are not provided by
-  * either String or StringBuffer.
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-public final class StringUtils
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * The platform-specific line separator.
-  */
-  public static final String NEWLINE = System.getProperty("line.separator");
-
-  private StringUtils(){};
-
-  /**
-    * This method splits a single line of text into multiple lines
-    * based on a maximum line length.  The method will try to fit as
-    * many words as possible onto a line without exceeding the maximum
-    * line length.  Note: the only case where a line might exceed the
-    * maximum is if a single word is longer than the maximum.
-  **/
-  public static String[] splitter( String text, int max_length )
-  {
-    Vector          return_text = new Vector(20);
-    String[]        return_str;
-    int             index = 0;
-
-    while( index < text.length() )
-    {
-      String str = text.substring( index, Math.min( max_length + index,
-                                                    text.length() ) );
-      int space_index = str.lastIndexOf( " " );
-
-      if( index + str.length() < text.length() &&
-          text.charAt( index + str.length() - 1 ) != ' ' &&
-          text.charAt( index + str.length() ) != ' ' &&
-          space_index != -1 )
-      {
-        return_text.addElement( str.substring( 0, space_index ) );
-        index += space_index + 1;
-      }
-      else
-      {
-        return_text.addElement( str.trim() );
-        index += str.length();
-      }
-    }
-
-    return_str = new String[return_text.size()];
-
-    for( index = 0; index < return_text.size(); index++ )
-    {
-      return_str[index] = (String)(return_text.elementAt(index));
-    }
-
-    return return_str;
-  }
-
-  /**
-    * This method returns a string with a repeated number of characters.
-  **/
-  static public String repeat( char the_char, int count )
-  {
-    StringBuffer buf = new StringBuffer( count );
-
-    for( int index = 0; index < count; index++ )
-    {
-      buf.append( the_char );
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method flattens an array of arguments to a string.
-    * The method respects embedded whitespace and quotes.
-    * <ul>
-    * <li>Any argument with embedded whitespace will be flattened out
-    * with enclosing quotes. For example, the single argument
-    * <u>Hello World</u>
-    * will be returned as
-    * <u>"Hello World"</u>.
-    * <li>Any argument with quotes will be flattened out with the
-    * quotes escaped. For example, the single argument
-    * <u>"Happy days"</u>
-    * will be returned as
-    * <u>\"Happy days\"</u>.
-    * </ul>
-    * @param arguments The array of strings to flatten.
-    * @return the flattened string.
-  */
-  static public String flattenArguments ( String[] arguments )
-  {
-    StringBuffer buf = new StringBuffer();
-
-    for (int i=0; i<arguments.length; i++)
-    {
-      //
-      // Append a separator (except the first time).
-      //
-      if (i > 0) buf.append(' ');
-
-      //
-      // Look for whitespace.
-      //
-      boolean whitespace = false;
-      char[] chars = arguments[i].toCharArray();
-      for (int j=0; !whitespace && j<chars.length; j++)
-      {
-        if (Character.isWhitespace(chars[j]))
-        {
-          whitespace = true;
-        }
-      }
-
-      //
-      // Append the argument, quoted as necessary.
-      //
-      if (whitespace) buf.append('"');
-      for (int j=0; j<chars.length; j++)
-      {
-        if (chars[j] == '"') buf.append('\\');
-        buf.append(chars[j]);
-      }
-      if (whitespace) buf.append('"');
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method parses whitespace-delimitted filenames from
-    * the given <code>input</code> stream. <b>Limitation:</b>
-    * Quoted filenames or filenames with embedded whitespace
-    * are not currently supported.
-    * @param input The input stream.
-    * @return An enumeration of filenames from the stream.
-  */
-  static public Enumeration parseFilenamesFromStream ( InputStream input )
-  throws IOException
-  {
-    Vector filenames = new Vector(64,64);
-    StringBuffer buffer = null;
-    byte state = STATE_WS;
-    int ic = input.read();
-    while (ic >= 0)
-    {
-      char c = (char)ic;
-      switch (state)
-      {
-        case STATE_WS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer = new StringBuffer();
-            buffer.append(c);
-            state = STATE_NWS;
-          }
-          break;
-        case STATE_NWS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer.append(c);
-          }
-          else
-          {
-            String filename = buffer.toString();
-            filenames.add(filename);
-            buffer = null;
-            state = STATE_WS;
-          }
-          break;
-        default:
-          break;
-      }
-      ic = input.read();
-    }
-    return filenames.elements();
-  }
-
-  private static final byte STATE_WS = 0;
-  private static final byte STATE_NWS = 1;
-
-
-  /**
-  * Returns true is the type passed in is a primtive java type
-  * @param class name String
-  * @return true is primitive type
-  */
-  public static boolean isPrimitiveType(String typeName) 
-  {
-
-    if (typeName.equalsIgnoreCase("boolean") ||
-      typeName.equalsIgnoreCase("byte") ||
-      typeName.equalsIgnoreCase("double") ||
-      typeName.equalsIgnoreCase("float") ||
-      typeName.equalsIgnoreCase("int") ||
-      typeName.equalsIgnoreCase("long") ||
-      typeName.equalsIgnoreCase("short") ||
-      typeName.equalsIgnoreCase("char"))
-      return true;
-    return false;
-
-  }
-
-  /**
-  * The method replace the characters that are allowed in URIs
-  * and not allowed in Java class names to an underscore ('_')
-  * @param URI String
-  * @return valid Java class name String
-  */
-  public static String URI2ClassName( String uri ) {
-    String className = uri;
-    for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
-    	className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
-    }
-    return className;
-  }
-
-  private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
-  private static final char UNDERSCORE = '_';
-
-
-  /**
-   * This returns a valid Java identifier based on the given name. 
-   * (follows JAX-RPC 1.0 Public Review Draft 2 recommendations)
-   */
-  public static String javaIdentifierFor(String localName)
-  {
-    StringBuffer result = new StringBuffer();
-    boolean skipped = false;
-    for (int i = 0, length = localName.length(); i < length; ++i)
-    {
-      char character = localName.charAt(i);
-      if (Character.isJavaIdentifierPart(character) && !isDelimiter(character))
-      {
-        if (skipped && result.length() != 0)
-        {
-          character = Character.toUpperCase(character);
-        }
-        result.append(character);
-        skipped = false;
-      }
-      else
-      {
-        skipped =true;
-      }
-    }
-
-    if (!JavaConventions.validateIdentifier(result.toString()).isOK())
-    {
-      result.insert(0, "_");
-    }
-
-    return result.toString();
-  }
-
-  private static boolean isDelimiter(char character)
-  {
-    return "\u002D\u002E\u003A\u005F\u00B7\u0387\u06DD\u06DE".indexOf(character) != -1;
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java
deleted file mode 100644
index ac8cc5b11..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java
+++ /dev/null
@@ -1,75 +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.context;
-
-import java.util.StringTokenizer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentProjectTopologyContext extends PersistentContext implements ProjectTopologyContext
-{
-
-public PersistentProjectTopologyContext () 
-{
-	super( WebServicePlugin.getInstance());
-}
- public void load() {
-    String[] ids = ProjectTopologyDefaults.getClientTypes();
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < ids.length; i++)
-    {
-      if (i != 0)
-        sb.append(" ");
-      sb.append(ids[i]);
-    }
-    setDefault(PREFERENCE_CLIENT_TYPES, sb.toString());
-    setDefault(PREFERENCE_USE_TWO_EARS, ProjectTopologyDefaults.isUseTwoEARs());
- }
-
- public void setClientTypes(String[] ids)
- {
-   StringBuffer sb = new StringBuffer();
-   for (int i = 0; i < ids.length; i++)
-   {
-     if (i != 0)
-       sb.append(" ");
-     sb.append(ids[i]);
-   }
-   setValue(PREFERENCE_CLIENT_TYPES, sb.toString());
- }
-
- public String[] getClientTypes()
- {
-   StringTokenizer st = new StringTokenizer(getValueAsString(PREFERENCE_CLIENT_TYPES));
-   String[] s = new String[st.countTokens()];
-   for (int i = 0; i < s.length; i++)
-     s[i] = st.nextToken();
-   return s;
- }
-
- public void setUseTwoEARs(boolean use)
- {
-   setValue(PREFERENCE_USE_TWO_EARS, use);
- }
- public boolean isUseTwoEARs()
- {
-   return getValueAsBoolean(PREFERENCE_USE_TWO_EARS);
- }
-
- public ProjectTopologyContext copy() {
- 	TransientProjectTopologyContext context = new TransientProjectTopologyContext();
-	context.setClientTypes(getClientTypes());
-	context.setUseTwoEARs(isUseTwoEARs());
-	return context;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
deleted file mode 100644
index 8d5ade995..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,273 +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.context;
-
-import java.util.StringTokenizer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentScenarioContext extends PersistentContext implements ScenarioContext
-{
-  public PersistentScenarioContext()
-  {
-    super(WebServicePlugin.getInstance()); 
-  }
-
-  public void load()
-  {
-    ScenarioDefaults defaults = new ScenarioDefaults();
-    String[] ids = defaults.getWebServiceTestTypes();
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < ids.length; i++)
-    {
-      if (i != 0) sb.append(",");
-      sb.append(ids[i]);
-    }
-    String nonJavaTestService = defaults.getNonJavaTestServiceDefault();
-    setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
-    setDefaultStringIfNoDefault(PREFERENCE_NON_JAVA_TEST_SERVICE, nonJavaTestService);
-    
-    setDefaultStringIfNoDefault(PREFERENCE_CLIENT_WEBSERVICE_TYPE, defaults.webserviceClientTypeDefault() );
-    setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TYPE, defaults.webserviceTypeIdDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_GENERATE_PROXY, defaults.generateProxyDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, defaults.launchWebserviceExplorerDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_START_WEBSERVICE, defaults.startWebserviceDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_TEST_WEBSERVICE, defaults.testWebserviceDefault() );
-    setDefaultBooleanIfNoDefault(PREFERENCE_MONITOR_WEBSERVICE, defaults.getMonitorWebServiceDefault());
-    setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_SAMPLE, defaults.launchSample() );
-  }
-
-  public String getNonJavaTestService()
-  {
-    WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
-    String[] testTypes = getWebServiceTestTypes();
-    for (int i = 0; i < testTypes.length; i++)
-    {
-      WebServiceTestExtension wse = (WebServiceTestExtension) registry
-          .getWebServiceExtensionsByName(testTypes[i]);
-      if (wse.testWSDL()) return testTypes[i];
-    }
-    return "";
-  }
-  
-  public void setWebServiceTestTypes(String[] ids)
-  {
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < ids.length; i++)
-    {
-      if (i != 0) sb.append(",");
-      sb.append(ids[i]);
-    }
-    setValue(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
-  }
-
-  public String[] getWebServiceTestTypes()
-  {
-    StringTokenizer st = new StringTokenizer(
-        getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES), ",");
-    String[] s = new String[st.countTokens()];
-    for (int i = 0; i < s.length; i++)
-      s[i] = st.nextToken();
-    return s;
-  }
-
-  public ScenarioContext copy()
-  {
-    TransientScenarioContext context = new TransientScenarioContext();
-    context.setWebServiceTestTypes(getWebServiceTestTypes());
-    context.setNonJavaTestService(getNonJavaTestService());
-    
-    context.setClientWebServiceType( getClientWebServiceType() );
-    context.setWebServiceType( getWebServiceType() );
-    context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
-    context.setStartWebService( getStartWebService() );
-    context.setGenerateProxy( getGenerateProxy() );
-    context.setTestWebService( getTestWebService() );
-    context.setMonitorWebService(getMonitorWebService());
-    context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-    
-    return context;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
-   */
-  public String getClientWebServiceType()
-  {
-    return getValueAsString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
-  }
-  
-  public String getClientWebServiceTypeDefault()
-  {
-    return getDefaultString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
-   */
-  public boolean getGenerateProxy()
-  {
-    return getValueAsBoolean(PREFERENCE_GENERATE_PROXY);
-  }
-  
-  public boolean getGenerateProxyDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_GENERATE_PROXY);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
-   */
-  public boolean getLaunchWebServiceExplorer()
-  {
-    return getValueAsBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
-  }
-  
-  public boolean getLaunchWebServiceExplorerDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
-   */
-  public boolean getStartWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_START_WEBSERVICE);
-  }
-  
-  public boolean getStartWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_START_WEBSERVICE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
-   */
-  public boolean getTestWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_TEST_WEBSERVICE);
-  }
-  
-  public boolean getTestWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_TEST_WEBSERVICE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
-   */
-  public String getWebServiceType()
-  {
-    return getValueAsString(PREFERENCE_WEBSERVICE_TYPE);
-  }
-  
-  public String getWebServiceTypeDefault()
-  {
-    return getDefaultString(PREFERENCE_WEBSERVICE_TYPE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
-   */
-  public void setClientWebServiceType(String value)
-  {
-    setValue( PREFERENCE_CLIENT_WEBSERVICE_TYPE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
-   */
-  public void setGenerateProxy(boolean value)
-  {
-    setValue( PREFERENCE_GENERATE_PROXY, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
-   */
-  public void setLaunchWebServiceExplorer(boolean value)
-  {
-    setValue( PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
-   */
-  public void setStartWebService(boolean value)
-  {
-    setValue( PREFERENCE_START_WEBSERVICE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
-   */
-  public void setTestWebService(boolean value)
-  {
-    setValue( PREFERENCE_TEST_WEBSERVICE, value);
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
-   */
-  public void setWebServiceType(String value)
-  {
-    setValue( PREFERENCE_WEBSERVICE_TYPE, value);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
-   */
-  public boolean getMonitorWebService()
-  {
-    return getValueAsBoolean(PREFERENCE_MONITOR_WEBSERVICE);
-  }
-  
-  public boolean getMonitorWebServiceDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_MONITOR_WEBSERVICE);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
-   */
-  public void setMonitorWebService(boolean value)
-  {
-    setValue(PREFERENCE_MONITOR_WEBSERVICE, value);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
-   */
-  public boolean getLaunchSampleEnabledDefault()
-  {
-    return getDefaultBoolean(PREFERENCE_LAUNCH_SAMPLE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
-   */
-  public boolean isLaunchSampleEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_LAUNCH_SAMPLE);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
-   */
-  public void setLaunchSampleEnabled(boolean value)
-  {
-    setValue( PREFERENCE_LAUNCH_SAMPLE, value);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
deleted file mode 100644
index f5888125b..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
+++ /dev/null
@@ -1,49 +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.context;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentUDDIPreferenceContext extends PersistentContext implements UDDIPreferenceContext
-{
-  public PersistentUDDIPreferenceContext()
-  {
-    super(WebServicePlugin.getInstance());
-  }
-
-  public void load()
-  {
-    setDefault(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataColumnDelimiter());
-    setDefault(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataStringDelimiter());
-  }
-
-  public void setUddiCatDataColumnDelimiter(String delimiter)
-  {
-    setValue(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, delimiter);
-  }
-
-  public String getUddiCatDataColumnDelimiter()
-  {
-    return getValueAsString(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER);
-  }
-
-  public void setUddiCatDataStringDelimiter(String delimiter)
-  {
-    setValue(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, delimiter);
-  }
-
-  public String getUddiCatDataStringDelimiter()
-  {
-    return getValueAsString(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER);
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java
deleted file mode 100644
index 616d335a4..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java
+++ /dev/null
@@ -1,33 +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.context;
-
-public interface ProjectTopologyContext 
-{
-  /**
-    * This constant String is used to lookup the preferred order of the different client types
-  **/
-  public static final String PREFERENCE_CLIENT_TYPES = "clientTypes";
-  
-  /**
-    * This constant String is used to lookup the two EAR option
-  **/
-  public static final String PREFERENCE_USE_TWO_EARS = "useTwoEARs";
-  
-  public void setClientTypes(String[] ids);
-  public String[] getClientTypes();
-
-  public void setUseTwoEARs(boolean use);
-  public boolean isUseTwoEARs();
-
-  public ProjectTopologyContext copy();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java
deleted file mode 100644
index b20c609db..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java
+++ /dev/null
@@ -1,34 +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.context;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ProjectTopologyDefaults
-{
-  public static final String[] getClientTypes()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
-    String[] types = new String[elements.length];
-    for (int i = 0; i < types.length; i++)
-      types[i] = elements[i].getAttribute("id");
-    return types;
-  }
-
-  public static final boolean isUseTwoEARs()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
deleted file mode 100644
index 9bcbd2476..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,73 +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.context;
-
-public interface ScenarioContext 
-{
-  public final String PREFERENCE_WEBSERVICE_TEST_TYPES = "webServiceTestTypes";
-    
-  public final String PREFERENCE_NON_JAVA_TEST_SERVICE= "nonJavaTestService";
-  
-  public final String PREFERENCE_WEBSERVICE_TYPE = "webServiceType";
-  
-  public final String PREFERENCE_START_WEBSERVICE = "startWebService";
-  
-  public final String PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER = "launchWebServiceExplorer";
-  
-  public final String PREFERENCE_GENERATE_PROXY = "generateProxy";
-  
-  public final String PREFERENCE_CLIENT_WEBSERVICE_TYPE = "clientWebServiceType";
-  
-  public final String PREFERENCE_TEST_WEBSERVICE = "testWebService";
-  
-  public final String PREFERENCE_MONITOR_WEBSERVICE = "monitorWebService";
-  
-  public final String PREFERENCE_LAUNCH_SAMPLE = "launchSample";
-  
-  public String[] getWebServiceTestTypes();
-  public void setWebServiceTestTypes(String[] testTypes);
-  
-  public String getNonJavaTestService();
-  
-  public String getWebServiceType();
-  public String getWebServiceTypeDefault();
-  public void   setWebServiceType( String value );
-  
-  public boolean getStartWebService();
-  public boolean getStartWebServiceDefault();
-  public void    setStartWebService( boolean value );
-  
-  public boolean getLaunchWebServiceExplorer();
-  public boolean getLaunchWebServiceExplorerDefault();
-  public void    setLaunchWebServiceExplorer( boolean value );
-  
-  public boolean getGenerateProxy();
-  public boolean getGenerateProxyDefault();
-  public void    setGenerateProxy( boolean value );
-  
-  public String getClientWebServiceType();
-  public String getClientWebServiceTypeDefault();
-  public void   setClientWebServiceType( String value );
-  
-  public boolean getTestWebService();
-  public boolean getTestWebServiceDefault();
-  public void    setTestWebService( boolean value );
-  
-  public boolean getMonitorWebService();
-  public boolean getMonitorWebServiceDefault();
-  public void setMonitorWebService(boolean value);
-  
-  public boolean isLaunchSampleEnabled();
-  public boolean getLaunchSampleEnabledDefault();
-  public void    setLaunchSampleEnabled( boolean value );
-  
-  public ScenarioContext copy();
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
deleted file mode 100644
index a7aeb25b3..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,97 +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.context;
-
-
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-
-
-
-public class ScenarioDefaults
-{  
-  
-	
-  public String[] getWebServiceTestTypes()
-  {
-  	//we will set the home grown sample as the first choice
-  	WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-  	
-  	LabelsAndIds labelsandids = testRegistry.getLabelsAndIDs();
-  	String[] labels = labelsandids.getLabels_();
-  	String[] ids = labelsandids.getIds_();
-  	
-  	String[] newNames = new String[labels.length];
-  	int index = -1;
-  	for(int i = 0;i<ids.length;i++){
-  	  if(ids[i].equals("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"))  	
-  	    index = i;   
-  	}
-  	if(index != -1){
-  	  newNames[0] = labels[index];
-  	  int j = 1;
-  	  for(int i = 0;i<labels.length;i++){
-  	    if(i != index){
-  	  	  newNames[j] = labels[i]; 
-  	      j++;
-  	    }
-  	  }
-  	}
-  	else return labels;
-  	
-  	return newNames;
-  }
-  
-  public String getNonJavaTestServiceDefault()
-  {
-    return "Web Services Explorer";	
-  } 
-  
-  public String webserviceTypeIdDefault()
-  {
-    return "0/org.eclipse.jst.ws.type.java";
-  }
-  
-  public boolean startWebserviceDefault()
-  {
-    return true;
-  }
-  
-  public boolean launchWebserviceExplorerDefault()
-  {
-    return false;
-  }
-  
-  public boolean generateProxyDefault()
-  {
-    return false;
-  }
-  
-  public String webserviceClientTypeDefault()
-  {
-    return "org.eclipse.jst.ws.client.type.java";
-  }
-  
-  public boolean testWebserviceDefault()
-  {
-    return false;
-  }
-
-  public boolean getMonitorWebServiceDefault()
-  {
-    return false;
-  }
-  
-  public boolean launchSample()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java
deleted file mode 100644
index e4a289bfc..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java
+++ /dev/null
@@ -1,46 +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.context;
-
-
-public class TransientProjectTopologyContext implements ProjectTopologyContext
-{
- private String[] clientTypes;
- private boolean twoEARs;
- 
- public TransientProjectTopologyContext () {}
-
- public void setClientTypes(String[] clientTypes)
- {
-   this.clientTypes = clientTypes;
- }
- public String[] getClientTypes()
- {
-   return clientTypes;
- }
-
- public void setUseTwoEARs(boolean use)
- {
-   this.twoEARs = use;
- }
- public boolean isUseTwoEARs()
- {
-   return twoEARs;
- }
-
- public ProjectTopologyContext copy() {
- 	TransientProjectTopologyContext context = new TransientProjectTopologyContext();
-	context.setClientTypes(getClientTypes());
-	context.setUseTwoEARs(isUseTwoEARs());
-	return context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
deleted file mode 100644
index 87306196e..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,218 +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.context;
-
-public class TransientScenarioContext implements ScenarioContext
-{
-  private String[] webServiceTestTypes;
-  private String   nonJavaTestService;
-  private String   webServiceType_;
-  private boolean  startWebService_;
-  private boolean  launchWebServiceExplorer_;
-  private boolean  generateProxy_;
-  private String   clientWebServiceType_;
-  private boolean  testWebService_;
-  private boolean  monitorWebService;
-  private boolean  launchSample_;
-  
-  private ScenarioDefaults defaults = new ScenarioDefaults();
- 
-  public TransientScenarioContext () {}
-
-  public String getNonJavaTestService()
-  {
-    return nonJavaTestService;
-  }
- 
-  public void setNonJavaTestService(String nonJavaTestService)
-  {
-    this.nonJavaTestService = nonJavaTestService;	
-  }
- 
-  public void setWebServiceTestTypes(String[] webServiceTestTypes)
-  {
-    this.webServiceTestTypes = webServiceTestTypes;
-  }
-  
-  public String[] getWebServiceTestTypes()
-  {
-    return webServiceTestTypes;	
-  }
- 
-  public ScenarioContext copy() {
-  	TransientScenarioContext context = new TransientScenarioContext();
-	context.setWebServiceTestTypes(getWebServiceTestTypes());
-	context.setNonJavaTestService(getNonJavaTestService());
-	
-	context.setWebServiceType( getWebServiceType() );
-	context.setClientWebServiceType( getClientWebServiceType() );
-	context.setGenerateProxy( getGenerateProxy() );
-	context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
-	context.setStartWebService( getStartWebService() );
-	context.setTestWebService( getTestWebService() );
-	context.setMonitorWebService(getMonitorWebService());
-	context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-	return context;
-  }
- 
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
-   */
-  public String getClientWebServiceType()
-  {
-    return clientWebServiceType_;
-  }
-  
-  public String getClientWebServiceTypeDefault(){ return defaults.webserviceClientTypeDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
-   */
-  public boolean getGenerateProxy()
-  {
-    return generateProxy_;
-  }
-  
-  public boolean getGenerateProxyDefault(){ return defaults.generateProxyDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
-   */
-  public boolean getLaunchWebServiceExplorer()
-  {
-    return launchWebServiceExplorer_;
-  }
-  
-  public boolean getLaunchWebServiceExplorerDefault(){ return defaults.launchWebserviceExplorerDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
-   */
-  public boolean getStartWebService()
-  {
-    return startWebService_;
-  }
-  
-  public boolean getStartWebServiceDefault(){ return defaults.startWebserviceDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
-   */
-  public boolean getTestWebService()
-  {
-    return testWebService_;
-  }
-  
-  public boolean getTestWebServiceDefault(){ return defaults.testWebserviceDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
-   */
-  public String getWebServiceType()
-  {
-    return webServiceType_;
-  }
-  
-  public String getWebServiceTypeDefault(){ return defaults.webserviceTypeIdDefault(); }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
-   */
-  public void setClientWebServiceType(String value)
-  {
-    clientWebServiceType_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
-   */
-  public void setGenerateProxy(boolean value)
-  {
-    generateProxy_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
-   */
-  public void setLaunchWebServiceExplorer(boolean value)
-  {
-    launchWebServiceExplorer_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
-   */
-  public void setStartWebService(boolean value)
-  {
-    startWebService_ = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
-   */
-  public void setTestWebService(boolean value)
-  {
-    testWebService_ = value;
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
-   */
-  public void setWebServiceType(String value)
-  {
-    webServiceType_ = value;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
-   */
-  public boolean getMonitorWebService()
-  {
-    return monitorWebService;
-  }
-  
-  public boolean getMonitorWebServiceDefault()
-  {
-    return defaults.getMonitorWebServiceDefault();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
-   */
-  public void setMonitorWebService(boolean value)
-  {
-    monitorWebService = value;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
-   */
-  public boolean getLaunchSampleEnabledDefault()
-  {
-    return defaults.launchSample();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
-   */
-  public boolean isLaunchSampleEnabled()
-  {
-    return launchSample_;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
-   */
-  public void setLaunchSampleEnabled(boolean value)
-  {
-    launchSample_ = value;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
deleted file mode 100644
index a24addb41..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
+++ /dev/null
@@ -1,31 +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.context;
-
-public interface UDDIPreferenceContext 
-{
-  /*
-   * This constant String is used to lookup the column delimiter for user-defined UDDI
-   * Category data.
-   */
-  public static final String PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER = "uddiCatDataColumnDelimiter";
-  
-  /*
-   * This constant String is used to lookup the string delimiter for user-defined UDDI
-   * Category data.
-   */
-  public static final String PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER = "uddiCatDataStringDelimiter";
-  
-  public void setUddiCatDataColumnDelimiter(String delimiter);
-  public String getUddiCatDataColumnDelimiter();
-  public void setUddiCatDataStringDelimiter(String delimiter);
-  public String getUddiCatDataStringDelimiter();
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
deleted file mode 100644
index 39eba91a8..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
+++ /dev/null
@@ -1,24 +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.context;
-
-public class UDDIPreferenceDefaults
-{
-  public static final String getUddiCatDataColumnDelimiter()
-  {
-    return "#";
-  }
-  
-  public static final String getUddiCatDataStringDelimiter()
-  {
-    return "\"";
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 4bd0f64e4..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
+++ /dev/null
@@ -1,48 +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.data;
-
-public class LabelsAndIds
-{
-  private String[] labels_;
-  private String[] ids_;
-  
-  /**
-   * @return Returns the ids_.
-   */
-  public String[] getIds_()
-  {
-    return ids_;
-  }
-  /**
-   * @param ids_ The ids_ to set.
-   */
-  public void setIds_(String[] ids_)
-  {
-    this.ids_ = ids_;
-  }
-  /**
-   * @return Returns the labels_.
-   */
-  public String[] getLabels_()
-  {
-    return labels_;
-  }
-  /**
-   * @param labels_ The labels_ to set.
-   */
-  public void setLabels_(String[] labels_)
-  {
-    this.labels_ = labels_;
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
deleted file mode 100644
index 4dc349d16..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
+++ /dev/null
@@ -1,86 +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.data;
-
-public class TypeRuntimeServer
-{
-  private String typeId_     = "";
-  private String runtimeId_  = "";
-  private String serverId_   = "";
-  private String serverInstanceId_;
-  
-  /**
-   * @return Returns the runtimeId_.
-   */
-  public String getRuntimeId()
-  {
-    return runtimeId_;
-  }
-  /**
-   * @param runtimeId_ The runtimeId_ to set.
-   */
-  public void setRuntimeId(String runtimeId_)
-  {
-    this.runtimeId_ = runtimeId_;
-  }
-  /**
-   * @return Returns the serverId_.
-   */
-  public String getServerId()
-  {
-    return serverId_;
-  }
-  /**
-   * @param serverId_ The serverId_ to set.
-   */
-  public void setServerId(String serverId_)
-  {
-    this.serverId_ = serverId_;
-  }
-  /**
-   * @return Returns the serverInstanceId_.
-   */
-  public String getServerInstanceId()
-  {
-    return serverInstanceId_;
-  }
-  /**
-   * @param serverInstanceId_ The serverInstanceId_ to set.
-   */
-  public void setServerInstanceId(String serverInstanceId_)
-  {
-    this.serverInstanceId_ = serverInstanceId_;
-  }
-  /**
-   * @return Returns the typeId_.
-   */
-  public String getTypeId()
-  {
-    return typeId_;
-  }
-  /**
-   * @param typeId_ The typeId_ to set.
-   */
-  public void setTypeId(String typeId_)
-  {
-    this.typeId_ = typeId_;
-  }
-  
-  /* (non-Javadoc)
-   * @see java.lang.Object#toString()
-   */
-  public String toString()
-  {
-    return "type(" + typeId_ + ") runtime(" + runtimeId_ + ") factory(" + serverId_ + ") servInstId(" + serverInstanceId_ + ")";
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
deleted file mode 100644
index 687bfeb8e..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.dialog;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-/**
-* Constants for status dialogs
-*/
-public interface IStatusDialogConstants {
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
-  /*
-  * Button ID for the "Yes" button
-  */
-  public static final int YES_ID = 2;
-  /*
-  * Button ID for the "Yes to all" button
-  */
-  public static final int YES_TO_ALL_ID = 4;
-  /*
-  * Button ID for the "Cancel" button
-  */
-  public static final int CANCEL_ID = 1;
-  /*
-  * Button ID for the "OK" button
-  */
-  public static final int OK_ID = 0;
-  /*
-  * Button ID for the "Details" button
-  */
-  public static final int DETAILS_ID = 13;
-
-  /*
-  * Button label for the "Yes" button
-  */
-  public static final String YES_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_YES_LABEL");
-  /*
-  * Button label for the "Yes to all" button
-  */
-  public static final String YES_TO_ALL_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
-  /*
-  * Button label for the "Cancel" button
-  */
-  public static final String CANCEL_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
deleted file mode 100644
index 596a30b4e..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
+++ /dev/null
@@ -1,31 +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.ext;
-
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
-* All Extensions with exectutable extensions should implement this 
-* to fit our framework
-*/
-public interface WebServiceExecutable
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  /**
-  *Returns a wizard fragment for this exention type 
-  *
-  */
-  public AbstractDataModelOperation getFinishCommand();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
deleted file mode 100644
index 4332d0a74..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ /dev/null
@@ -1,46 +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.ext;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This represents an extension in the plugin registry 
-* It job is to act as a proxy to the iconfigelement
-*/
-public interface WebServiceExtension
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * If the extension has code that needs to be executed or a fragment added
-  * @return WebServiceExecutable this interface holds executable code and a 
-  * fragment
-  */
-  public Object getWebServiceExecutableExtension();
-
-  /**
-  * This is the config element that holds the extension info
-  * @param IConfigurationElement Extension element
-  */
-  public void setConfigElement(IConfigurationElement configElement);
- 
-  /**
-  * If the extension has code that 
-  * @return IConfigurationElement Extension element
-  */
-  public IConfigurationElement getConfigElement();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
deleted file mode 100644
index ae5b8dc86..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
+++ /dev/null
@@ -1,100 +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.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-
-
-
-
-
-/**
-* This represents an extension in the plugin registry 
-* It job is to act as a proxy to the iconfigelement
-*/
-public class WebServiceExtensionImpl implements WebServiceExtension
-{
-
-	private Log	log_;
-	
-  /*
-  * The ConfigElement that holds extension info
-  */
-  protected IConfigurationElement configElement_;
-
-  /*
-  * The extension executable 
-  */
-  protected WebServiceExecutable webServiceExecutable_;
-  
-
-  public WebServiceExtensionImpl(IConfigurationElement configElement)
-  {
-    configElement_ = configElement;
-    log_ = EnvironmentService.getEclipseLog();
-  }
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  /**
-  * If the extension has code that needs to be executed or a fragment added
-  * @return WebServiceExecutable this interface holds executable code and a 
-  * fragment
-  */
-  public Object getWebServiceExecutableExtension()
-  {
-    if(webServiceExecutable_ != null) return webServiceExecutable_;
-
-    try{
-      return configElement_.createExecutableExtension("class");
-    }catch (CoreException e){
-      log_.log(Log.ERROR, 5029, this, "getWebServiceExecutableExtension",e);
-    }
-
-    return null;
-  }
-
-  /**
-  * This is the config element that holds the extension info
-  * @param IConfigurationElement Extension element
-  */
-  public void setConfigElement(IConfigurationElement configElement)
-  {
-    configElement_ = configElement;
-  }	
-
-  /**
-  * This is the config element that holds the extension info
-  * @return IConfigurationElement Extension element
-  */
-  public IConfigurationElement getConfigElement()
-  {
-    return configElement_;
-  }
-  
-  /**
-  * The name of the extension being used
-  * @return String name of this extension
-  */
-  public String getName()
-  {
-    return getConfigElement().getAttribute( "name" );
-  }
-
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
deleted file mode 100644
index afc1d0721..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
+++ /dev/null
@@ -1,42 +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.ext;
-
-
-/**
-* Returns the names of the extensions for a given extension-point 
-* also returns the extension objects 
-*
-*/
-public interface WebServiceExtensionRegistry
-{
-  
-  /**
-  * Returns the names of all registered extensions
-  * @return The names of all registered extensions.
-  */
-  public String[] getWebServiceExtensionNames ();
-  
-  /**
-  * Returns the extension object of the given name
-  *@return WebServiceExtension object
-  */
-  public WebServiceExtension getWebServiceExtensionsByName( String name);
-
-  /**
-  * Returns All extention objects in this registry
-  *@return WebServiceExtension objects
-  */
-  public WebServiceExtension[] getWebServiceExtensions();
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index 5a9456f83..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
+++ /dev/null
@@ -1,115 +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.ext;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-
-
-/**
-* This is a generic registry which sets up general code in handling   
-* IConfigElements for an extension
-*/
-public abstract class WebServiceExtensionRegistryImpl implements WebServiceExtensionRegistry
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  
-  private Hashtable nameExtensionTable_;
-  private Vector id_;
-  private Vector label_;
-  private LabelsAndIds labelsandids_;
-    
-  public WebServiceExtensionRegistryImpl()
-  {
-    nameExtensionTable_ = new Hashtable();
-    label_ = new Vector();
-    id_ = new Vector();
-    loadExtensions();
-  }
-  
-  /**
-  * Children registries will have different extension types 
-  * @return WebserviceExtension holds a config elem
-  * for that extension capable of creating an executable file
-  */
-  public abstract WebServiceExtension createWebServiceExtension(IConfigurationElement configElement);
-
-  /**
-  * Children must implement how they get the IConfigurationElement[] 
-  * @return IConfigurationElement[] an array of elements particular to that
-  * extension
-  */
-  public abstract IConfigurationElement[] getConfigElements();
-
-  /*
-  * Loads WebServiceExtensions for WebServiceClientTest into this registry.
-  * This is done by querying the plugin registry for all extensions
-  * that extend webServiceClientTest  
-  */
-  private void loadExtensions ()
-  {    
-    IConfigurationElement[] config = getConfigElements();
-
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement elem = config[idx];
-      String label = elem.getAttribute( "label" );
-      String id =   elem.getAttribute( "id" );      
-      WebServiceExtension webServiceExtension = createWebServiceExtension(elem);	
-      nameExtensionTable_.put(label,webServiceExtension);
-      label_.add(label);
-      id_.add(id);
-    }
-  }
-
-  /**
-  * Returns the names of all registered extensions
-  * @return The names of all registered extensions.
-  */
-  public String[] getWebServiceExtensionNames ()
-  {
-    return (String[])nameExtensionTable_.keySet().toArray( new String[0] );
-  }
-
-  /**
-   * Return the names and Ids 
-   */
-  public LabelsAndIds getLabelsAndIDs()
-  {
-  	labelsandids_ = new LabelsAndIds();
-  	labelsandids_.setLabels_((String[])label_.toArray( new String[0] ));
-  	labelsandids_.setIds_((String[])id_.toArray( new String[0] ));
-  	return labelsandids_;
-  }
-  
-  /**
-  * Returns the extension object of the given name
-  * @return WebServiceExtension object
-  */
-  public WebServiceExtension getWebServiceExtensionsByName( String name)
-  {
-    return (WebServiceExtension)nameExtensionTable_.get(name);
-  }
-
-  /**
-  * Returns All extention objects in this registry
-  *@return WebServiceExtension objects
-  */
-  public WebServiceExtension[] getWebServiceExtensions()
-  {
-    return (WebServiceExtension[])nameExtensionTable_.values().toArray( new WebServiceExtension[0] );
-  }
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
deleted file mode 100644
index 15c387ee4..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-
-public interface JavaProxyTestCommand extends WebServiceTestFinishCommand
-{
-
- /**
-  * This holds an info class that comes from user input or some calcilations that needs to be
-  * used for the finish
-  */
-  
-  public void setJspFolder(String jspFolder);
-  
-  public void setRunClientTest(boolean runClientTest);
-  
-  public void setSampleProject(String sampleProject);
-  
-  public void setProxyBean(String proxyBean);
-  
-  public void setSetEndpointMethod(String setEndpointMethod);
-  
-  public void setClientProject(String clientProject);
-  
-  public void setMethods(BooleanSelection[] methods);
-  
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
deleted file mode 100644
index 2523dcf5f..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-public interface WSDLTestFinishCommand extends WebServiceTestFinishCommand
-{
-  public void setServiceProject(String serverProject);
-  public void setWsdlServiceURL(String wsdlURI);
-  public void setExternalBrowser(boolean external); 
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
deleted file mode 100644
index 76f7d777d..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
+++ /dev/null
@@ -1,118 +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.ext.test;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionImpl;
-
-
-
-/**
-* This represents an extension in the plugin registry 
-* It job is to act as a proxy to the iconfigelement
-* In particular it holds a client test extension element 
-*/
-public class WebServiceTestExtension extends WebServiceExtensionImpl
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public WebServiceTestExtension(IConfigurationElement configElement)
-  {
-    super(configElement);
-  }
-  
-  /**
-  * Will this testClient generate code
-  * @return boolean true if codegen needed
-  */
-  public boolean isCodeGenNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "codegen" )).booleanValue();
-  }
-  
-  /**
-  * Use the default Folder Provided by us
-  * @return boolean true if no special folder requires
-  */
-  public boolean useDefaultCodeGenFolder()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "defaultcodegenfolder" )).booleanValue();
-  }
-
-  /**
-  * Use Special Folder for generated code
-  * @return String special folder name
-  */
-  public String getCodeGenFolder()
-  {
-    return getConfigElement().getAttribute( "codegenfolder" );
-  }
-
-  /**
-  * Do we need to launch something
-  * @return Boolean if true launch codegen
-  */
-  public boolean isLaunchRequired()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "launchRequired" )).booleanValue();
-  }
-
-  /**
-  * Do we need the methods for the proxy
-  * @return boolean true if proxy methods needed
-  */
-  public boolean areMethodsNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "methodsneeded" )).booleanValue();
-  }
-
-  /**
-  * Does this test machine need a server
-  * @return boolean true if a server is required
-  */
-  public boolean isServerNeeded()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "serverneeded" )).booleanValue();
-  }
-
-  /**
-  * Use the Default Server chosen by the wizard
-  * @return boolean true if the default server is wanted
-  */
-  public boolean useDefaultServer()
-  {
-    return Boolean.valueOf(getConfigElement().getAttribute( "defaultserver" )).booleanValue();
-  }
-
-  /**
-  * Use the Default Server chosen by the wizard
-  * @return boolean true if the default server is wanted
-  */
-  public String useServer()
-  {
-    return getConfigElement().getAttribute( "useserver" );
-  }
-
-  public boolean testWSDL()
-  {
-  	String wsdl = getConfigElement().getAttribute( "testWSDL" );
-    if(wsdl.equals("yes") || wsdl.equals("true"))
-	  return true;
-	 
-	return false;  
-  }
-  	
-  
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
deleted file mode 100644
index 5f94fc837..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.List;
-import org.eclipse.wst.server.core.IServer;
-
-public interface WebServiceTestFinishCommand 
-{
-
-  /**
-   * If the command needs a server this is the chosen 
-   * client serverID
-   * @param sampleServerTypeID
-   */
-  public void setServerTypeID(String serviceServerTypeID);
-  
-  /**
-   * This is the IServer if required
-   * @param sampleExistingServer
-   */
-  public void setExistingServer(IServer serviceExistingServer);
-  
-  /**
-   * This is the endpoints if monitor service is enabled
-   * @param endpoints
-   */
-  public void setEndpoint(List endpoints);
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
deleted file mode 100644
index 310e3d55c..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ /dev/null
@@ -1,71 +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.ext.test;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtension;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl;
-
-public class WebServiceTestRegistry extends WebServiceExtensionRegistryImpl
-{
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-  /*
-   * This is a singleton becasue it was decided that the memory foot print 
-   * is not as expensive as the time taken retrieving the data
-   * 
-   */
-  
-  
-  private static WebServiceTestRegistry wstr;
-  
-  public static WebServiceTestRegistry getInstance()
-  {
-  	if(wstr == null) wstr = new WebServiceTestRegistry();
-    return wstr;
-  }
-  
-  private WebServiceTestRegistry()
-  {
-    super();
-  }
-  
-  /**
-  * Children registries will have different extension types 
-  * @return WebserviceExtension holds a config elem
-  * for that extension capable of creating an executable file
-  */
-  public WebServiceExtension createWebServiceExtension(IConfigurationElement configElement)
-  {
-    return new WebServiceTestExtension(configElement);
-  }
-
-  /**
-  * Children must implement how they get the IConfigurationElement[] 
-  * @return IConfigurationElement[] an array of elements particular to that
-  * extension
-  */
-  public IConfigurationElement[] getConfigElements()
-  {
-    IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor(
-                                     "org.eclipse.jst.ws.consumption.ui",
-                                     "tester");
-    return config;    
-  }
-
-
-    
-  
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
deleted file mode 100644
index ec4e508a4..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,131 +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.plugin;
-
-import java.text.MessageFormat;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.context.PersistentProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.PersistentUDDIPreferenceContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServicePlugin extends Plugin
-{
-  /**
-  * The identifier of the descriptor of this plugin in plugin.xml.
-  */
-  public static final String ID = "org.eclipse.jst.ws";
-
-  /**
-  * The reference to the singleton instance of this plugin.
-  */
-  private static WebServicePlugin instance_;
-
-  private PersistentResourceContext resourceContext_;
-  private PersistentScenarioContext scenarioContext_;
-  private PersistentProjectTopologyContext projectTopologyContext_;
-  private PersistentUDDIPreferenceContext uddiPreferenceContext;
-  
-  /**
-   * Constructs a runtime plugin object for this plugin.
-   */
-  public WebServicePlugin()
-  {
-    super();
-    instance_ = this; 
-  }
-  
-  /**
-  * Returns the singleton instance of this plugin.
-  * @return The WebServicePlugin singleton.
-  */
-  public static WebServicePlugin getInstance ()
-  {
-    return instance_;
-  }
-
-  protected void initializeDefaultPluginPreferences() 
-  {
-  		((PersistentProjectTopologyContext) getProjectTopologyContext()).load();
-  		((PersistentUDDIPreferenceContext) getUDDIPreferenceContext()).load();
-  }
-
-  public ResourceContext getResourceContext()
-  {
-  		if (resourceContext_ == null) 
-  			resourceContext_ = PersistentResourceContext.getInstance();
-		return resourceContext_;
-  }
-
-  public ScenarioContext getScenarioContext()
-  {
-  		if (scenarioContext_ == null)
-  		{
-  		  scenarioContext_ = new PersistentScenarioContext();
-  		  scenarioContext_.load();
-  		}
-
-		return scenarioContext_;
-  }
-
-  public ProjectTopologyContext getProjectTopologyContext()
-  {
-    if (projectTopologyContext_ == null)
-      projectTopologyContext_ = new PersistentProjectTopologyContext();
-    return projectTopologyContext_;
-  }
-
-  
-  public UDDIPreferenceContext getUDDIPreferenceContext()
-  {
-    if (uddiPreferenceContext == null)
-      uddiPreferenceContext = new PersistentUDDIPreferenceContext();
-    return uddiPreferenceContext;
-  }
-    
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties.
-  * @return The String message.
-  */
-  public static String getMessage ( String key )
-  {
-    return Platform.getResourceString(instance_.getBundle(),key);
-  }
-
-  /**
-  * Returns the message string identified by the given key from
-  * plugin.properties. Substitution sequences in the message string
-  * are replaced by the given array of substitution objects (which
-  * are most frequently strings). See the JDK's
-  * {@link java.text.MessageFormat java.text.MessageFormat}
-  * class for further details on substitution.
-  * @return The String message.
-  */
-  public static String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format(getMessage(key),args);
-  }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties
deleted file mode 100644
index 29bdaafde..000000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties
+++ /dev/null
@@ -1,16 +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_SERVER=IWAB0213E Error in starting server.
diff --git a/bundles/org.eclipse.wst.command.env.core/.classpath b/bundles/org.eclipse.wst.command.env.core/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env.core/.cvsignore b/bundles/org.eclipse.wst.command.env.core/.cvsignore
deleted file mode 100644
index d8590af60..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envcore.jar
diff --git a/bundles/org.eclipse.wst.command.env.core/.project b/bundles/org.eclipse.wst.command.env.core/.project
deleted file mode 100644
index 6327deaaa..000000000
--- a/bundles/org.eclipse.wst.command.env.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.command.env.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 07b364066..000000000
--- a/bundles/org.eclipse.wst.command.env.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.core
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.internal.env.core.data,
- org.eclipse.wst.command.internal.env.core.fragment,
- org.eclipse.wst.command.internal.env.core.registry,
- org.eclipse.wst.command.internal.provisional.env.core,
- org.eclipse.wst.command.internal.provisional.env.core.common,
- org.eclipse.wst.command.internal.provisional.env.core.context,
- org.eclipse.wst.command.internal.provisional.env.core.data,
- org.eclipse.wst.command.internal.provisional.env.core.selection,
- org.eclipse.wst.command.internal.provisional.env.core.uri
-Require-Bundle: org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.environment
diff --git a/bundles/org.eclipse.wst.command.env.core/about.html b/bundles/org.eclipse.wst.command.env.core/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.command.env.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.core/build.properties b/bundles/org.eclipse.wst.command.env.core/build.properties
deleted file mode 100644
index 443347a94..000000000
--- a/bundles/org.eclipse.wst.command.env.core/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-src.includes = component.xml
-source.. = src/
-output.. = bin/
-
diff --git a/bundles/org.eclipse.wst.command.env.core/component.xml b/bundles/org.eclipse.wst.command.env.core/component.xml
deleted file mode 100644
index 7c458f7de..000000000
--- a/bundles/org.eclipse.wst.command.env.core/component.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.command">
-   <component-depends unrestricted="true">
-   </component-depends>
-   <plugin id="org.eclipse.wst.command.env" fragment="false"/>
-   <plugin id="org.eclipse.wst.command.env.core" fragment="false"/>
-   <plugin id="org.eclipse.wst.command.env.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.wst.command.env.core/plugin.properties b/bundles/org.eclipse.wst.command.env.core/plugin.properties
deleted file mode 100644
index c71709d6d..000000000
--- a/bundles/org.eclipse.wst.command.env.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=Environment Command Framework (core)
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.wst.command.env.core/plugin.xml b/bundles/org.eclipse.wst.command.env.core/plugin.xml
deleted file mode 100644
index 80f279f23..000000000
--- a/bundles/org.eclipse.wst.command.env.core/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-   
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties
deleted file mode 100644
index b1d7769a6..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/env/core/environment.properties
+++ /dev/null
@@ -1,24 +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 for SimpleURIFactory
-#
-MSG_NULL_ARG_SPECIFIED=Null specified as argument to {0}.
-MSG_SCHEME_NOT_FOUND=Scheme not found for URI {0}.
-MSG_ABSOLUTE_PATH_WITHOUT_SCHEME=Absolute path specified without a scheme for URI {0}.
-
-#
-# Common Messages
-#
-MSG_URI_NOT_RELATIVE=URL: {0} is not relative.
-MSG_ERROR_UNEXPECTED_ERROR=IWAB0014E Unexpected exception occured.
-
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java
deleted file mode 100644
index 0d08d1017..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/ClassEntry.java
+++ /dev/null
@@ -1,22 +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.wst.command.internal.env.core.data;
-
-import java.util.Vector;
-
-public class ClassEntry
-{
-  public Object lastObject_;
-  public Vector getterList_;
-  public Vector setterList_;
-  public int    order_;
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
deleted file mode 100644
index 244b2410b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataFlowManager.java
+++ /dev/null
@@ -1,274 +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.wst.command.internal.env.core.data;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-
-
-public class DataFlowManager 
-{
-  private DataMappingRegistryImpl registry_;
-  private Hashtable               classTable_;
-  private int                     order_;
-  private Environment				environment_;
-  
-  public DataFlowManager( DataMappingRegistryImpl registry, Environment environment )
-  {
-    registry_   = registry;
-    classTable_ = new Hashtable();
-    order_      = 0;
-    environment_ = environment;
-  }
-  
-  public DataMappingRegistry getMappingRegistry()
-  {
-    return registry_; 
-  }
-  
-  public void process( Object object )
-  {
-    // Add this object to the classTable_ if required.
-    String     objectType = object.getClass().getName();
-    ClassEntry classEntry = (ClassEntry)classTable_.get( objectType );
-	
-    environment_.getLog().log(Log.INFO, "data", 5004, this, "process", "Processing: " + objectType );
-    
-    if( classEntry == null )
-    {
-      classEntry = new ClassEntry();
-      classTable_.put( objectType, classEntry );
-    }
-    
-    classEntry.lastObject_ = object;
-    classEntry.order_      = order_++;
-    
-    // Now process the setters for this object
-    Vector ruleEntries  = registry_.getRuleEntries( objectType );
-    
-    if( ruleEntries != null )
-    {
-      if( classEntry.setterList_ == null )
-      {
-        classEntry.setterList_ = getSetterList( object );  
-      }    
-      
-      // For each setter in this object try to find a rule.
-      for( int setterIndex = 0; setterIndex < classEntry.setterList_.size(); setterIndex++ )
-      {
-        ObjectMethod currentObjectMethod = new ObjectMethod();
-        Method       setterMethod        = (Method)classEntry.setterList_.elementAt( setterIndex );
-        RuleEntry    currentRuleEntry    = null;
-
-        currentObjectMethod.order = -1;
-        
-        // Find rules that match this setter.  Note: there can be more than one rule
-        // that matches this setter.  In this case we use the most recent, which is 
-        // defined by the order field.
-        for( int index = 0; index < ruleEntries.size(); index++ )
-        {
-          RuleEntry ruleEntry = (RuleEntry)ruleEntries.elementAt( index );       
-          
-          if( setterMethod.getName().equals( "set" + ruleEntry.targetProperty_ ) )
-          {
-            // We found a setter for this rule.  Now find the getter method.
-            // Note: getGetterMethod always returns a value, but if there is no
-            //       getters available it will set the order to -1.
-            ObjectMethod getter = getGetterMethod( ruleEntry.sourceType_, ruleEntry.sourceProperty_ );
-            
-            if( getter.order == -1 )
-            {
-            	environment_.getLog().log(Log.INFO , "data", 5005, this, "process", "  >>No getter found for property: " + setterMethod.getName());
-            }
-            
-            if( currentObjectMethod.order < getter.order ) 
-            {
-              // We found a more recent getter.
-              currentObjectMethod = getter;
-              currentRuleEntry = ruleEntry;
-            }
-          }
-        } 
-        
-        if( currentObjectMethod.order != -1 )
-        {
-          invokeMethod( currentObjectMethod.object, 
-                        currentObjectMethod.method, 
-                        object, 
-                        setterMethod, 
-                        currentRuleEntry.transformer_ );
-        }
-        else
-        {
-        	environment_.getLog().log(Log.INFO, "data", 5006, this, "process", "  >>No rule found for setter: " + setterMethod.getName() );
-        }
-      }
-    }   
-  }
-  
-  /**
-   * Find all the setters for this object and return a vector of them.
-   * 
-   * @param object
-   * @return
-   */
-  private Vector getSetterList( Object object )
-  {
-    Vector result = new Vector();
-    
-    Method[] methods = object.getClass().getMethods();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      Method  method     = methods[index];
-      boolean isPublic   = Modifier.isPublic( method.getModifiers() );
-      Class   returnType = method.getReturnType();
-    
-      if( isPublic && 
-          returnType == Void.TYPE && 
-          method.getParameterTypes().length == 1 &&
-          method.getName().startsWith( "set" ))
-      {
-        method.setAccessible( true );
-        result.add( method );
-      }
-    }
-    
-    return result;
-  }
-  
-  private ObjectMethod getGetterMethod( String sourceType, String sourceProperty )
-  {
-    ClassEntry   classEntry = (ClassEntry)classTable_.get( sourceType );
-    ObjectMethod getterFound = new ObjectMethod();
-    
-    // Indicate that there is no getter yet.
-    getterFound.order = -1;
-    
-    if( classEntry != null )
-    {
-      if( classEntry.getterList_ == null )
-      {
-        // Build the getter list.
-        classEntry.getterList_ = getGetterList( classEntry.lastObject_ );
-      }
-      
-      for( int index = 0; index < classEntry.getterList_.size(); index++ )
-      {
-        Method getter = (Method)classEntry.getterList_.elementAt( index );
-        
-        if( getter.getName().equals( "get" + sourceProperty ))
-        {
-          getterFound.order  = classEntry.order_;
-          getterFound.method = getter;
-          getterFound.object = classEntry.lastObject_;
-          break;
-        }
-      }
-    }
-    
-    return getterFound;
-  }
-  
-  private Vector getGetterList( Object object )
-  {
-    Vector result = new Vector();
-    
-    Method[] methods = object.getClass().getMethods();
-    
-    for( int index = 0; index < methods.length; index++ )
-    {
-      Method  method     = methods[index];
-      boolean isPublic   = Modifier.isPublic( method.getModifiers() );
-      Class   returnType = method.getReturnType();
-    
-      if( isPublic && 
-          returnType != Void.TYPE && 
-          method.getParameterTypes().length == 0 &&
-          method.getName().startsWith( "get" ))
-      {
-        method.setAccessible( true );
-        result.add( method );
-      }
-    }
-    
-    return result;
-  }
-    
-  private void invokeMethod( Object      sourceObject, 
-                             Method      sourceMethod , 
-                             Object      clientObject, 
-                             Method      clientMethod,
-                             Transformer transformer)
-  {  	
-  	Object data = null;
-  	  	  	
-  	try
-  	{
-  	  data = sourceMethod.invoke( sourceObject, new Object[0] );
-  	}
-  	catch( InvocationTargetException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  	catch( IllegalAccessException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Provider \"" + sourceObject.getClass().getName() +
-                                        "\" threw an exception." );
-  	}
-  	
-  	environment_.getLog().log(Log.INFO, "data", 5007, this, "invokeMethod ","  Setting prop: " + clientMethod.getName() + " data=" + data + " from: " + sourceObject.getClass().getName() );
-  	
-  	
-  	if( transformer != null )
-  	{
-  	  data = transformer.transform( data );  	    
-  	}
-  	
-  	try
-  	{  	  
-  	  clientMethod.invoke( clientObject, new Object[]{ data } );
-  	}
-  	catch( InvocationTargetException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  	catch( IllegalAccessException exc )
-  	{
-  	  exc.printStackTrace();
-      // pgm Need to externalize this string.
-      throw new IllegalArgumentException( "Client \"" + clientObject.getClass().getName() +
-                                          "\" threw an exception." );
-  	}
-  }
-  
-  private class ObjectMethod
-  {
-    public Object object;
-    public Method method;
-    public int    order;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
deleted file mode 100644
index c6d34264e..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/DataMappingRegistryImpl.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.data;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-public class DataMappingRegistryImpl implements DataMappingRegistry
-{  
-  private Hashtable rulesTable_ = new Hashtable();
-
-  public Vector getRuleEntries( String targetType )
-  {
-    return (Vector)rulesTable_.get( targetType );
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.data.Transformer)
-   */
-  public void addMapping( Class sourceType, String sourceProperty,
-                          Class targetType, String targetProperty, 
-                          Transformer transformer) 
-  {
-    Vector    ruleEntries = (Vector)rulesTable_.get( targetType.getName() );
-    RuleEntry ruleEntry   = null;
-    
-    if( ruleEntries == null )
-    {
-      ruleEntries = new Vector();
-      rulesTable_.put( targetType.getName(), ruleEntries );
-    }
-    
-    // Find the rule entry
-    for( int index = 0; index < ruleEntries.size(); index++ )
-    {
-      RuleEntry newEntry = (RuleEntry)ruleEntries.elementAt( index );
-    
-      if( sourceProperty.equals( newEntry.sourceProperty_ ) &&
-          sourceType.equals( newEntry.sourceType_ ) &&
-          targetProperty.equals( newEntry.targetProperty_ ) )
-      {
-        // The entry already exists
-        ruleEntry = newEntry;
-        break;
-      }
-    }
-    
-    if( ruleEntry == null )
-    {
-      // The rule didn't exist already so we will create a new one.
-      ruleEntry = new RuleEntry(sourceType.getName(), sourceProperty, targetProperty, transformer );
-      ruleEntries.add( ruleEntry );
-    }
-    else
-    {
-      // Just update the transformer.
-      ruleEntry.transformer_ = transformer;  
-    }
-  }
-    
-    //ruleEntries_.
-//    String    sourceClass = sourceType.getName();
-//    String    targetClass = targetType.getName();
-//    Vector    entries     = (Vector)ruleEntries_.get( sourceClass ); 
-//    RuleEntry ruleEntry   = null;
-//    
-//    if( entries != null )
-//    {
-//      // Check to see if this mapping already exists.
-//      for( int index = 0; index < entries.size(); index++ )
-//      {
-//        RuleEntry foundEntry = (RuleEntry)entries.elementAt( index );
-//        
-//        if( sourceProperty.equals( foundEntry.sourceProperty_ ) &&
-//            targetType.equals( foundEntry.targetType_ ) &&
-//            targetProperty.equals( foundEntry.targetProperty_ ) )
-//        {
-//          ruleEntry = foundEntry;
-//          ruleEntry.transformer_ = transformer;
-//        }
-//      }
-//      
-//      // There is an existing vector for this sourceClass, but it didn't
-//      // contain this new rule so we will add it in.
-//      if( ruleEntry == null )
-//      {
-//        ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-//        entries.add( ruleEntry );
-//      }
-//    }
-//    else
-//    {
-//      // We need to create a new vector for this sourceClass.
-//      entries = new Vector();
-//      ruleEntry = new RuleEntry( sourceProperty, targetClass, targetProperty, transformer );
-//      entries.add( ruleEntry );
-//      ruleEntries_.put( sourceClass, entries );  
-//    }    
-//  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry#addMapping(java.lang.Class, java.lang.String, java.lang.Class)
-   */
-  public void addMapping(Class sourceType, String sourceProperty, Class targetType) 
-  {
-    addMapping( sourceType, sourceProperty, targetType, sourceProperty, null );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.java
deleted file mode 100644
index 883523991..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/data/RuleEntry.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.wst.command.internal.env.core.data;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class RuleEntry 
-{
-  public String      sourceType_;
-  public String      sourceProperty_;
-  public String      targetProperty_;
-  public Transformer transformer_;
-  
- 
-  public RuleEntry( String sourceType,
-                    String sourceProperty,
-                    String targetProperty, 
-                    Transformer transformer )
-  {
-    sourceType_     = sourceType;
-    sourceProperty_ = sourceProperty;
-    targetProperty_ = targetProperty;    
-    transformer_    = transformer;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.java
deleted file mode 100644
index 9f8ea47f3..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/AbstractCommandFragment.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.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-  * This class is used as the base class for other standard fragment classes.
-  * 
-**/
-public abstract class AbstractCommandFragment implements CommandFragment
-{
-  private CommandFactory commandFactory_;
-  private String         id_;
-  private boolean        doNotRunInTransaction_ = false;
-
-  /**
-   * Copy constructor.
-   * @param fragment
-   */
-  protected AbstractCommandFragment( AbstractCommandFragment fragment )
-  {
-    commandFactory_ = fragment.commandFactory_;
-    id_             = fragment.id_;
-  }
-  
-  /**
-    * Creates a new AbstractCommandFragment.
-    *
-    * @param command the executable command for this fragment.
-  **/
-  public AbstractCommandFragment( CommandFactory commandFactory, String id )
-  {
-    commandFactory_ = commandFactory;  
-    id_      = id;
-  } 
-  
-  public String getId()
-  {
-    return id_;
-  }
-   
-  public void setId( String id )
-  {
-    id_ = id; 
-  }
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory()
-  {
-    return commandFactory_;
-  }
-  
-  /**
-   *  This method is called retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-    // The default behaviour is not to add any entries to the registry.
-  }
-  
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction()
-  {
-    return doNotRunInTransaction_;
-  }
-  
-  /**
-   * Sets the run in transaction property.
-   * @param doNotRunInTransaction
-   */
-  public void setDoNotRunInTransaction( boolean doNotRunInTransaction )
-  {
-    doNotRunInTransaction_ = doNotRunInTransaction;
-  }
-  
-  /**
-    * All fragments need to be cloneable.
-  **/
-  abstract public Object clone();  
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
deleted file mode 100644
index 6379c5b3a..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/BooleanFragment.java
+++ /dev/null
@@ -1,154 +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.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-/**
-  * This class returns either the true fragment or the false fragment
-  * based on the response from the condition object.
-**/
-public class BooleanFragment extends AbstractCommandFragment
-{
-  private CommandFragment trueFragment_;
-  private CommandFragment falseFragment_;
-  private Condition       condition_;
-
-  /**
-   * Create a BooleanFragment with default values.
-   *
-   */
-  public BooleanFragment()
-  {
-    this( null, null, new Condition()
-                      {
-                        public boolean evaluate()
-                        {
-                          return true;
-                        }
-                      }, 
-                      null, "" );  
-  }
-  
-  /**
-   * 
-   * @param trueFragment  The fragment chosen if the condition is true.
-   * @param falseFragment The fragment chosen if the condition is false.
-   * @param condition     The condition.
-   */
-  public BooleanFragment( CommandFragment trueFragment,
-                          CommandFragment falseFragment,
-                          Condition       condition )
-  {
-    this( trueFragment, falseFragment, condition, null, "" );
-  }                          
-
-  /**
-    * Creates a new BooleanFragment.
-    *
-    * @param trueFragment returned if condition is true.
-    * @param falseFragment returned if condition is false.
-    * @param condition the condition for this fragment.
-    * @param state the state passed to the condition.
-    * @param command the exectable command for this fragment.
-  **/
-  public BooleanFragment( CommandFragment  trueFragment,
-                           CommandFragment falseFragment,
-                           Condition       condition,
-                           CommandFactory  commandFactory,
-                           String          id )
-  {
-    super( commandFactory, id );
-
-    trueFragment_       = trueFragment;
-    falseFragment_      = falseFragment;
-    condition_          = condition; 
-  }
-
-  /**
-   * Copy constructor.
-   * @param frag
-   */
-  protected BooleanFragment( BooleanFragment frag )
-  {
-    this( null,
-    	  null,
-    	  frag.condition_,
-    	  frag.getCommandFactory(),
-    	  frag.getId() );
-
-    // Now we have to clone in the true and false
-    // fragments.
-    trueFragment_  = (CommandFragment)trueFragment_.clone();
-    falseFragment_ = (CommandFragment)falseFragment_.clone();
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new BooleanFragment( this );
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    return condition_.evaluate() ? trueFragment_ : falseFragment_;
-  }
-  
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    return null;
-  }
-  
-  /**
-   * Sets the condition.
-   * @param condition
-   */
-  public void setCondition( Condition condition )
-  {
-    condition_ = condition;    
-  }
-  
-  /**
-   * Sets the true fragment.
-   * @param fragment
-   */
-  public void setTrueFragment( CommandFragment fragment )
-  {
-    trueFragment_ = fragment;
-  }
-  
-  /**
-   * Sets the false fragment.
-   * @param fragment
-   */
-  public void setFalseFragment( CommandFragment fragment )
-  {
-    falseFragment_ = fragment;
-  } 
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
deleted file mode 100644
index ab7edc07f..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ChoiceFragment.java
+++ /dev/null
@@ -1,143 +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.wst.command.internal.env.core.fragment;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Evaluate;
-
-
-/**
-  * This class returns a fragment from a list of fragments based
-  * on the object returned from the Evaluate object.
-**/
-public class ChoiceFragment extends AbstractCommandFragment 
-{
-  private Hashtable      fragmentTable_;
-  private Evaluate       evaluate_;
-
-  /**
-    * Create a clone with new a new hashtable.
-  **/
-  protected ChoiceFragment( ChoiceFragment frag )
-  {
-    super( frag.getCommandFactory(), frag.getId() );
-    
-    evaluate_      = frag.evaluate_;
-    fragmentTable_ = new Hashtable();
-   
-    Enumeration keys = frag.fragmentTable_.keys();
-
-    // Clone the fragments in the table.
-    while( keys.hasMoreElements() )
-    {
-      Object key = keys.nextElement();
-      fragmentTable_.put( key, ((CommandFragment)frag.fragmentTable_.get(key)).clone() );
-    }
-  }
-  
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments )
-  {
-  	this( keys, fragments, null, null, "" );    
-  }
-  
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments,
-                         Evaluate          evaluate )
-  {
-  	this( keys, fragments, evaluate, null, "" );
-  }                         
-  
-  public void setEvaluate( Evaluate evaluate )
-  {
-    evaluate_ = evaluate;  
-  }
-  
-  /**
-    * Constructs a choice fragment.  The key at index X is mapped to 
-    * to the fragment at index X.
-    *
-    * @param keys these keys must be unique as determined by the equals method.
-    * They are used to identify which fragment to return.
-    * @param fragments these are the fragments to be returned.  Null is not allowed
-    * as an entry in the array.
-    * @param evaluate the object returned by this evaluate object is used
-    * as the key to locate a fragment.
-    * @param state the state passed to evaluate.
-  **/
-  public ChoiceFragment( Object[]          keys,
-                         CommandFragment[] fragments,
-                         Evaluate          evaluate,
-                         CommandFactory    commandFactory,
-                         String            id )
-  {
-    super( commandFactory, id );
-
-    evaluate_      = evaluate;
-    fragmentTable_ = new Hashtable();
-
-    if( keys == null || fragments == null || keys.length != fragments.length )
-    {
-      throw new IllegalArgumentException( "Bad keys or fragments." );
-    }
-    else
-    {
-      // Create the fragment table.
-      for( int index = 0; index < keys.length; index++ )
-      {
-        fragmentTable_.put( keys[index], fragments[index] );
-      }     
-    }
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new ChoiceFragment( this );
-  }
-  
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    Object key              = evaluate_.evaluate();
-    CommandFragment fragment = (CommandFragment)fragmentTable_.get(key);
-
-    if( fragment == null )
-    {
-      throw new IllegalArgumentException( "Key not found in table. Key=" + key );
-    }
-
-    return fragment;
-  }
-  
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
deleted file mode 100644
index 867725bfd..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFactoryFragment.java
+++ /dev/null
@@ -1,159 +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.wst.command.internal.env.core.fragment;
-
-import java.util.Vector;
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-public abstract class CommandFactoryFragment implements CommandFragment 
-{
-  private Vector commands_;
-  
-  /**
-   * Subclasses should override this method and return
-   * an CommandFactory.
-   * @return
-   */
-  public abstract ICommandFactory getICommandFactory();
-  
-  /**
-   * All wizard fragments need to be cloneable.
-  **/
-  public abstract Object clone();
-  
-  protected CommandFactoryFragment( CommandFactoryFragment frag )
-  {
-    commands_ = frag.commands_;  
-  }
-  
-  public CommandFactoryFragment()
-  {
-  }
-  
-  /**
-   * 
-   * @return Returns a unique identifier for this fragment.
-   */
-  public String getId()
-  {
-    return "";
-  }
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory()
-  {
-    return null;
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-	CommandFragment result = null;
-	
-    commands_ = createCommands();	
-
-	if( commands_.size() > 0 )
-	{
-	  result = (ChildFragment)commands_.elementAt(0);
-	}
-	
-	return result;
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-	CommandFragment result = null;
-		
-	if( commands_ != null && fragment instanceof ChildFragment ) 
-	{
-	  ChildFragment child = (ChildFragment)fragment;
-	  
-	  int index = child.index_;
-	
-      if( index != -1 )
-	  {
-	    index++;
-	  
-	    if( index < commands_.size() )
-		{
-		  result = (CommandFragment)commands_.elementAt( index );
-		}
-	  }
-	}
-	
-	return result;
-  }
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-  }
-
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction()
-  {
-    return false;
-  }  
-  
-  private Vector createCommands()
-  {
-	Vector          commands = new Vector();
-	ICommandFactory factory  = getICommandFactory();
-	int             index    = 0;
-		  
-	while( factory != null && factory.hasNext() )
-	{
-	  AbstractDataModelOperation command = factory.getNextCommand();
-			
-	  commands.add( new ChildFragment( command, index++ ) );
-	}
-	
-	return commands;
-  }
-  
-  private class ChildFragment extends SimpleFragment
-  {
-	  int index_;
-	
-	  public ChildFragment( AbstractDataModelOperation command, int index )
-	  {
-	    super( command, command.getID() );
-	    index_ = index;
-	  }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
deleted file mode 100644
index e68761c80..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragment.java
+++ /dev/null
@@ -1,71 +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.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-  * This interface describes a list of interruptable commands.  The
-  * order of this list of commands is defined by the getFirstSubFragment and
-  * getNextSubFragment methods.
-**/
-public interface CommandFragment extends Cloneable
-{ 
-  /**
-   * 
-   * @return Returns a unique identifier for this fragment.
-   */
-  public String getId();
-  
-  /** 
-    * Gets executable command associated with this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFactory getCommandFactory();
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment();
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment );
-  
-  /*
-   * This method is called to retrieve the data mappings for this command fragment.
-   */
-  public void registerDataMappings( DataMappingRegistry registry );
-
-  /**
-   * 
-   * @return If the commands for this fragment should not be run within a transaction then
-   * this method should return true.  If the fragment does not care if it is run in a transaction
-   * or not it should return false.
-   */
-  public boolean doNotRunInTransaction();
-  
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone();  
-}  
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
deleted file mode 100644
index 82fef6bf1..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentEngine.java
+++ /dev/null
@@ -1,392 +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.wst.command.internal.env.core.fragment;
-
-import java.util.Stack;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.common.environment.Log;
-
-
-
-/**
- * The CommandFragmentEngine provides a convienent way to traverse CommandFragments
- * and possiblity execute its associate Command.
- */
-public class CommandFragmentEngine implements CommandManager
-{
-  private Stack            commandStack_;
-  private FragmentListener undoFragmentListener_;
-  private FragmentListener nextFragmentListener_;
-  private FragmentListener peekFragmentListener_;
-  private DataFlowManager  dataManager_;
-  private Environment      environment_;
-  private IStatus          lastStatus_;
-  
-  /**
-   * Creates a CommandFragmentEngine.
-   * 
-   * @param startFragment the root fragment where traversal will begin.
-   * @param dataManager the data manager containing all of the data mappings.
-   * @param environment the environment.
-   */
-  public CommandFragmentEngine( CommandFragment startFragment, DataFlowManager dataManager, Environment environment )
-  {
-  	SequenceFragment root = new SequenceFragment();
-  	root.add( startFragment );
-  	  	
-  	commandStack_ = new Stack();
-  	
-  	addToStack( root, -1 );
-  	addToStack( startFragment, 0 );
-  	
-  	dataManager_ = dataManager;
-  	environment_ = environment;
-  } 
-  
-  /**
-   * @return returns the Data mapping registry.
-   */
-  public DataMappingRegistry getMappingRegistry()
-  {
-	return dataManager_.getMappingRegistry();
-  }
-  
-  /**
-   * 
-   * @return the Status from the last Command executed.
-   */
-  public IStatus getLastStatus()
-  {
-    return lastStatus_;
-  }
-  
-  /**
-   */
-  public boolean isUndoEnabled()
-  {
-    return true;
-  }
-  
-  /**
-   * Sets the next fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in moveForwardToNextStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setNextFragmentListener( FragmentListener listener )
-  {
-    nextFragmentListener_ = listener;
-  }
-  
-  /**
-   * Sets the next fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in peekForwardToNextStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setPeekFragmentListener( FragmentListener listener )
-  {
-    peekFragmentListener_ = listener;
-  }
-  
-  /**
-   * Sets the peek fragment listener for this engine.  This listener will be
-   * called for each fragment that is traversed in undoToLastStop operation.
-   * 
-   * @param listener the fragment listener.
-   */
-  public void setUndoFragmentListener( FragmentListener listener )
-  {
-    undoFragmentListener_ = listener;
-  }
-  
-  /**
-   * Traverse the CommandFragments starting with the CommandFragment on the
-   * top of the command fragment stack.  The operation does NOT change the
-   * command fragment stack and does not execute any command associated with
-   * a CommandFragment.
-   */
-  public void peekForwardToNextStop()
-  {
-  	CommandListEntry topEntry      = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex   = topEntry.parentIndex_;
-  	CommandFragment  childFragment = topEntry.fragment_; 
-  	boolean          continueLoop  = navigateChildFragments( childFragment, false );
-  	  	
-  	while( parentIndex != -1 && continueLoop )
-  	{  	
-  	  CommandListEntry parentEntry    = (CommandListEntry)commandStack_.elementAt( parentIndex );
-  	  CommandFragment  parentFragment = parentEntry.fragment_;
-  	  CommandFragment  nextFragment   = parentFragment.getNextSubFragment( childFragment );
-  	  
-  	  if( nextFragment == null )
-  	  {
-  	  	// There are no more sibling fragments to navigate so we will pop up to the parent
-  	  	// an continue navigation there.
-  	  	parentIndex   = parentEntry.parentIndex_;
-  	  	childFragment = parentFragment; 
-  	  }
-  	  else
-  	  {  	  	
-  	  	if( navigateChildFragments( nextFragment, true ) ) 
-  	  	{
-  	  	  // We are continuing to navigate.  This time we want to traverse the sibling
-  	  	  // of nextFragment. 
-  	  	  childFragment = nextFragment;
-  	  	}
-  	  	else
-  	  	{
-  	  	  // We are stopping our navigation.
-  	  	  continueLoop = false;
-  	  	}
-  	  }
-  	}
-  }
-  
-  
-  /**
-   * Traverse the CommandFragments starting with the CommandFragment on the
-   * top of the command fragment stack.  This operation does change the
-   * command fragment stack and does execute any command associated with
-   * a CommandFragment.
-   */
-  public void moveForwardToNextStop( IProgressMonitor monitor )
-  {
-  	CommandListEntry topEntry        = (CommandListEntry)commandStack_.lastElement();  	
-  	int              parentIndex     = topEntry.parentIndex_;
-  	CommandFragment  currentFragment = topEntry.fragment_;  
-  	boolean          continueExecute = visitTop( monitor );
-  	CommandFragment  childFragment    = currentFragment.getFirstSubFragment();
-  	    
-  	// If the current fragment has child fragments we need to traverse these children.
-  	while( childFragment != null && continueExecute )
-  	{
-  	  parentIndex = commandStack_.size() - 1;
-  	  addToStack( childFragment, parentIndex );
-  	  continueExecute = visitTop( monitor );
-  	  currentFragment = childFragment;
-  	  childFragment   = currentFragment.getFirstSubFragment();
-  	}
-  	
-  	// The previous while loop has guaranteed that currentFragment has no
-  	// child fragments. This while loop assumes this to be the case.
-  	while( parentIndex != -1 && continueExecute )
-  	{  	   	
-  	  CommandListEntry parentEntry    = (CommandListEntry)commandStack_.elementAt( parentIndex );
-  	  CommandFragment  parentFragment = parentEntry.fragment_;
-  	  CommandFragment  nextFragment   = null;
-  	  
-  	  if( currentFragment == null )
-  	  {
-  	    nextFragment = parentFragment.getFirstSubFragment();
-  	  }
-  	  else
-  	  {	
-  	    nextFragment = parentFragment.getNextSubFragment( currentFragment );
-  	  }
-  	  
-  	  if( nextFragment == null )
-  	  {
-  	  	// There are no more sibling fragments to navigate so we will pop up to the parent
-  	  	// and continue navigation there.
-  	  	parentIndex     = parentEntry.parentIndex_;
-  	  	currentFragment = parentFragment; 
-  	  }
-  	  else
-  	  {  	
-  	  	// We have a new fragment that we need to add to the top of the stack.
-  	  	addToStack( nextFragment, parentIndex );  	  	
-  	    parentIndex     = commandStack_.size() - 1;  	
-  	    continueExecute = visitTop( monitor );
-  	    currentFragment = null;  	  	
-  	  }
-  	}
-  }
-  
-  /**
-   * 
-   * @return returns true if the there is not longer any elements on the stack.  Note:
-   *                 that last two entries are always left on the stack.
-   */
-  public boolean undoToLastStop()
-  {    
-  	CommandListEntry topEntry = (CommandListEntry)commandStack_.lastElement();	
-  	
-	// Always undo the top element.
-  	performUndo( topEntry );
-  		
-    while( topEntry.parentIndex_ != 0 )
-  	{
-      commandStack_.pop();
-  	  topEntry = (CommandListEntry)commandStack_.lastElement();	  
-      
-  	  performUndo( topEntry );
-  	  
-  	  if( topEntry.fragmentStopped_ )
-  	  {
-  	    break;
-  	  }
-  	}
-  	
-  	return topEntry.parentIndex_ == 0;
-  }
-   
-  private void performUndo( CommandListEntry entry )
-  {
-    if( entry.parentIndex_ == 0 ) return;
-    
-	  AbstractDataModelOperation cmd = entry.command_;
-  	  
-  	if( cmd != null && cmd.canUndo() && !entry.beforeExecute_ )
-	{
-    try
-    {
-	    cmd.undo( null, null );
-    }
-    catch( Exception exc )
-    {
-      exc.printStackTrace();
-    }
-    
-	  entry.beforeExecute_ = true;
-	}
-  	  
-	undoFragmentListener_.notify( entry.fragment_ );  	
-  }
-  
-  private boolean navigateChildFragments( CommandFragment fragment, boolean visitCurrent )
-  {
-  	boolean         continueNavigate = true;
-  	CommandFragment childFrag        = null; 
-  	  
-  	if( visitCurrent )
-  	{
-  	  continueNavigate = peekFragmentListener_.notify( fragment );
-      dataManager_.process( fragment );
-  	}
-  	
-  	childFrag = fragment.getFirstSubFragment();
-   	
-  	while( childFrag != null && continueNavigate )
-  	{
-  	  continueNavigate = navigateChildFragments( childFrag, true );
-  	  childFrag        = fragment.getNextSubFragment( childFrag );
-  	}
-  	
-  	return continueNavigate;
-  }
-    
-  private boolean visitTop( IProgressMonitor monitor )
-  {  
-  	CommandListEntry entry           = (CommandListEntry)commandStack_.lastElement();
-  	boolean         continueNavigate = nextFragmentListener_.notify( entry.fragment_ );
-  	  
-  	if( continueNavigate )
-  	{
-  	  // Call the setters for this fragment.
-      dataManager_.process( entry.fragment_ );
-      
-      // Add any rules to the mapping registry before we execute the command.
-      entry.fragment_.registerDataMappings( dataManager_.getMappingRegistry() );
-   
-  	  lastStatus_ = runCommand( entry, monitor );
-  	  
-  	  if( lastStatus_.getSeverity() == IStatus.ERROR ) continueNavigate = false;
-  	}
-  	
-   	if( !continueNavigate ) entry.fragmentStopped_ = true;
-   	
-  	return continueNavigate;
-  }
-  
-  private void addToStack( CommandFragment fragment, int parentIndex )
-  {
-    CommandListEntry entry = new CommandListEntry( fragment, parentIndex );
-    commandStack_.push( entry );
-  }
-  
-  private IStatus runCommand( CommandListEntry entry, IProgressMonitor monitor )
-  {
-	CommandFactory factory  = entry.fragment_.getCommandFactory();
-  	IStatus      status   = Status.OK_STATUS;
-  	
-  	if( factory != null )
-  	{
-  	  AbstractDataModelOperation cmd  = factory.create();
-      
-  	  entry.command_ = cmd;
-  	    
-  	  if( cmd != null )
-  	  {
-  	    dataManager_.process( cmd );
-  	  	  
-  	    try
-  	    {
-  	      environment_.getLog().log(Log.INFO, "command", 5001, this, "runCommand", "Executing: " + cmd.getClass().getName());
-  	  	    
- 	        cmd.setEnvironment( environment_ );
-          status = cmd.execute( monitor, null );
-          
-		      entry.beforeExecute_ = false;
-  	    }
-  	    catch( Throwable exc )
-  	    {
-  	      MessageUtils utils           = new MessageUtils( "org.eclipse.wst.command.env.core.environment", this );
-  	      IStatus      unexpectedError = StatusUtils.errorStatus( exc );
-          MultiStatus  parentStatus    = new MultiStatus( "id", 0, new IStatus[]{unexpectedError}, 
-                                                          utils.getMessage( "MSG_ERROR_UNEXPECTED_ERROR" ), null );
-  	      environment_.getStatusHandler().reportError( parentStatus );
-  	    }
-  	    finally
-  	    {
-  	      String message = "Ok";
-  	      
-  	      if( status.getSeverity() == Status.ERROR )
-  	      {
-  	        message = "Error: " + status.getMessage(); 
-  	      }
-  	      
-	      environment_.getLog().log(Log.INFO, "command", 5001, this, "runCommand", "Execution status: " + message );
-  	    }
-  	  }
-  	}
-  	
-  	return status;
-  }
-    
-  private class CommandListEntry
-  {
-  	public CommandListEntry( CommandFragment fragment, int parentIndex )
-  	{
-  	  fragment_        = fragment;
-  	  parentIndex_     = parentIndex;
-  	  fragmentStopped_ = false;
-	  beforeExecute_   = true;
-  	}
-  	  	
-  	public AbstractDataModelOperation command_;
-  	public CommandFragment fragment_;
-  	public int             parentIndex_;
-  	public boolean         fragmentStopped_;
-	public boolean         beforeExecute_;
-  }    
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
deleted file mode 100644
index a99be49b3..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactory.java
+++ /dev/null
@@ -1,24 +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.wst.command.internal.env.core.fragment;
-
-/**
- * This interface provides a way to create CommandFragments.
- *
- */
-public interface CommandFragmentFactory
-{
-  /**
-   * 
-   * @return returns a created CommandFragment object.
-   */
-  public CommandFragment create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
deleted file mode 100644
index 0f1701c09..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/CommandFragmentFactoryFactory.java
+++ /dev/null
@@ -1,22 +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.wst.command.internal.env.core.fragment;
-
-public interface CommandFragmentFactoryFactory 
-{
-  /**
-   * The framework calls this method to get the CommandFragmentFactory
-   * for a particular extension.
-   * 
-   * @return Creates a CommandFragmentFactory.
-   */
-  public CommandFragmentFactory create();  
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
deleted file mode 100644
index e293fbec3..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/ExtensionFragment.java
+++ /dev/null
@@ -1,100 +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.wst.command.internal.env.core.fragment;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry;
-
-
-public class ExtensionFragment extends AbstractCommandFragment 
-{
-  private String[]        ids_;;
-  private CommandRegistry extensionRegistry_;
-  private Hashtable       fragments_;
-  
-  /**
-   *  The default constructor
-   *
-   */
-  public ExtensionFragment()
-  {
-    super( null, "" );  
-    fragments_ = new Hashtable();
-  }
-    
-  /**
-   * Copy constructor.
-   * @param Fragment the fragment to copy
-   */
-  protected ExtensionFragment( ExtensionFragment fragment )
-  {
-    super( fragment );
-    
-    ids_               = fragment.ids_;
-    extensionRegistry_ = fragment.extensionRegistry_;
-    fragments_         = fragment.fragments_;
-  }
-  
-  /**
-   * 
-   * @param ids Sets the IDs for this extension fragment.
-   */
-  public void setExtensionIds( String[] ids )
-  {
-    ids_ = ids;
-  }
-  
-  /**
-   * 
-   * @param registry Sets the registry for this extension fragment.
-   */
-  public void setExtensionRegistry( CommandRegistry registry )
-  {
-    extensionRegistry_ = registry; 
-  }
-      
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getFirstSubFragment()
-   */
-  public CommandFragment getFirstSubFragment() 
-  {
-    CommandFragmentFactoryFactory factory  = extensionRegistry_.getFactoryFactory( ids_ );
-    
-    if( factory == null ) return null;
-    
-    CommandFragment               fragment = (CommandFragment)fragments_.get( factory );
-    
-    if( fragment == null )
-    {
-      fragment = factory.create().create();
-      fragments_.put( factory, fragment );
-    }
-    
-    return  fragment;
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#getNextSubFragment(org.eclipse.wst.command.internal.env.core.fragment.CommandFragment)
-   */
-  public CommandFragment getNextSubFragment(CommandFragment fragment) 
-  {
-    return null;
-  }
-  
-  /**
-   * @see java.lang.Object#clone()
-   */
-  public Object clone() 
-  {
-    return new ExtensionFragment( this );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
deleted file mode 100644
index 01cd7a163..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/FragmentListener.java
+++ /dev/null
@@ -1,25 +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.wst.command.internal.env.core.fragment;
-
-/**
- * This interface should be implement for code that needs to listen to fragments
- * that are being traverse by the CommandFragmentEngine.
- *
- */
-public interface FragmentListener 
-{
-  /*
-   * Notifies this listener that a commandFragment is being visited during
-   * a traversal.
-   */
-  public boolean notify( CommandFragment commandFragment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
deleted file mode 100644
index 8c3e4d416..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopCondition.java
+++ /dev/null
@@ -1,27 +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.wst.command.internal.env.core.fragment;
-
-/**
-  * This interface can be used when a conditional object needs to be returned.
-**/
-public interface LoopCondition
-{
-  /**
-    * Evaluates a loop condition.
-    *
-    * @param loop the loop fragment that is being evaluated.
-    * @param fragment the child fragment of the loop 
-    *        under evaluation.  Note: fragment can be null.
-    * @return returns an object based on some evaluated condition.
-  **/
-  public boolean evaluate( LoopFragment loop, CommandFragment fragment );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
deleted file mode 100644
index 7d41fc13d..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/LoopFragment.java
+++ /dev/null
@@ -1,135 +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.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.RangeVector;
-
-
-/**
-  * This class returns a dynamically determined number of
-  * fragments.  This loop will return the fragment parameter
-  * as long as the stopCondition evaluates to false.  Otherwise,
-  * null is returned.
-**/
-public class LoopFragment extends AbstractCommandFragment
-{
-  private LoopCondition   stopCondition_;
-  private CommandFragment fragment_;
-  private RangeVector     fragmentHistory_;
-
-  /**
-    * Copy contructor for this fragment.
-  **/
-  protected LoopFragment( LoopFragment fragment )
-  {
-    this( fragment.fragment_,
-    	  fragment.stopCondition_,
-    	  fragment.getCommandFactory(),
-    	  fragment.getId() );
-  }
-  
-  public LoopFragment( CommandFragment fragment,
-                        LoopCondition   stopCondition )
-  {
-    this( fragment, stopCondition, null, "" );
-  }                       
-  
-  /**
-    * @param fragment the fragment that will be returned by the loop.
-    * @param stopCondition when false the fragment will be returned, 
-    * otherwise null is returned.
-    * @param state the state passed to the condition.
-    * @param command the executable command for this fragment.
-  **/
-  public LoopFragment( CommandFragment fragment,
-                       LoopCondition   stopCondition,
-                       CommandFactory  commandFactory,
-                       String          id   )
-  {
-    super( commandFactory, id );
-
-    fragment_        = fragment;
-    stopCondition_   = stopCondition;
-    fragmentHistory_ = new RangeVector();
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new LoopFragment( this );
-  }
-
-  /**
-    * Returns the index of the fragment
-    *
-    * @param fragment the fragment to search.
-    * @return the index of this fragment.
-  **/
-  public int indexOf( CommandFragment fragment )
-  {
-    return fragmentHistory_.indexOf( fragment );
-  }
-
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {    
-    return getNextSubFragment( null );
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment frag )
-  {
-    CommandFragment nextFrag  = null;
-    
-    if( stopCondition_.evaluate( this, frag ) )
-    {
-      // The stop condition has been met.
-      // Do nothing.
-    }
-    else
-    {      
-      int fragIndex = indexOf( frag );
-
-      // Note: when fragment == null the fragIndex
-      //       should be -1.  Therefore, if there
-      //       is already a first fragment in
-      //       fragmentHistory that will be returned.
-      if( fragIndex + 1 < fragmentHistory_.size() )
-      {
-        // We have a copy of the fragment already.
-        nextFrag = (CommandFragment)(fragmentHistory_.elementAt( fragIndex + 1 )); 
-      }
-      else
-      {
-        nextFrag = (CommandFragment)(fragment_.clone());
-        fragmentHistory_.add( nextFrag );
-      }
-    }
-
-    return nextFrag;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
deleted file mode 100644
index 0abcb355d..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SequenceFragment.java
+++ /dev/null
@@ -1,133 +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.wst.command.internal.env.core.fragment;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-
-
-/**
-  * This class implements a sequence of CommandFragments.
-**/
-public class SequenceFragment extends AbstractCommandFragment
-{
-  private List fragmentList_;
-
-  protected SequenceFragment( SequenceFragment frag )
-  {
-  	super( frag.getCommandFactory(), frag.getId() );
-  	
-    fragmentList_ = new Vector();
-    
-    for( int index = 0; index < frag.fragmentList_.size(); index++ )
-    {
-      Object newFrag = ((CommandFragment)frag.fragmentList_.get(index)).clone();
-      fragmentList_.add( newFrag );
-    }
-  }
-  
-  public SequenceFragment( CommandFragment[] fragments, 
-						   CommandFactory    commandFactory, 
-					       String            id  )
-  {
-  	super( commandFactory, id );
-  	
-    if( fragments != null )
-    {
-      fragmentList_ = Arrays.asList( fragments );
-    }
-    else
-    {
-      fragmentList_ = new Vector();
-    }
-  }
-  
-  public SequenceFragment()
-  {
-  	super( null, "" );
-  	
-  	fragmentList_ = new Vector();
-  }
-
-  /**
-    * Appends a fragment to the sequence. 
-  **/
-  public void add( CommandFragment fragment )
-  {
-    fragmentList_.add( fragment );
-  }
-  
-  /**
-    * Makes a copy of the CommandFragment.
-    *
-    * @return returns a copy of this fragment.
-  **/
-  public Object clone()
-  {
-    return new SequenceFragment( this );
-  }
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment()
-  {
-    CommandFragment fragment = null;
-
-    if( fragmentList_ == null || fragmentList_.size() == 0 )
-    {
-      fragment = null;
-    }
-    else
-    {      
-      fragment = (CommandFragment)( fragmentList_.get(0) );
-    }
-
-    return fragment;    
-  }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/
-  public CommandFragment getNextSubFragment( CommandFragment fragment )
-  {
-    int index = fragmentList_.indexOf( fragment );
-
-    if( index == -1 )
-    {
-      throw new IllegalArgumentException( "Fragment not found in sequence.");
-    }
-    else
-    {
-      index++;
-
-      if( index >= fragmentList_.size() )
-      {
-        // There is nothing following this fragment so return null;
-        return null;
-      }
-      else
-      {
-        // Return the next fragment.
-        return (CommandFragment)(fragmentList_.get( index ));
-      }
-    }
-  }	
-}  
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
deleted file mode 100644
index b69ef1b73..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/fragment/SimpleFragment.java
+++ /dev/null
@@ -1,81 +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.wst.command.internal.env.core.fragment;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
-  * This class implements an empty of WizardFragment.
-**/
-public class SimpleFragment extends AbstractCommandFragment
-{
-  public SimpleFragment()
-  {
-    this( (CommandFactory)null, "" );
-  }
-  
-  public SimpleFragment( String id )
-  {
-    this( (CommandFactory)null, id );  
-  }
-  
-  public SimpleFragment( final AbstractDataModelOperation operation, String id )
-  {
-    super( new CommandFactory()
-           {
-             public AbstractDataModelOperation create()
-             {
-               return operation;
-             }
-           }, id );  
-  }
-  
-  public SimpleFragment( CommandFactory commandFactory, String id )
-  {
-  	super( commandFactory, id );
-  }
-  
-  /**
-    * Copy constructor for fragment.
-  **/
-  protected SimpleFragment( SimpleFragment fragment )
-  {
-    super( fragment.getCommandFactory(), fragment.getId() );
-  }
-    
-  /**
-    * All wizard fragments need to be cloneable.
-  **/
-  public Object clone()
-  {
-    return new SimpleFragment( this );
-  }
-
-
-  /** 
-    * Gets the first child fragment for this fragment.
-    *
-    * @return returns the first child fragment for this fragment.  Returns
-    * null when there is no first child.
-  **/
-  public CommandFragment getFirstSubFragment(){ return null; }
-
-  /**
-    * Gets the next child fragment for this fragment.
-    * Since this is a simple fragment, there is no next fragment
-    * so we will always return null. 
-    *
-    * @return returns the next child fragment for this fragment.  Returns null
-    * when there is no next child.
-  **/  
-  public CommandFragment getNextSubFragment( CommandFragment fragment ){ return null; }
-}  
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
deleted file mode 100644
index 86f4829b5..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/env/core/registry/CommandRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.core.registry;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-
-/**
- * This interface provides a way to create a CommandFragmentFactoryFactory
- * from an array of ids.
- *
- */
-public interface CommandRegistry 
-{  
-  /**
-   * Creates a CommandFragmentFactoryFactory from an array of ids.
-   * 
-   * @param ids the ids.
-   * @return the CommandFragmentFactoryFactory object.
-   */
-  public CommandFragmentFactoryFactory getFactoryFactory( String[] ids );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/AbstractDataModelOperation.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/AbstractDataModelOperation.java
deleted file mode 100644
index 14a37311b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/AbstractDataModelOperation.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.wst.command.internal.provisional.env.core;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-public abstract class AbstractDataModelOperation extends org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation
-{
-    
-  public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-
-  public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-
-  public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException
-  {
-    return Status.OK_STATUS;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java
deleted file mode 100644
index 409e1df82..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandFactory.java
+++ /dev/null
@@ -1,24 +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.wst.command.internal.provisional.env.core;
-
-/**
- * This interface is used to create Command objects.
- *
- */
-public interface CommandFactory 
-{
-  /**
-   * 
-   * @return returns a created Command object.
-   */
-  public AbstractDataModelOperation create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandManager.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandManager.java
deleted file mode 100644
index 873a376cd..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/CommandManager.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.wst.command.internal.provisional.env.core;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
- * CommandManagers help manage the lifecycle of Commands.
- */
-public interface CommandManager
-{
-  /**
-   * Returns true if this CommandManager is capable of undoing
-   * Commands. Some CommandManagers and Environments may be of
-   * a sort that will never undo() Commands. Command.execute()
-   * methods should take advantage of this method to optimize
-   * out any caching logic whenever this method returns false.
-   */
-  public boolean isUndoEnabled ();
-
-  // There's probably more, like factory methods for creating
-  // Undo/Redo stacks and stuff like that.
-  
-  public DataMappingRegistry getMappingRegistry();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java
deleted file mode 100644
index 6a0a4d4d4..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/ICommandFactory.java
+++ /dev/null
@@ -1,29 +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.wst.command.internal.provisional.env.core;
-
-import java.util.Iterator;
-
-
-/**
- * 
- * This class is used to return a sequence of Commands.
- *
- */
-public interface ICommandFactory extends Iterator 
-{
-  /**
-   * 
-   * @return returns the next Command in the sequence.
-   */
-  public AbstractDataModelOperation getNextCommand();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java
deleted file mode 100644
index 5ff072a5b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/SimpleCommandFactory.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.wst.command.internal.provisional.env.core;
-
-import java.util.Vector;
-
-
-public class SimpleCommandFactory implements ICommandFactory 
-{
-    private Vector commands_;
-	private int    index_;
-	
-	public SimpleCommandFactory( Vector commands )
-	{
-	  commands_ = commands;
-	  index_    = 0;
-	}
-	
-	public AbstractDataModelOperation getNextCommand() 
-	{
-		return (AbstractDataModelOperation)next();
-	}
-
-	public void remove() 
-	{
-      throw new UnsupportedOperationException();
-	}
-
-	public boolean hasNext() 
-	{
-		return index_ < commands_.size();
-	}
-
-	public Object next() 
-	{
-		return commands_.elementAt(index_++);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Condition.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Condition.java
deleted file mode 100644
index 35058af0c..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Condition.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.provisional.env.core.common;
-
-/**
- * This interface defines a boolean condition that can be evaluated for any object.
- */
-public interface Condition
-{
-  /**
-   * This returns whether the given object passes this condition.
-   */
-  public boolean evaluate();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Evaluate.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Evaluate.java
deleted file mode 100644
index 255a81f01..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Evaluate.java
+++ /dev/null
@@ -1,22 +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.wst.command.internal.provisional.env.core.common;
-
-/**
-  * This interface can be used when a conditional object needs to be returned.
-**/
-public interface Evaluate
-{
-  /**
-    * @return returns an object based on some evaluated condition.
-  **/
-  public Object evaluate();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/MessageUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/MessageUtils.java
deleted file mode 100644
index 8dbf18289..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/MessageUtils.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.provisional.env.core.common;
-
-import java.text.MessageFormat;
-import java.util.Hashtable;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-/**
- * This class provides a convienent way to access resource bundles and
- * retieve translated strings.
- *
- *
- */
-public class MessageUtils
-{
-  private ResourceBundle resource_;
-  
-  private static Hashtable bundles_ = new Hashtable();
-  
-  /**
-   * 
-   * @param bundleId the resource bundle ID.
-   * @param object the class loader for this object will be used to retrieve
-   *               the resource bundle.
-   */
-  public MessageUtils( String bundleId, Object object )
-  {
-    this( bundleId, object.getClass().getClassLoader() );
-  }
-  
-  /**
-   * 
-   * @param bundleId the resource bundle ID.
-   * @param loader the class loader that will be used to retrieve
-   *               the resource bundle.
-   */
-  public MessageUtils( String bundleId, ClassLoader loader )
-  {
-    resource_ = (ResourceBundle)bundles_.get( bundleId );
-    
-    if( resource_ == null )
-    {
-      resource_ = ResourceBundle.getBundle( bundleId, Locale.getDefault(), loader );
-      bundles_.put( bundleId, resource_ );
-    }
-  }
-  
-  /**
-   * 
-   * @param key the key for the string to retrieve.
-   * @return returns the translated string.
-   */
-  public String getMessage ( String key )
-  {
-    String value = key;
-    
-    try
-    {
-      value = resource_.getString( key ); 
-    }
-    catch( Throwable exc )
-    {
-    }
-    
-    return value;
-  }
-  
-  /**
-   * 
-   * @param key the key for the string to retrieve.
-   * @param args These arguments will be substituted into the translated string.
-   * @return returns the translated string with any substitutions.
-   */
-  public String getMessage ( String key, Object[] args )
-  {
-    return MessageFormat.format( getMessage(key),args );
-  } 
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/ProgressUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/ProgressUtils.java
deleted file mode 100644
index 1ca1aa14d..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/ProgressUtils.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.wst.command.internal.provisional.env.core.common;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-public class ProgressUtils
-{
-  static public void report( IProgressMonitor monitor, String message )
-  {
-    if( monitor != null ) 
-    {
-       monitor.beginTask( message, IProgressMonitor.UNKNOWN );
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Range.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Range.java
deleted file mode 100644
index 828f3a9e0..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/Range.java
+++ /dev/null
@@ -1,62 +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.wst.command.internal.provisional.env.core.common;
-
-import org.eclipse.wst.common.environment.uri.URI;
-
-/**
- * Carries position information within a resource.
- */
-public interface Range
-{
-  public static final int UNKNOWN = -1;
-
-  /**
-   * Returns the identifier of the resource the range applies to.
-   */
-  public URI getURI ();
-
-  /**
-   * Returns the index, zero-indexed, of the first line
-   * of the range.
-   */
-  public int getStartingLineNumber ();
-
-  /**
-   * Returns the index, zero-indexed, of the first character
-   * of the range relative to the beginning of the line.
-   */
-  public int getStartingCharNumberInLine ();
-
-  /**
-   * Returns the index, zero-indexed, of the first character
-   * of the range relative to the beginning of the file.
-   */
-  public int getStartingCharNumberInURI ();
-
-  /**
-   * Returns the index, zero-indexed, of the last line
-   * of the range.
-   */
-  public int getEndingLineNumber ();
-
-  /**
-   * Returns the offset, zero-indexed, of the last character
-   * of the range relative to the beginning of the line.
-   */
-  public int getEndingCharNumberInLine ();
-
-  /**
-   * Returns the index, zero-indexed, of the last character
-   * of the range relative to the beginning of the file.
-   */
-  public int getEndingCharNumberInURI ();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/RangeVector.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/RangeVector.java
deleted file mode 100644
index ee3c52a02..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/RangeVector.java
+++ /dev/null
@@ -1,30 +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.wst.command.internal.provisional.env.core.common;
-
-import java.util.Vector;
-
-/**
- * This Vector makes the protected method removeRange public.
- *
- */
-public class RangeVector extends Vector
-{
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 4048793476659230773L;
-
-  public void removeRange( int start, int end )
-  {
-    super.removeRange( start, end );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/StatusUtils.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/StatusUtils.java
deleted file mode 100644
index 3927873db..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/common/StatusUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.wst.command.internal.provisional.env.core.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-
-public class StatusUtils
-{
-  public static IStatus errorStatus( String errorMessage )
-  {
-    return new Status( IStatus.ERROR, "id", 0, errorMessage, null );
-  }
-  
-  public static IStatus errorStatus( Throwable exc )
-  {
-    String message = exc.getMessage();
-    
-    return new Status( IStatus.ERROR, "id", 0, message == null ? "" : message, exc );
-  }
-  
-  public static IStatus errorStatus( String message, Throwable exc )
-  {
-    return new Status( IStatus.ERROR, "id", 0, message, exc );
-  }
-  
-  public static MultiStatus multiStatus( String message, IStatus[] children, Throwable exc )
-  {
-    return new MultiStatus( "id", 0, children, message, exc );  
-  }
-  
-  public static MultiStatus multiStatus( String message, IStatus[] children )
-  {
-    return new MultiStatus( "id", 0, children, message, null );  
-  }
-  
-  public static IStatus warningStatus( String warningMessage )
-  {
-    return new Status( IStatus.WARNING, "id", 0, warningMessage, null );
-  }
-  
-  public static IStatus warningStatus( String warningMessage, Throwable exc )
-  {
-    return new Status( IStatus.WARNING, "id", 0, warningMessage, exc );
-  }
-  
-  public static IStatus infoStatus( String infoMessage )
-  {
-    return new Status( IStatus.INFO, "id", 0, infoMessage, null );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/Context.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/Context.java
deleted file mode 100644
index af278b9ff..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/Context.java
+++ /dev/null
@@ -1,87 +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.wst.command.internal.provisional.env.core.context;
-
-/**
- * This interface provides a way to get and set preference information.
- *
- */
-public interface Context 
-{
- /**
-  * Loads the preference data into this Context object.
-  *
-  */
- public void load();
-
- /**
-  * Sets the default for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, boolean value); 
- 
- /**
-  * Sets the default for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, String value);
- 
- /**
-  * Sets the default for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, int value); 
-
- /**
-  * Sets the value for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, String value);
- 
- /**
-  * Sets the value for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, boolean value);
- 
- /**
-  * Sets the value for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, int value);   
-
- /**
-  * Gets the value for a string preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public String getValueAsString ( String name);
- 
- /**
-  * Gets the value for a boolean preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public boolean getValueAsBoolean ( String name);
- 
- /**
-  * Gets the value for a int preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public int getValueAsInt ( String name);  		
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceContext.java
deleted file mode 100644
index 9faff0041..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceContext.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.provisional.env.core.context;
-
-public interface ResourceContext 
-{
- /**
-   * This constant string is used to lookup the overwrite files general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_OVERWRITE = "filesOverwrite";
-
- /**
-   * This constant string is used to lookup the create folders general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CREATE_FOLDERS = "createFolders";
- 
- /**
-   * This constant string is used to lookup the checkout files general preference from
-   * the plugins local preferences store.
- **/
- public static final String PREFERENCE_CHECKOUT = "filesCheckout";
-
- /**
-  * 
-  * @param enable set whether overwriting of files is enabled.
-  */
- public void setOverwriteFilesEnabled ( boolean enable);
- 
- /**
-  * 
-  * @return returns whether overwriting of files is enabled.
-  */
- public boolean isOverwriteFilesEnabled();
- 
- /**
-  * 
-  * @param enable set whether creation of folders is enabled.
-  */
- public void setCreateFoldersEnabled( boolean enable);
- 
- /**
-  * 
-  * @return returns whether creation of folders is enabled.
-  */
- public boolean isCreateFoldersEnabled(); 
- 
- /**
-  * 
-  * @param enable sets whether automatic checkout of files is enabled.
-  */
- public void setCheckoutFilesEnabled( boolean enable);
- 
- /**
-  * 
-  * @return returns whether automatic checkout of files is enabled.
-  */
- public boolean isCheckoutFilesEnabled();
- 
- /**
-  * 
-  * @return returns a copy of this ResourceContext.
-  */
- public ResourceContext copy();
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceDefaults.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceDefaults.java
deleted file mode 100644
index 7a22a287b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/ResourceDefaults.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.provisional.env.core.context;
-
-public class ResourceDefaults
-{
- private static final boolean PREFERENCE_OVERWRITE_DEFAULT = false;
- private static final boolean PREFERENCE_CREATE_FOLDERS_DEFAULT = true;
- private static final boolean PREFERENCE_CHECKOUT_DEFAULT = false;
-
- /**
-  * 
-  * @return returns the default setting for overwriting files.
-  */
- public static boolean getOverwriteFilesDefault ()
- {
- 	return PREFERENCE_OVERWRITE_DEFAULT;
- }
- 
- /**
-  * 
-  * @return returns the default setting ofr creating folders.
-  */
- public static boolean getCreateFoldersDefault ()
- { 
-	return PREFERENCE_CREATE_FOLDERS_DEFAULT;
- }
-
- /**
-  * 
-  * @return returns the default setting for checking out files.
-  */
- public static boolean getCheckoutFilesDefault()
- {
-	return PREFERENCE_CHECKOUT_DEFAULT;
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/TransientResourceContext.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/TransientResourceContext.java
deleted file mode 100644
index 791aa959c..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/context/TransientResourceContext.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.provisional.env.core.context;
-
-/**
- * This class implements a ResourceContext interface where the state
- * of the context data is transient.
- *
- */
-public class TransientResourceContext implements ResourceContext 
-{
-  private boolean overWriteFiles;
-  private boolean createFolders;
-  private boolean checkOutFiles;
-
-  public TransientResourceContext() {
-    setOverwriteFilesEnabled(ResourceDefaults.getOverwriteFilesDefault());
-    setCreateFoldersEnabled(ResourceDefaults.getCreateFoldersDefault());
-    setCheckoutFilesEnabled(ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#setOverwriteFilesEnabled(boolean)
-   */
-  public void setOverwriteFilesEnabled(boolean enable) {
-    overWriteFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#isOverwriteFilesEnabled()
-   */
-  public boolean isOverwriteFilesEnabled() {
-    return overWriteFiles;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#setCreateFoldersEnabled(boolean)
-   */
-  public void setCreateFoldersEnabled(boolean enable) {
-    createFolders = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#isCreateFoldersEnabled()
-   */
-  public boolean isCreateFoldersEnabled() {
-    return createFolders;
-  }
-
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#setCheckoutFilesEnabled(boolean)
-   */
-  public void setCheckoutFilesEnabled(boolean enable) {
-    checkOutFiles = enable;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#isCheckoutFilesEnabled()
-   */
-  public boolean isCheckoutFilesEnabled() {
-    return checkOutFiles;
-  }
-  
-  /**  
-   * @see org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext#copy()
-   */
-  public ResourceContext copy() {
-    ResourceContext cc = new TransientResourceContext();
-    cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
-    cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
-    cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
-    return cc;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/DataMappingRegistry.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/DataMappingRegistry.java
deleted file mode 100644
index b34a8748b..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/DataMappingRegistry.java
+++ /dev/null
@@ -1,47 +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.wst.command.internal.provisional.env.core.data;
-
-public interface DataMappingRegistry
-{
-  /**
-   * This method adds a data mapping from a source object to a target
-   * object.  When the sourceObject is encountered by the framework the
-   * sourceProperty will be called and the data will be passed to the
-   * targetProperty in the targetObject.  If a transformer object is
-   * specified the sourceObject is transformed before being passed to
-   * the target object.
-   * 
-   * @param sourceType      The source object.
-   * @param sourceProperty  The source property.
-   * @param targetType      The target object.
-   * @param targetProperty  The target property.
-   * @param transformer     The transformer object that transforms the
-   *                        the source object.
-   */
-  public void addMapping( Class       sourceType,
-						  String      sourceProperty,
-						  Class       targetType,
-						  String      targetProperty,
-						  Transformer transformer );
-  
-  /**
-   * This method is equivalent to the above with targetProperty the same
-   * as the sourceProperty and with the transformer set to null.
-   * 
-   * @param sourceType     The source object.
-   * @param sourceProperty The source property.
-   * @param targetType     The target object.
-   */
-  public void addMapping( Class       sourceType,
-	                      String      sourceProperty,
-	                      Class       targetType );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/Transformer.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/Transformer.java
deleted file mode 100644
index 1c2bdb2e6..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/data/Transformer.java
+++ /dev/null
@@ -1,23 +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.wst.command.internal.provisional.env.core.data;
-
-/**
- * This interface is used to transform an object from one class to another.
- *
- */
-public interface Transformer
-{
-  /*
-   * @return returns a transformed object based on the input value.
-   */
-  public Object transform( Object value );
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/BooleanSelection.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/BooleanSelection.java
deleted file mode 100644
index 13865219c..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/BooleanSelection.java
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-/**
- * This class combines a string with a boolean value.  This is
- * useful for storing the state data for a boolean selection list.
- */
-package org.eclipse.wst.command.internal.provisional.env.core.selection;
-
-public class BooleanSelection
-{
-  private String  value_;
-  private boolean selected_;
-  
-  public BooleanSelection( String value, boolean selected )
-  {
-    value_    = value;
-    selected_ = selected;
-  }
-  
-  /**
-   * 
-   * @return Get the string value.
-   */
-  public String getValue()
-  {
-    return value_;
-  }
-  
-  /**
-   * 
-   * @return Get the boolean value for this string.
-   */
-  public boolean isSelected()
-  {
-    return selected_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/ChoicesToString.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/ChoicesToString.java
deleted file mode 100644
index 5f39b4e83..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/ChoicesToString.java
+++ /dev/null
@@ -1,47 +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.wst.command.internal.provisional.env.core.selection;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-/**
- * This transformer class selects a string at a particular level
- * in a SelectionListChoices class.
- */
-public class ChoicesToString implements Transformer
-{
-  private int level_;
-  
-  public ChoicesToString( int level )
-  {
-    level_ = level;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
-   */
-  public Object transform( Object value )
-  {
-    SelectionListChoices choices = (SelectionListChoices)value;
-    
-    for( int index = 0; index < level_; index++ )
-    {
-      choices = choices.getChoice();
-    }
-    
-    return choices.getList().getSelection();
-  }
-
-  public SelectionList transform( SelectionListChoices choices )
-  {
-    return (SelectionList)transform( (Object)choices );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/DynamicList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/DynamicList.java
deleted file mode 100644
index a76b04b76..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/DynamicList.java
+++ /dev/null
@@ -1,92 +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.wst.command.internal.provisional.env.core.selection;
-
-import java.util.Vector;
-
-/**
- * This is a Dynamic version of the SelectionListChoices class.
- */
-public class DynamicList 
-{
-  private Vector stringList_ = new Vector();
-  private Vector dynamicListVectorList_ = new Vector();
-  
-  /**
-   * Adds an entry into the dynamic list.
-   * 
-   * @param values the string values that lead to the target.
-   * @param target the target.
-   */
-  public void add( String[] values, Object target )
-  {
-    DynamicList currentList = this;
-    
-    for( int index = 0; index < values.length; index++ )
-    {
-      String value      = values[index];
-      int    length     = currentList.stringList_.size();
-      int    foundIndex = -1;
-      
-      // Find the string in the current list.
-      for( int searchIndex = 0; searchIndex < length; searchIndex++ )
-      {
-        String string = (String)currentList.stringList_.elementAt( searchIndex ); 
-        
-        if( string.equals( value ) ) 
-        {
-          foundIndex = searchIndex;
-          break;
-        }
-      }
-      
-      if( foundIndex == -1 )
-      {
-        // We have a new string so add it to the list.
-        currentList.stringList_.add( value );
-        currentList.dynamicListVectorList_.add( new DynamicList() );
-        foundIndex = length;
-      }
-      
-      currentList = (DynamicList)currentList.dynamicListVectorList_.elementAt( foundIndex );       
-    }
-    
-    currentList.dynamicListVectorList_.add( target );
-  }
-  
-  /**
-   * 
-   * @return returns a SelectionListChoices object from this DynamicList
-   * object.
-   */
-  public SelectionListChoices toListChoices()
-  {
-    SelectionList list   = new SelectionList( (String[])stringList_.toArray( new String[0] ), 0);
-    int           length = dynamicListVectorList_.size();
-    Vector        vector = new Vector(); 
-    
-    for( int index = 0; index < length; index++ )
-    {
-      Object obj = dynamicListVectorList_.elementAt(index);
-      
-      if( obj instanceof DynamicList )
-      {
-        vector.add( ((DynamicList)obj).toListChoices() );
-      }
-      else
-      {
-        vector.add( obj );
-      }
-    }
-    
-    return new SelectionListChoices( list, vector );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionList.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionList.java
deleted file mode 100644
index d6354dbb1..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionList.java
+++ /dev/null
@@ -1,96 +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.wst.command.internal.provisional.env.core.selection;
-
-/**
- * This class stores a list strings along with a selectionIndex which
- * stores the current string that selected.  There is also a selection
- * value.  If this value is one of the strings in the the string list
- * then selectionIndex will contain the index of this string.  If it
- * is not in the list then the selectionValue string will contain this
- * value and selectionIndex will be set to -1.  This class can be
- * used to store the state data for a Combo box.
- */
-public class SelectionList
-{
-  private int      selectionIndex_;
-  private String[] list_;
-  private String   selectionValue_;
-  
-  public SelectionList( String[] list, int selectionIndex )
-  {
-    list_           = list;
-    selectionIndex_ = selectionIndex;
-  }
-  
-  /**
-   * Sets the selection value for this object.
-   * 
-   * @param value the value.
-   */
-  public void setSelectionValue( String value )
-  {
-    selectionValue_ = value;  
-    selectionIndex_ = -1;
-    
-    for( int index = 0; index < list_.length; index++ )
-    {
-      if( value.equals( list_[index] ) )
-      {
-        selectionIndex_ = index;
-        break;
-      }
-    }
-  } 
-  
-  /*
-   * @return returns the string list.
-   */
-  public String[] getList()
-  {
-    return list_;
-  }
-  
-  /*
-   * Sets the currently selected string in the list.
-   */
-  public void setIndex( int index )
-  {
-    selectionIndex_ = index;
-    selectionValue_ = null;
-  }
- 
-  /*
-   * @return returns the index of the current string.  The value
-   * will be -1 if the selection value is not in the string list.
-   */
-  public int getIndex()
-  {
-    return selectionIndex_;  
-  }
-  
-  /*
-   * @return returns the current string selection for this object.
-   */
-  public String getSelection()
-  {
-    if( selectionValue_ != null ) return selectionValue_;
-    
-    if( selectionIndex_ == -1 || selectionIndex_ > list_.length-1 )
-    {
-      return "";
-    }
-    else
-    {
-      return list_[ selectionIndex_ ];
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionListChoices.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionListChoices.java
deleted file mode 100644
index 04b0d72fa..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/selection/SelectionListChoices.java
+++ /dev/null
@@ -1,121 +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.wst.command.internal.provisional.env.core.selection;
-
-import java.util.Vector;
-
-/*
- * This class can be used to store a hierarchy of SelectionList
- * objects.
- */
-public class SelectionListChoices
-{
-  private SelectionList selectionList_;
-  private Vector        choices_;
-  private SelectionList newValueSelectionList_;
-  
-  /**
-   * 
-   * @param list     The selection list.
-   * @param choices  This is a vector of SelectionListChoies and can be
-   *                 null if there are no choices.  This index of list
-   *                 is used to index into choices.  If index is -1 then
-   *                 the newValueSelectionList is used.
-   */
-  public SelectionListChoices( SelectionList list, Vector choices )
-  {
-    selectionList_ = list;
-    choices_       = choices;
-    
-    newValueSelectionList_ = new SelectionList( new String[0], -1 );
-  }
-  
-  public SelectionListChoices( SelectionList list, Vector choices, SelectionList newList )
-  {
-    this( list, choices );
-    newValueSelectionList_ = newList;
-  }
-  
-  /**
-   * @return returns the current Selection list.
-   */
-  public SelectionList getList()
-  {
-    return selectionList_;
-  }
-  
-  /**
-   * 
-   * @return returns the choices for this object.
-   */
-  public Vector getChoices()
-  {
-    return choices_;
-  }
-  
-  /**
-   * 
-   * @param level the level in the hierarchy where we want to get the choices.
-   * @return returns a vector of SelectionListChoices.
-   */
-  public Vector getChoicesAtLevel( int level )
-  {
-    SelectionListChoices choices = this;
-    
-    for( int index = 0; index < level; index++ )
-    {
-      choices = choices.getChoice();
-    }
-    
-    return choices.getChoices();
-  }
-  
-  /**
-   * 
-   * @return returns the current SelectionListChoice
-   */
-  public SelectionListChoices getChoice()
-  {
-    int                  selectionIndex = selectionList_.getIndex();
-    SelectionListChoices result         = null;
-    
-    if( selectionIndex == -1 )
-    {
-      result = new SelectionListChoices( newValueSelectionList_, null );
-    }
-    else if( choices_ != null && choices_.size() != 0 ) 
-    {
-      result = (SelectionListChoices)choices_.elementAt( selectionIndex );
-    }
-    
-    return result;
-  }
-  
-  /**
-   * 
-   * @param index the index of the choice we want.
-   * @return returns the SelectionListChoice at the index specified.
-   */
-  public SelectionListChoices getChoice(int index)
-  {
-    SelectionListChoices result = null;
-    if (index < 0 || index >= getList().getList().length)
-    {
-      result = new SelectionListChoices( newValueSelectionList_, null );      
-    }
-    else
-    {
-      result = (SelectionListChoices)choices_.elementAt( index );
-    }
-      
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java b/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java
deleted file mode 100644
index fd5a761e1..000000000
--- a/bundles/org.eclipse.wst.command.env.core/src/org/eclipse/wst/command/internal/provisional/env/core/uri/NativeFileCommand.java
+++ /dev/null
@@ -1,117 +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.wst.command.internal.provisional.env.core.uri;
-
-import java.io.File;
-import java.util.LinkedList;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-import org.eclipse.wst.common.environment.uri.URI;
-import org.eclipse.wst.common.environment.uri.URIException;
-
-public abstract class NativeFileCommand extends AbstractDataModelOperation
-{
-  protected String name;
-
-  protected String description;
-
-  protected URI[] urisToRead;
-
-  protected URI[] urisToWrite;
-
-  protected NativeFileCommand ()
-  {
-    this(null,null);
-  }
-
-  protected NativeFileCommand ( String name, String description )
-  {
-    this.name = name;
-    this.description = description;
-  }
-
-  public String getName ()
-  {
-    return name;
-  }
-
-  public String getDescription ()
-  {
-    return description;
-  }
-
-  public void setURIsToRead ( URI[] urisToRead )
-  {
-    this.urisToRead = urisToRead;
-  }
-
-  public URI[] getURIsToRead ()
-  {
-    return urisToRead;
-  }
-
-  public void setURIsToWrite ( URI[] urisToWrite )
-  {
-    this.urisToWrite = urisToWrite;
-  }
-
-  public URI[] getURIsToWrite ()
-  {
-    return urisToWrite;
-  }
-
-  public IStatus execute ( IProgressMonitor monitor, IAdaptable adaptable )
-  {
-    File[] filesToRead = getFiles(urisToRead);
-    File[] filesToWrite = getFiles(urisToWrite);
-    preProcess(filesToRead,filesToWrite);
-    IStatus status = execute(filesToRead,filesToWrite);
-    postProcess(filesToRead,filesToWrite);
-    return status;
-  }
-
-  public abstract IStatus execute ( File[] filesToRead, File[] filesToWrite );
-
-  private void preProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private void postProcess ( File[] filesToRead, File[] filesToWrite )
-  {
-    // TBD.
-  }
-
-  private File[] getFiles ( URI[] uris )
-  {
-    List list = new LinkedList();
-    if (uris != null)
-    {
-      for (int i=0; i<uris.length; i++)
-      {
-        if (uris[i].isAvailableAsFile())
-        {
-          try
-          {
-            list.add(uris[i].asFile());
-          }
-          catch (URIException e)
-          {
-          }
-        }
-      }
-    }
-    return (File[])list.toArray(new File[0]);
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/.classpath b/bundles/org.eclipse.wst.command.env.ui/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env.ui/.cvsignore b/bundles/org.eclipse.wst.command.env.ui/.cvsignore
deleted file mode 100644
index 272cab616..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-envui.jar
diff --git a/bundles/org.eclipse.wst.command.env.ui/.project b/bundles/org.eclipse.wst.command.env.ui/.project
deleted file mode 100644
index ceb0b3793..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.command.env.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index ae83b3a4b..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.command.internal.env.ui.plugin.EnvUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.ui.widgets,
- org.eclipse.wst.command.internal.env.ui.dialog,
- org.eclipse.wst.command.internal.env.ui.eclipse,
- org.eclipse.wst.command.internal.env.ui.plugin,
- org.eclipse.wst.command.internal.env.ui.preferences,
- org.eclipse.wst.command.internal.env.ui.registry,
- org.eclipse.wst.command.internal.env.ui.widgets,
- org.eclipse.wst.command.internal.env.ui.widgets.popup,
- org.eclipse.wst.command.internal.provisional.env.ui.widgets
-Require-Bundle: org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.osgi,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.command.env.ui/about.html b/bundles/org.eclipse.wst.command.env.ui/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/build.properties b/bundles/org.eclipse.wst.command.env.ui/build.properties
deleted file mode 100644
index 4b75d2852..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               about.html
-source.. = src/
-output.. = bin/
-src.includes = schema/
diff --git a/bundles/org.eclipse.wst.command.env.ui/plugin.properties b/bundles/org.eclipse.wst.command.env.ui/plugin.properties
deleted file mode 100644
index ec1506610..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.properties
+++ /dev/null
@@ -1,18 +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=Environment Command Framework (GUI)
-PLUGIN_PROVIDER=Eclipse.org
-
-WIDGET_REGISTRY_NAME=Widget contributor registry
diff --git a/bundles/org.eclipse.wst.command.env.ui/plugin.xml b/bundles/org.eclipse.wst.command.env.ui/plugin.xml
deleted file mode 100644
index edee0b8e1..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension-point id="widgetRegistry" name="%WIDGET_REGISTRY_NAME" schema="schema/widgetRegistry.exsd"/>   
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd b/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
deleted file mode 100644
index 8b59ca14f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/schema/widgetRegistry.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.command.env.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.command.env.ui" id="widgetRegistry" name="widgetRegistry"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="widgetFactory"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="widgetFactory">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="insertBeforeCommandId" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties
deleted file mode 100644
index bc1f40349..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/environmentui.properties
+++ /dev/null
@@ -1,19 +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
-###############################################################################
-
-BUTTON_SHOW_ALL_DIALOGS=Show All
-BUTTON_HIDE_ALL_DIALOGS=Hide All
-CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN=Do not show me this dialog box again.
-
-TOOLTIP_PPAD_PAGE=Control to show/hide the dialogs that appear when a pop-up action is executed.
-TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN=To allow this dialog to show again, enable from preference - dialogs.
-TOOLTIP_PPAD_BUTTON_SHOW_ALL=Show all dialogs.
-TOOLTIP_PPAD_BUTTON_HIDE_ALL=Hide all dialogs and execute pop-up actions.
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties
deleted file mode 100644
index 7a98e3683..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/env/ui/widgets/environment.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-MSG_ERROR_WIZARD_ID_NOT_FOUND=IWAB0013E Could not find wizard id: {0}
-
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
deleted file mode 100644
index 16cc76ad6..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/ErrorDialog.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class ErrorDialog extends MessageDialog
-{
-
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public ErrorDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() || status.getException() != null )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
deleted file mode 100644
index fa6c84f0a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/InfoDialog.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class InfoDialog extends MessageDialog
-{
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public InfoDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
deleted file mode 100644
index 8efb3252a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/MessageDialog.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class MessageDialog extends Dialog
-{
-  protected Composite parent;
-
-  /**
-   * Reserve room for this many list items.
-   */
-  protected static final int LIST_ITEM_COUNT = 7;
-
-  /**
-   * The Details button.
-   */
-  protected Button detailsButton;
-
-  /**
-   * The title of the dialog.
-   */
-  protected String title;
-
-  /**
-   * The message to display.
-   */
-  protected String message;
-
-  /**
-   * The SWT list control that displays the error details.
-   */
-  protected List list;
-  protected Text details;
-
-  /**
-   * Indicates whether the error details viewer is currently created.
-   */
-  protected boolean listCreated = false;
-  protected boolean detailsCreated = false;
-
-  /**
-   * Filter mask for determining which status items to display.
-   */
-  protected int displayMask = 0xFFFF;
-
-  /**
-   * The main status object.
-   */
-  protected IStatus status;
-  
-  private Point savedSize = null;
-
-  /**
-   * List of the main error object's detailed errors (element type: <code>Status</code>).
-   */
-  protected java.util.List statusList;
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public MessageDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell);
-      this.title = dialogTitle == null ? JFaceResources.getString("Problem_Occurred") : //$NON-NLS-1$
-  dialogTitle;
-    this.message = message == null ? status.getMessage() : JFaceResources.format("Reason", new Object[] { message, status.getMessage()}); //$NON-NLS-1$
-    this.status = status;
-    statusList = Arrays.asList(status.getChildren());
-    this.displayMask = displayMask;
-    setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
-  }
-  /*
-   * (non-Javadoc) Method declared on Dialog. Handles the pressing of the Ok or
-   * Details button in this dialog. If the Ok button was pressed then close
-   * this dialog. If the Details button was pressed then toggle the displaying
-   * of the error details area. Note that the Details button will only be
-   * visible if the error being displayed specifies child details.
-   */
-  protected void buttonPressed(int id)
-  {
-    if (id == StatusDialogConstants.DETAILS_ID)
-    { // was the details button pressed?
-      toggleDetailsArea();
-    }
-    else
-    {
-      super.buttonPressed(id);
-    }
-  }
-  /*
-   * (non-Javadoc) Method declared in Window.
-   */
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(title);
-  }
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    if (status.isMultiStatus() || status.getException() != null )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-    
-    parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-  }
-
-  /*
-   * (non-Javadoc) Method declared on Dialog. Creates and returns the contents
-   * of the upper part of the dialog (above the button bar).
-   */
-  protected Control createDialogArea(Composite parent)
-  {
-    this.parent = parent;
-
-    // create composite
-    Composite composite = (Composite) super.createDialogArea(parent);
-    Composite imageAndLabel = new Composite(composite, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    imageAndLabel.setLayout(gl);
-    composite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ));
-    
-    // create image
-    Image image = getDialogImage();
-    if (image != null)
-    {
-      Label label = new Label(imageAndLabel, 0);
-      image.setBackground(label.getBackground());
-      label.setImage(image);
-      label.setLayoutData(
-        new GridData(
-          GridData.HORIZONTAL_ALIGN_CENTER
-            | GridData.VERTICAL_ALIGN_BEGINNING));
-    }
-
-    // create message
-    if (message != null)
-    {
-      Text text = new Text(imageAndLabel, SWT.READ_ONLY|SWT.WRAP);
-      text.setText(message);
-      GridData data =
-        new GridData(
-          GridData.GRAB_HORIZONTAL
-            | GridData.GRAB_VERTICAL
-            | GridData.HORIZONTAL_ALIGN_FILL
-            | GridData.VERTICAL_ALIGN_CENTER);
-      data.widthHint =
-        convertHorizontalDLUsToPixels(
-          IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-     
-      text.setLayoutData(data);
-      text.setFont(parent.getFont());
-    }
-
-    return composite;
-  }
-
-  protected List createDropDownList(Composite parent)
-  {
-    // create the list
-    list = new List(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-    // fill the list
-    populateList(list);
-
-    GridData data =
-      new GridData(
-        GridData.HORIZONTAL_ALIGN_FILL
-          | GridData.GRAB_HORIZONTAL
-          | GridData.VERTICAL_ALIGN_FILL
-          | GridData.GRAB_VERTICAL);
-    data.heightHint = list.getItemHeight() * LIST_ITEM_COUNT;
-    list.setLayoutData(data);
-    listCreated = true;
-    return list;
-  }
-  protected Text createDropDownDetails(Composite parent)
-  {
-    details = new Text(parent, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY);
-    //details.setEditable(false);
-    Color color = new Color(parent.getShell().getDisplay(), 255, 255, 255);
-    details.setBackground(color);
-    populateDetails(details, status, 0);
-    GridData data =
-      new GridData(
-        GridData.HORIZONTAL_ALIGN_FILL
-          | GridData.GRAB_HORIZONTAL
-          | GridData.VERTICAL_ALIGN_FILL
-          | GridData.GRAB_VERTICAL);
-    details.setLayoutData(data);
-    details.setSelection(0);
-    detailsCreated = true;
-    return details;
-  }
-  /*
-   * (non-Javadoc) Method declared on Window.
-   */
-  /**
-   * Extends <code>Window.open()</code>. Opens an error dialog to display
-   * the error. If you specified a mask to filter the displaying of these
-   * children, the error dialog will only be displayed if there is at least one
-   * child status matching the mask.
-   */
-  public int open()
-  {
-    if (shouldDisplay(status, displayMask))
-    {
-      return super.open();
-    }
-    return 0;
-  }
-  /**
-   * This essentially does the work of a factory Opens an error dialog to
-   * display the given error. Use this method if the error object being
-   * displayed does not contain child items, or if you wish to display all such
-   * items without filtering.
-   * 
-   * @param parent
-   *            the parent shell of the dialog, or <code>null</code> if none
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @return the code of the button that was pressed that resulted in this
-   *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-   *         button was pressed, or <code>Dialog.CANCEL</code> if this
-   *         dialog's close window decoration or the ESC key was used.
-   */
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    IStatus status)
-  {
-
-    switch (status.getSeverity())
-    {
-      case IStatus.INFO :
-        return openInfo(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-      case IStatus.WARNING :
-        return openWarning(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-      default :
-        return openError(
-          parent,
-          dialogTitle,
-          message,
-          status,
-          IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR);
-    }
-
-  }
-
-  public static int openMessage(
-    Shell parent,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    Choice[] options)
-  {
-
-    return openOptions(
-      parent,
-      dialogTitle,
-      message,
-      status,
-      IStatus.OK | IStatus.INFO | IStatus.WARNING | IStatus.ERROR,
-      options);
-  }
-
-  /**
-   * Opens an error dialog to display the given error. Use this method if the
-   * error object being displayed contains child items <it>and</it> you wish
-   * to specify a mask which will be used to filter the displaying of these
-   * children. The error dialog will only be displayed if there is at least one
-   * child status matching the mask.
-   * 
-   * @param parentShell
-   *            the parent shell of the dialog, or <code>null</code> if none
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   * @return the code of the button that was pressed that resulted in this
-   *         dialog closing. This will be <code>Dialog.OK</code> if the OK
-   *         button was pressed, or <code>Dialog.CANCEL</code> if this
-   *         dialog's close window decoration or the ESC key was used.
-   */
-  public static int openError(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    ErrorDialog dialog =
-      new ErrorDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openInfo(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    InfoDialog dialog =
-      new InfoDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openWarning(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    WarningDialog dialog =
-      new WarningDialog(parentShell, title, message, status, displayMask);
-    return dialog.open();
-  }
-
-  public static int openOptions(
-    Shell parentShell,
-    String title,
-    String message,
-    IStatus status,
-    int displayMask,
-    Choice[] options)
-  {
-    OptionsDialog dialog =
-      new OptionsDialog(
-        parentShell,
-        title,
-        message,
-        status,
-        displayMask,
-        options);
-    dialog.open();
-    return dialog.getReturnCode();
-  }
-
-  /**
-   * Populates the list using this error dialog's status object. This walks the
-   * child stati of the status object and displays them in a list. The format
-   * for each entry is status_path : status_message If the status's path was
-   * null then it (and the colon) are omitted.
-   */
-  private void populateList(List list)
-  {
-    Iterator enumeration = statusList.iterator();
-    while (enumeration.hasNext())
-    {
-      IStatus childStatus = (IStatus) enumeration.next();
-      populateList(list, childStatus, 0);
-    }
-  }
-  private void populateList(List list, IStatus status, int nesting)
-  {
-    if (!status.matches(displayMask))
-    {
-      return;
-    }
-    StringBuffer sb = new StringBuffer();
-    for (int i = 0; i < nesting; i++)
-    {
-      sb.append("  ");
-    }
-    sb.append(status.getMessage());
-    list.add(sb.toString());
-    IStatus[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateList(list, children[i], nesting + 1);
-    }
-  }
-  private void populateDetails(Text text, IStatus status, int nesting)
-  {
-    if (!status.matches(displayMask))
-    {
-      return;
-    }
-        
-    String    tabChars    = StringUtils.repeat( ' ', nesting * 2 );
-    String    messageLine = tabChars + status.getMessage() + System.getProperty("line.separator");
-    Throwable except      = status.getException();
-    
-    text.append( messageLine );
-    
-    if( except != null )
-    {
-      String[] trace = StringUtils.getStackTrace( except );
-      
-      for( int index = 0; index < trace.length; index++ )
-      {
-        text.append( tabChars + "    " + trace[index] + System.getProperty("line.separator") );
-      }
-    }
-    
-    IStatus[] children = status.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      populateDetails(text, children[i], nesting + 1);
-    }
-  }
-  /**
-   * Returns whether the given status object should be displayed.
-   * 
-   * @param status
-   *            a status object
-   * @param mask
-   *            a mask as per <code>Status.matches</code>
-   * @return <code>true</code> if the given status should be displayed, and
-   *         <code>false</code> otherwise
-   */
-  protected static boolean shouldDisplay(IStatus status, int mask)
-  {
-    IStatus[] children = status.getChildren();
-    if (children == null || children.length == 0)
-    {
-      return status.matches(mask);
-    }
-    for (int i = 0; i < children.length; i++)
-    {
-      if (children[i].matches(mask))
-        return true;
-    }
-    return false;
-  }
-  /**
-   * Toggles the unfolding of the details area. This is triggered by the user
-   * pressing the details button.
-   */
-  private void toggleDetailsArea()
-  {
-    Point windowSize = getShell().getSize();
-    int   newHeight  = -1;
-    
-    if (detailsCreated)
-    {
-      details.dispose();
-      detailsCreated = false;
-      detailsButton.setText(IDialogConstants.SHOW_DETAILS_LABEL);
-      
-      // Without the following computeSize call the setSize call below throws an array out of bounds exception.
-      // Very weird.
-      getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-      
-      newHeight = savedSize.y;
-    }
-    else
-    {
-      if( savedSize == null ) savedSize = windowSize;
-        
-      details = createDropDownDetails((Composite) getContents());
-      detailsButton.setText(IDialogConstants.HIDE_DETAILS_LABEL);
-      newHeight = getContents().computeSize(SWT.DEFAULT, SWT.DEFAULT).y;
-    }
-
-
-    newHeight = newHeight > 400 ? 400 : newHeight;
-    
-    getShell().setSize( new Point(windowSize.x, newHeight) );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
deleted file mode 100644
index 24ceea306..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/OptionsDialog.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.environment.Choice;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class OptionsDialog extends MessageDialog
-{
-  private Choice[] choices;
-  private int returnCode_;
-
-  public OptionsDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask,
-    Choice[] choices)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-    this.choices = choices;
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create a button for each options
-    for (int i = 0; i < choices.length; i++)
-    {
-      createButton(parent, choices[i].getShortcut(), choices[i].getLabel(), true);
-    }
-    if (status.isMultiStatus() )
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  protected void buttonPressed(int id)
-  {
-    if (id == StatusDialogConstants.DETAILS_ID)
-      // was the Details button pressed?
-      super.buttonPressed(id);
-    else
-    {
-      setReturnCode(id);
-      close();
-    }
-  }
-
-  protected void setReturnCode(int id)
-  {
-    returnCode_ = id;
-  }
-
-  public int getReturnCode()
-  {
-    return returnCode_;
-  }
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    switch (status.getSeverity())
-    {
-      case IStatus.INFO :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_INFORMATION);
-      case IStatus.WARNING :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
-      default :
-        return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_ERROR);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
deleted file mode 100644
index 4e56788ec..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/StatusDialogConstants.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-/**
-* Constants for status dialogs
-*/
-public interface StatusDialogConstants {
-
-  /*
-  * Button ID for the "Yes" button
-  */
-  public static final int YES_ID = 2;
-  /*
-  * Button ID for the "Yes to all" button
-  */
-  public static final int YES_TO_ALL_ID = 4;
-  /*
-  * Button ID for the "Cancel" button
-  */
-  public static final int CANCEL_ID = 1;
-  /*
-  * Button ID for the "OK" button
-  */
-  public static final int OK_ID = 0;
-  /*
-  * Button ID for the "Details" button
-  */
-  public static final int DETAILS_ID = 13;
-
-  /*
-  * Button label for the "Yes" button
-  */
- // public static final String YES_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_LABEL");
-  /*
-  * Button label for the "Yes to all" button
-  */
- // public static final String YES_TO_ALL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
-  /*
-  * Button label for the "Cancel" button
-  */
- // public static final String CANCEL_LABEL = EnvironmentPlugin.getInstance().getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
deleted file mode 100644
index 9d28e3d2a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/dialog/WarningDialog.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.dialog;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-
-/**
- * A dialog to display one or more errors to the user, as contained in an
- * <code>Status</code> object. If an error contains additional detailed
- * information then a Details button is automatically supplied, which shows or
- * hides an error details viewer when pressed by the user.
- *  
- */
-public class WarningDialog extends MessageDialog
-{
-  /**
-   * Creates an error dialog. Note that the dialog will have no visual
-   * representation (no widgets) until it is told to open.
-   * <p>
-   * Normally one should use <code>openError</code> to create and open one of
-   * these. This constructor is useful only if the error object being displayed
-   * contains child items <it>and</it> you need to specify a mask which will
-   * be used to filter the displaying of these children.
-   * </p>
-   * 
-   * @param parentShell
-   *            the shell under which to create this dialog
-   * @param dialogTitle
-   *            the title to use for this dialog, or <code>null</code> to
-   *            indicate that the default title should be used
-   * @param message
-   *            the message to show in this dialog, or <code>null</code> to
-   *            indicate that the error's message should be shown as the
-   *            primary message
-   * @param status
-   *            the error to show to the user
-   * @param displayMask
-   *            the mask to use to filter the displaying of child items, as per
-   *            <code>Status.matches</code>
-   */
-  public WarningDialog(
-    Shell parentShell,
-    String dialogTitle,
-    String message,
-    IStatus status,
-    int displayMask)
-  {
-    super(parentShell, dialogTitle, message, status, displayMask);
-  }
-
-  /*
-   * (non-Javadoc) This should also be overwritten Method declared on Dialog.
-   */
-  protected void createButtonsForButtonBar(Composite parent)
-  {
-    // create OK, Cancel and Details buttons
-    createButton(
-      parent,
-      StatusDialogConstants.OK_ID,
-      IDialogConstants.OK_LABEL,
-      true);
-    createButton(
-      parent,
-      StatusDialogConstants.CANCEL_ID,
-      IDialogConstants.CANCEL_LABEL,
-      false);
-    if (status.isMultiStatus())
-    {
-      detailsButton =
-        createButton(
-          parent,
-          StatusDialogConstants.DETAILS_ID,
-          IDialogConstants.SHOW_DETAILS_LABEL,
-          false);
-    }
-  }
-
-  /*
-   * This is one of the few methods that needs to be overwritten by the
-   * subclasses. The image names can be found in the Dialog class
-   */
-  protected Image getDialogImage()
-  {
-    // create image
-    return PlatformUI.getWorkbench().getDisplay().getSystemImage(SWT.ICON_WARNING);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java
deleted file mode 100644
index e22418f57..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseEnvironment.java
+++ /dev/null
@@ -1,112 +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.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.wst.command.internal.env.eclipse.BaseEclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.EnvironmentService;
-import org.eclipse.wst.common.environment.Log;
-import org.eclipse.wst.common.environment.StatusHandler;
-import org.eclipse.wst.common.environment.uri.SimpleURIFactory;
-import org.eclipse.wst.common.environment.uri.URIFactory;
-import org.eclipse.wst.common.environment.uri.URIScheme;
-
-
-/**
- * This class implements an Environment class for the Eclipse Environment.
- * This Environment currently supports the "platform" protocol and the "file"
- * protocol.
- *
- */
-public class EclipseEnvironment implements BaseEclipseEnvironment
-{
-  private CommandManager   commandManager_  = null;
-  private SimpleURIFactory uriFactory_      = null;
-  private ResourceContext  resourceContext_ = null;
-  private StatusHandler    statusHandler_   = null;
-  private Log              logger_          = null;
-  
-  public EclipseEnvironment( CommandManager  commandManager, 
- 		                         ResourceContext resourceContext,
-						                 StatusHandler   statusHandler )
-  {
-    URIScheme eclipseScheme = EnvironmentService.getEclipseScheme( this );
-    URIScheme fileScheme    = EnvironmentService.getFileScheme();
-    
-    commandManager_  = commandManager;
-    resourceContext_ = resourceContext;
-    uriFactory_      = new SimpleURIFactory();
-    statusHandler_   = statusHandler;
-    
-    uriFactory_.registerScheme( "platform", eclipseScheme );
-    uriFactory_.registerScheme( "file", fileScheme );
-  }
-  
-  /**
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getCommandManager()
-   */
-  public CommandManager getCommandManager()
-  {
-    return commandManager_;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getLog()
-   */
-  public Log getLog()
-  {
-	  if( logger_ == null )
-    {  
-      logger_ = EnvironmentService.getEclipseLog(); 
-    };
-	
-    return logger_;
-  }
-
-  /**
-   * 
-   * @param logger the new logger for this environment.
-   */
-  public void setLog( Log logger )
-  {
-	logger_ = logger;  
-  }
-   
-  /**
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getStatusHandler()
-   */
-  public StatusHandler getStatusHandler()
-  {
-    return statusHandler_;
-  }
-
-  /** (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getURIFactory()
-   */
-  public URIFactory getURIFactory()
-  {
-    return uriFactory_;
-  }
-
-  /**
-   * @return returns a ResourceContext for this Environment.
-   */
-  public ResourceContext getResourceContext()
-  {
-    return resourceContext_;
-  }
-  
-  public void setCommandManager( CommandManager manager )
-  {
-	commandManager_ = manager;  
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
deleted file mode 100644
index 6747c2d0a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/eclipse/EclipseStatusHandler.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.eclipse;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.dialog.MessageDialog;
-import org.eclipse.wst.command.internal.env.ui.dialog.StatusDialogConstants;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.StatusHandler;
-
-
-/**
- * This is the Eclipse UI version of the StatusHandler
- */
-public class EclipseStatusHandler implements StatusHandler
-{
-  private Shell        shell_;
-  private MessageUtils msg_;
-  
-  public EclipseStatusHandler()
-  {
-    this( new Shell() );
-  }
-
-  public EclipseStatusHandler(Shell shell)
-  {
-    msg_   = new MessageUtils( "org.eclipse.wst.command.internal.env.common.environment", this );
-    shell_ = shell;
-  }
-  
-  /**
-   * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
-   */
-  public Choice report(IStatus status, Choice[] choices) 
-  {
-    int result =
-    MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_WARNING"),
-				null,
-				status,
-				choices);
-    for (int i = 0; i < choices.length; i++)
-     {
-      if (choices[i].getShortcut() == result)
-        return choices[i];
-    }
-    
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status)
-   */
-  public void report(IStatus status) throws StatusException
-  {
-    boolean userOk = false;
-    
-    switch (status.getSeverity())
-    {
-      // an error has been reported and we need to stop executing the comming
-      // commands
-      case Status.ERROR :
-      {
-        userOk = reportErrorStatus(status);
-        break;
-      }
-      case Status.WARNING :
-      {
-        userOk = reportWarning(status);
-        break;
-      }     
-      case Status.INFO :
-      {
-        userOk = true;
-        reportInfo(status);
-        break;
-      }
-    }
-    
-    if( !userOk ) throw new StatusException( status );
-  }
-  
-  private boolean reportWarning(IStatus status)
-  {
-    int userResponse =
-      MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_WARNING"),
-        null,
-        status);
-    return (userResponse == StatusDialogConstants.OK_ID);
-  }
-
-  private boolean reportErrorStatus(IStatus status)
-  {
-    MessageDialog.openMessage(
-      shell_,
-      msg_.getMessage("TITLE_ERROR"),
-      null,
-      status);
-    return false;
-  }
-  
-  /**
-   * @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(IStatus status)
-  {
-    reportErrorStatus( status );
-  }
-  
-  /**
-   * @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(IStatus status)
-  {
-    MessageDialog.openMessage(
-        shell_,
-        msg_.getMessage("TITLE_INFO"),
-        null,
-        status);
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
deleted file mode 100644
index cef2bd070..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/plugin/EnvUIPlugin.java
+++ /dev/null
@@ -1,38 +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.wst.command.internal.env.ui.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EnvUIPlugin extends Plugin {
-
-	//The shared instance.
-	private static EnvUIPlugin instance;
-
-	/**
-	 * The constructor.
-	 */
-	public EnvUIPlugin() {
-		super();
-		instance = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EnvUIPlugin getInstance() {
-		return instance;
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index 3c7e83db5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
- * This class can be used to create a popup actions preference page for a 
- * particular category.  For example:
- *
- * <pre>
- *  &lt;extension
- *        point="org.eclipse.ui.preferencePages"&gt;
- *     &lt;page
- *           name="%PREFERENCE_CATEGORY_DIALOGS"
- *           category="org.eclipse.jst.ws.ui.preferences.name"
- *           class="org.eclipse.wst.command.internal.env.preferences.ActionDialogsPreferencePage"
- *           id="org.eclipse.jst.wss.popup.category"&gt;
- *     &lt;/page&gt;
- * * </pre>
- * This entry specifies that all popup actions that are associated with the
- * org.eclipse.jst.wss.popup.category will be displayed on this
- * preference page.
- */
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener, IExecutableExtension
-{
-  /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_PAGE = "org.eclipse.wst.command.env.ui.PPAD0001";
-  //
-  private Button showAll;
-  /*CONTEXT_ID PPAD0002 for the  show all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_SHOW_ALL = "org.eclipse.wst.command.env.ui.PPAD0002";
-  //
-  private Button hideAll;
-  /*CONTEXT_ID PPAD0003 for the  hide all check box on the Action Dialogs Preference Page*/
-  private String INFOPOP_PPAD_BUTTON_HIDE_ALL = "org.eclipse.wst.command.env.ui.PPAD0003";
-
-  private Hashtable checkBoxes_;
-  private String    categoryId_;
-  
-  public void setInitializationData( IConfigurationElement config,
-                                     String                propertyName,
-                                     Object                data )
-    throws CoreException
-  {
-    categoryId_   = config.getAttribute( "id" );
-  }
-
-  /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(Composite superparent)
-  {
-    MessageUtils msgUtils = new MessageUtils( "org.eclipse.wst.command.env.ui.environmentui", this );
-    
-    checkBoxes_ = new Hashtable();
-    addOptionalDialogsCheckBoxes (superparent);
-	new Label(superparent, SWT.HORIZONTAL);
-	
-    Composite   parent = new Composite( superparent, SWT.NONE );	
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    parent.setLayout( layout );
-    parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PPAD_PAGE"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PPAD_PAGE );
-	
-    showAll = new Button(parent, SWT.NONE);
-    showAll.setText(msgUtils.getMessage("BUTTON_SHOW_ALL_DIALOGS"));
-    showAll.addListener(SWT.Selection, this);
-    showAll.setToolTipText(msgUtils.getMessage("TOOLTIP_PPAD_BUTTON_SHOW_ALL"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(showAll, INFOPOP_PPAD_BUTTON_SHOW_ALL );
-   
-    hideAll = new Button(parent, SWT.NONE);
-    hideAll.setText(msgUtils.getMessage("BUTTON_HIDE_ALL_DIALOGS"));
-    hideAll.addListener ( SWT.Selection, this);
-    hideAll.setToolTipText(msgUtils.getMessage("TOOLTIP_PPAD_BUTTON_HIDE_ALL"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(hideAll, INFOPOP_PPAD_BUTTON_HIDE_ALL );
-
-    initializeValues();
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-    return parent;
-  }
-
- public void handleEvent (Event event) 
- {
-    if (showAll == event.widget)
-		handleShowAllEvent();
-    
-    else if ( hideAll == event.widget)
-    	handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
-    Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( false );
-    	}                      
- }
-
- private void handleHideAllEvent ()
- {
- 	Enumeration e = checkBoxes_.elements();
- 	for (int i=0; e.hasMoreElements(); i++)
-    	{
-    		Button dialog = (Button) e.nextElement();
-    		dialog.setSelection( true );
-    	}
- }
- 
- private void addOptionalDialogsCheckBoxes ( Composite parent)
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    ActionDialogPreferenceType[] dialogs = context.getDialogs();
-    
-    for (int i = 0; i < dialogs.length; i++) 
-    {
-      ActionDialogPreferenceType dialog   = dialogs[i];
-      String                     category = dialog.getCategory();
-      
-      if( dialog.getShowCheckbox() &&  category != null && category.equals( categoryId_) )
-      {
-    	Button checkBox = createCheckBox(parent, dialog.getName());
-    	checkBox.setToolTipText( dialog.getTooltip() );
-    	PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox, dialog.getInfopop() );
-    	checkBoxes_.put(dialog.getId(), checkBox);
-      }
-    }
-  }
-  
-  private Button createCheckBox( Composite parent, String text )
-  {
-    Button button = new Button( parent, SWT.CHECK );
-    button.setText( text );
-    return button;
-  }
-
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults()
-  {
-    super.performDefaults();
-    initializeDefaults();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk()
-  {
-    storeValues();
-    return true;
-  }
-
-  protected void performApply()
-  {
-    performOk();
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)  { }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults()
-  {
-    Enumeration e = checkBoxes_.elements();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      Button dialog = (Button) e.nextElement();
-      dialog.setSelection(true);
-    }
-  }
-
-  /**
-   * Initializes states of the controls from the preferences.
-   */
-  private void initializeValues()
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      Button button = (Button) checkBoxes_.get(id);
-      button.setSelection(context.isActionDialogEnabled(id));
-    }
-  }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues()
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-
-    Enumeration e = checkBoxes_.keys();
-    for (int i=0; e.hasMoreElements(); i++)
-    {
-      String id = (String) e.nextElement();
-      context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
-    }
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
deleted file mode 100644
index b2daa71c5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/registry/WidgetRegistry.java
+++ /dev/null
@@ -1,105 +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.wst.command.internal.env.ui.registry;
-
-import java.util.Hashtable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class WidgetRegistry 
-{
-  private static WidgetRegistry registry_;
-  
-  private Hashtable entries_;
-  
-  private WidgetRegistry()
-  {
-  }
-  
-  public static WidgetRegistry instance()
-  {
-    if( registry_ == null )
-	{
-	  registry_ = new WidgetRegistry();
-	  registry_.load();
-	}
-	
-	return registry_;
-  }
-  
-  /**
-   * 
-   * @param id the methodId that may have WidgetContributor associated with it.
-   * @return returns a INamedWidgetContributorFactory if one was defined in the registry.
-   * Otherwise null is returned.
-   */
-  public INamedWidgetContributorFactory getFactory( String id )
-  {
-	INamedWidgetContributorFactory factory = null;
-	Entry                          entry   = (Entry)entries_.get( id );
-	
-	if( entry != null )
-	{
-	  try
-	  {
-		if( entry.factory_ == null )
-		{
-		  entry.factory_ = (INamedWidgetContributorFactory)entry.element_.createExecutableExtension( "class" );
-		}
-		
-		factory = entry.factory_;
-	  }
-	  catch( CoreException exc )
-	  {
-	    exc.printStackTrace();
-	  }
-	  catch( Throwable exc )
-	  {
-		exc.printStackTrace();
-	  }
-	}
-	
-	return factory;
-  }
-  
-  private void load()
-  {
-	IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.wst.command.env.ui.widgetRegistry");
-	
-	entries_ = new Hashtable();
-	
-	for( int index = 0; index < elements.length; index++ )
-	{
-	  // If this is not an element that know about we will skip it.
-	  if( !elements[index].getName().equals("widgetFactory") ) continue;
-	  
-	  Entry                 entry    = new Entry();
-	  IConfigurationElement element  = elements[index];
-	  String                id       = element.getAttribute( "id" );
-	  String                methodId = element.getAttribute( "insertBeforeCommandId" );
-	  
-	  entry.element_ = element;
-	  entry.id_      = id;
-	  
-	  entries_.put( methodId, entry );
-	}
-  }
-  
-  private class Entry
-  {
-    String                         id_;
-	IConfigurationElement          element_;
-	INamedWidgetContributorFactory factory_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
deleted file mode 100644
index eb4e5856a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CanFinishRegistry.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-/**
- * This is an interface for an abstract can finish registry.
- * This registry is usually associate with an Eclipse wizard.  This
- * registry allow condition object to be added to it in order to
- * determine if the wizard can finish or not.
- *
- */
-public interface CanFinishRegistry
-{
-  /**
-   * Add a condition object to the registry.
-   * @param condition the condition.
-   */
-  public void addCondition( Condition condition );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
deleted file mode 100644
index f77c3ac24..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBinding.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public interface CommandWidgetBinding extends CommandFragmentFactoryFactory
-{
-  /**
-   * This method is used by extensions to register their widgets with
-   * CommandFragments
-   * 
-   * @param widgetRegistry
-   */
-  public void registerWidgetMappings( WidgetRegistry widgetRegistry );
-  
-  /**
-   * This method is used by extenions to register the data mappings
-   * that their widgets use.
-   * 
-   * @param dataRegistry
-   */
-  public void registerDataMappings( DataMappingRegistry dataRegistry );
-  
-  /**
-   * This method is used by extensions to register condition objects
-   * that control if the wizard can finish or not.
-   * 
-   * @param canFinishRegistry
-   */
-  public void registerCanFinish( CanFinishRegistry canFinishRegistry );
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
deleted file mode 100644
index af4dff471..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CommandWidgetBindingList.java
+++ /dev/null
@@ -1,127 +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.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class CommandWidgetBindingList implements CommandWidgetBinding
-{
-  private Vector                 bindings_;
-  private Vector                 fragments_;
-  private CommandFragmentFactory factory_;
-  
-  /**
-   * This CommandWidgetBinding combines a list of CommandWidgetBindings.
-   * There should be the same number of entries in both the bindings
-   * parameter and the fragments parameter.  Entries in either of the
-   * bindings for fragments vectors are allowed to be null.
-   * 
-   * @param bindings   the bindings to combine.
-   * @param fragments  These fragments will be interspersed with the
-   *                   fragments associated with each binding.  The first
-   *                   fragment will be put before the fragment from the
-   *                   first binding.  Following this will be the second
-   *                   fragment from the fragments vector and then the
-   *                   second fragment from the bindings vector, etc.
-   */
-  public CommandWidgetBindingList( Vector bindings, Vector fragments )
-  {
-    bindings_  = bindings; 
-    fragments_ = fragments;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
-   */
-  public void registerCanFinish(CanFinishRegistry canFinishRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      
-      if( binding != null ) binding.registerCanFinish( canFinishRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
-   */
-  public void registerDataMappings(DataMappingRegistry dataRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      if( binding != null ) binding.registerDataMappings( dataRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
-   */
-  public void registerWidgetMappings(WidgetRegistry widgetRegistry) 
-  {
-    int length = bindings_.size();
-    
-    for( int index = 0; index < length; index++ )
-    {
-      CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-      if( binding != null ) binding.registerWidgetMappings( widgetRegistry );
-    }
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
-   */
-  public CommandFragmentFactory create() 
-  {
-    if( factory_ == null )
-    {
-      factory_ = new CommandFragmentFactory()
-        {
-          public CommandFragment create()
-          {
-            SequenceFragment fragmentList = new SequenceFragment();
-            int              length       = bindings_.size();
-            
-            for( int index = 0; index < length; index++ )
-            {
-              CommandFragment fragment = (CommandFragment)fragments_.elementAt( index );
-              
-              if( fragment != null )
-              {
-                fragmentList.add( fragment );
-              }
-              
-              CommandWidgetBinding binding = (CommandWidgetBinding)bindings_.elementAt( index );
-              
-              if( binding != null )
-              {
-                fragmentList.add( binding.create().create() );
-              }
-            }
-            
-            return fragmentList;
-          }
-        }; 
-    }
-    
-    return factory_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
deleted file mode 100644
index 94f91d634..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/CurrentPageCommand.java
+++ /dev/null
@@ -1,36 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-/**
- * This Command can be used to get the current page.
- * Use of this class is not recommended.
- *
- */
-public class CurrentPageCommand extends AbstractDataModelOperation
-{
-  private WizardPageManager pageManager_;
-  
-  public CurrentPageCommand( WizardPageManager pageManager )
-  {
-    pageManager_ = pageManager;
-  }
-  
-  public IWizardPage getCurrentPage()
-  {
-    return pageManager_.getCurrentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
deleted file mode 100644
index c86649ca2..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DataObjectCommand.java
+++ /dev/null
@@ -1,35 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-/**
- * This Command can be use to get the resulting data object for
- * this wizard.
- *
- */
-public class DataObjectCommand extends AbstractDataModelOperation
-{
-  private Object dataObject_;
-  
-  public void setDataObject( Object object )
-  {
-    dataObject_ = object;
-  }
-  
-  public Object getDataObject()
-  {
-    return dataObject_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
deleted file mode 100644
index 0930afe5a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/DynamicWizard.java
+++ /dev/null
@@ -1,389 +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.wst.command.internal.env.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.osgi.framework.Bundle;
-
-
-/**
- * This class is used to add dynamic wizards into Eclipse.  When adding
- * a dynamic wizard into eclipse two entries need to be made in the plugin.xml
- * file.  This first entry tells Eclipse that a new wizard should be added
- * and it references this class.  The second entry specifies detailed information
- * that is specific to the wizard to be added.  These two plugin.xml entries
- * are linked together via their id attributes.  For example here is an
- * entry that registers a new wizard with eclipse.  Note the class attribute
- * references this class.
- * <pre>
- *   &lt;extension
- *        point="org.eclipse.ui.newWizards"&gt;
- *     &lt;wizard
- *           name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
- *           icon="icons/full/ctool16/newclient_webserv_wiz.gif"
- *           category="org.eclipse.jst.ws.ui.new"
- *           class="org.eclipse.wst.command.env.ui.widgets.DynamicWizard"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *        &lt;description&gt;
- *           %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- *        &lt;/description&gt;
- *        &lt;selection
- *              class="org.eclipse.core.resources.IResource"&gt;
- *        &lt;/selection&gt;
- *     &lt;/wizard&gt;
- *   &lt;/extension&gt;
- *
- * </pre>
- * Here is the dynamicWizard entry for this particular wizard.  This id attributes
- * link these two entries together.  The class attribute must specify a class that
- * implements the org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding interface.  This
- * interface specifies what the UI should look like and the commands the should
- * be executed in the wizard.
- * 
- * <pre>
- *   &lt;extension
- *        point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- *     &lt;dynamicWizard
- *           iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- *           class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- *           title="%WIZARD_TITLE_WSC"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/dynamicWizard&gt;
- *   &lt;/extension&gt;
- * </pre>
- *
- */
-public class DynamicWizard extends Wizard implements INewWizard, IExecutableExtension
-{
-  private   String                  iconBannerName_;
-  private   Bundle                  bundle_;
-  private   SimpleCanFinishRegistry canFinishRegistry_; 
-  private   WizardPageManager       pageManager_;
-  private   String                  wizardTitle_;
-  private   DataObjectCommand       dataObjectCommand_ = null;
-
-  protected IWizardPage             startPage_ = null;
-  protected IConfigurationElement   wizardElement_;
-  protected IConfigurationElement   originalElement_;
-  protected CommandWidgetBinding    commandWidgetBinding_;
-  
-  public DynamicWizard()
-  {
-	setNeedsProgressMonitor(true);
-  }
-  
-  /**
-   * This method is called when the Dynamic wizard is created by eclipse.
-   * We need to find a dynamicWizard extension point that matches the id
-   * for this wizard.  Once the extension point is found it will contain
-   * a reference to a CommandWidgetBinding class which defines the widgets 
-   * and commands for this wizard.
-   * 
-   * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-   */
-  public void setInitializationData( IConfigurationElement config,
-			                         String                propertyName,
-			                         Object                data )
-    throws CoreException
-  {
-    String wizardId   = config.getAttribute( "id" );
-    
-    setInitialData( wizardId );
-    originalElement_ = config;
-  }
-  
-  /**
-   * This method should only be called if the Dynamic Wizard is being
-   * launched through some other mechanise other than the Eclipse New Wizard
-   * mechanism.
-   * 
-   * @param binding        the command widget binding for this wizard.
-   * @param descriptor     the plugin descriptor where the icon banner is
-   *                       located.
-   * @param iconBannerPath the icon banner path for this wizard.  The path
-   *                       is relative to the plugin specified by the 
-   *                       descriptor parameter.
-   * @param wizardTitle    the wizard title
-   */
-  public void setInitialData( CommandWidgetBinding binding,
-                              Bundle               bundle,
-                              String               iconBannerPath,
-                              String               wizardTitle )
-  {
-    commandWidgetBinding_ = binding;
-    bundle_               = bundle;
-    iconBannerName_       = iconBannerPath;
-    wizardTitle_          = wizardTitle;
-  }
-  
-  /**
-   * Sets the initial data based on the dynamic wizard id.
-   * 
-   * @param wizardId
-   */
-  public void setInitialData( String wizardId ) throws CoreException
-  {
-    IExtensionRegistry    registry      = Platform.getExtensionRegistry();
-    IExtensionPoint       point         = registry.getExtensionPoint("org.eclipse.wst.command.env.dynamicWizard");
-    IExtension[]          extensions    = point.getExtensions();
-    
-    for( int index = 0; index < extensions.length; index++) 
-    {
-      IConfigurationElement[] elements = extensions[index].getConfigurationElements();
-      
-      if( elements.length == 1 && elements[0].getName().equals( "dynamicWizard") ) 
-      {
-        String id = elements[0].getAttribute( "id" );
-        
-        if( id != null && id.equals( wizardId ) )
-        {
-          wizardElement_ = elements[0];
-          break;
-        }
-      }
-    }
-        
-    if( wizardElement_ == null )
-    {
-      MessageUtils msg = new MessageUtils( "org.eclipse.wst.command.env.ui.widgets.environment", this );
-      Status status = new Status( Status.ERROR, "id", 0, msg.getMessage( "MSG_ERROR_WIZARD_ID_NOT_FOUND", new String[]{ wizardId}) , null );
-      throw new CoreException( status );
-    }
-  }
-    
-  /**
-   * This method is called by the eclipse framework to initialize the
-   * wizard. 
-   * 
-   * @param workbench the eclipse workbench
-   * @param selection the initial selection that the user has made within
-   *                  eclipse.
-   */
-  public void init ( IWorkbench workbench, IStructuredSelection selection )
-  {    
-    PersistentResourceContext context        = PersistentResourceContext.getInstance();
-    EclipseStatusHandler      handler        = new EclipseStatusHandler();
-    EclipseEnvironment        environment    = new EclipseEnvironment( null, context, handler );
-    
-    DataMappingRegistryImpl dataRegistry_   = new DataMappingRegistryImpl();
-    SimpleWidgetRegistry    widgetRegistry_ = new SimpleWidgetRegistry();  
-    DataFlowManager         dataManager     = new DataFlowManager( dataRegistry_, environment );
-    
-    try
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-      bundle_               = Platform.getBundle( wizardElement_.getNamespace() );
-      iconBannerName_       = wizardElement_.getAttribute( "iconbanner" );
-      wizardTitle_          = wizardElement_.getAttribute( "title" );
-    }
-    catch( CoreException exc )
-    {
-      exc.printStackTrace();
-    }
-    
-	dataObjectCommand_ = new DataObjectCommand();
-    startPage_         = null;
-    canFinishRegistry_ = new SimpleCanFinishRegistry(); 
-    pageManager_       = new WizardPageManager( widgetRegistry_, 
-                                                getWizardPageFactory(), 
-				                                this,
-				                                dataManager,
-				                                environment );  
-    
-    pageManager_.setRootFragment( getRootFragment( selection, pageManager_ ) );
-    
-    commandWidgetBinding_.registerWidgetMappings( widgetRegistry_ );
-    commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-    commandWidgetBinding_.registerCanFinish( canFinishRegistry_ );
-        
-    // If a page is not complete ensure that canFinish is false.
-    Condition canFinish = new Condition()
-                          {
-                            public boolean evaluate()
-                            {
-                              IWizardPage currentPage = pageManager_.getCurrentPage();
-                              
-                              return currentPage != null ? currentPage.isPageComplete() : true;
-                            }
-                          }; 
-    
-    canFinishRegistry_.add( canFinish );
-    
-    // Set that we need a progress monitor.
-    setNeedsProgressMonitor( true );
-    
-    // Ensure that the next/back buttons are enabled.
-	setForcePreviousAndNextButtons( true );
-    
-    // Set the icon banner if specified.
-    if( iconBannerName_ != null && iconBannerName_.length() > 0 )
-    {
-      try
-      {
-        URL installURL        = bundle_.getEntry("/");
-        URL imageURL          = new URL(installURL, iconBannerName_ );
-        ImageDescriptor image = ImageDescriptor.createFromURL(imageURL);
-        
-        if( image != null )
-        {
-          setDefaultPageImageDescriptor( image );
-        }
-      }
-      catch (MalformedURLException e)
-      {
-      }
-    }
-    
-    if( wizardTitle_ != null && wizardTitle_.length() > 0 )
-    {
-      setWindowTitle( wizardTitle_ );
-    }
-  }
-  
-  // Subclasses can override this.
-  protected WizardPageFactory getWizardPageFactory()
-  {
-    return new SimplePageFactory();
-  }
-  
-  /**
-  * Returns true if all pages are complete.
-  * @return True if all pages are complete.
-  */
-  public boolean canFinish ()
-  {
-  	int     length = canFinishRegistry_.size();
-  	boolean result = true;
-  	
-    for( int index = 0; index < length; index++ )
-    {
-      Condition condition = (Condition)canFinishRegistry_.elementAt( index );
-    
-      result = condition.evaluate();
-      
-      if( !result ) break;
-    }
-    
-    return result;
-  }
-
-  /**
-    * Returns the first page for this wizard.
-    *
-    * @return the first page for this wizard.
-  **/
-  public IWizardPage getStartingPage()
-  {
-  	if( startPage_ == null )
-  	{
-  		startPage_ = pageManager_.getNextPage();
-  	}
-  	
-    return startPage_;
-  }
-
-  /**
-    * Returns the next page after page and
-    * runs the appropriate tasks.
-    *
-    * @return the next page after page.
-  **/
-  public IWizardPage getNextPage( IWizardPage page )
-  {   
-    return pageManager_.getNextPage();
-  }
-  
-  /**
-  */
-  public boolean performFinish ()
-  { 
-    boolean result = pageManager_.performFinish();
-    
-    if( result ) cleanup();
-    
-    return result;
-  }
-
-  /**
-   * Undo fragments
-  */
-  public boolean performCancel ()
-  {
-  	boolean result = pageManager_.performCancel();
-  	
-  	if( result ) cleanup();
-  	
-  	return result;
-  }  
-      
-  public Object getDataObject()
-  {
-    return dataObjectCommand_.getDataObject();  
-  }
-  
-  protected CommandFragment getRootFragment( IStructuredSelection selection, WizardPageManager pageManager )
-  {
-    SequenceFragment root = new SequenceFragment();
-    
-    root.add( new SimpleFragment( new SelectionCommand( selection ), "" ) );
-    root.add( new SimpleFragment( new CurrentPageCommand( pageManager ), "" ) );
-    root.add( commandWidgetBinding_.create().create() );
-	root.add( new SimpleFragment( dataObjectCommand_, "" ));
-    
-    return root;
-  }
-  
-  protected IConfigurationElement getConfigElement()
-  {
-    return wizardElement_;
-  }
-  
-  /**
-   * This method frees up the memory held by this object.
-   *
-   */
-  private void cleanup()
-  {
-	iconBannerName_       = null;;
-	bundle_               = null;;
-	canFinishRegistry_    = null; 
-	pageManager_          = null;
-	wizardTitle_          = null;
-	dataObjectCommand_    = null;
-	startPage_            = null;
-	commandWidgetBinding_ = null;  
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
deleted file mode 100644
index cbad7b240..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageInfo.java
+++ /dev/null
@@ -1,44 +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.wst.command.internal.env.ui.widgets;
-
-
-
-public class PageInfo 
-{
-  private String                   pageName_;
-  private String                   pageTitle_;
-  private WidgetContributorFactory widgetFactory_;
-  
-  public PageInfo( String                   pageName,
-                   String                   pageTitle,
-                   WidgetContributorFactory widgetFactory )
-  {
-    pageName_       = pageName;
-    pageTitle_      = pageTitle;
-    widgetFactory_  = widgetFactory;
-  }   
-  
-  public String getPageName()
-  {
-    return pageName_;
-  }
-  
-  public String getPageTitle()
-  {
-    return pageTitle_;
-  }
-  
-  public WidgetContributorFactory getWidgetFactory()
-  {
-    return widgetFactory_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
deleted file mode 100644
index b4c858922..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/PageWizardDataEvents.java
+++ /dev/null
@@ -1,35 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.wizard.IWizardPage;
-
-/**
- * Dynamic wizard implementations that want to create different
- * kinds of wizard pages need to implement this interface.
- * The WizardPageFactory returns a class of this type.
- *
- */
-public interface PageWizardDataEvents extends IWizardPage
-{
-  /**
-   * 
-   * @return returns the WidgetDataEvents object created by the addControls
-   * method of a WidgetContributor.
-   */
-  public WidgetDataEvents getDataEvents();
-  
-  /**
-   * Validates that this wizard page is complete. 
-   *
-   */
-  public void validatePageToStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
deleted file mode 100644
index 8b3f257c4..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SelectionCommand.java
+++ /dev/null
@@ -1,38 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-/**
- * This SelectionCommand is execute at the very beginning of the
- * dynamic wizard.  Commands executed in the wizard that need
- * the initial selection can get it through a data mapping from 
- * this command to the command that needs it.
- *
- */
-public class SelectionCommand extends AbstractDataModelOperation
-{
-  private IStructuredSelection selection_;
-  
-  public SelectionCommand( IStructuredSelection selection )
-  {
-    selection_ = selection;  
-  }
-  
-  public IStructuredSelection getInitialSelection()
-  {
-    return selection_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.java
deleted file mode 100644
index ce371919d..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCanFinishRegistry.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.wst.command.internal.env.ui.widgets;
-
-import java.util.Vector;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-
-public class SimpleCanFinishRegistry extends Vector implements CanFinishRegistry
-{
-
-  /**
-   * Comment for <code>serialVersionUID</code>
-   */
-  private static final long serialVersionUID = 3257285837870741305L;
-
-  /* (non-Javadoc)
-   * @see org.eclipse.env.widgets.CanFinishRegistry#addCondition(org.eclipse.env.command.fragment.Condition)
-   */
-  public void addCondition(Condition condition)
-  {
-    add( condition );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
deleted file mode 100644
index c6d659e2a..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleCommandEngineManager.java
+++ /dev/null
@@ -1,226 +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.wst.command.internal.env.ui.widgets;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentEngine;
-import org.eclipse.wst.command.internal.env.core.fragment.FragmentListener;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.Log;
-
-
-/**
- * This class manages the execution of Commands in a flow of CommandFragments.
- * The bulk of this work is done by the CommandFragmentEngine.  The main job of
- * this class is run the fragments in a particular transactional environment.
- * A fragment has a method called doNotRunInTransaction which is used to determine
- * if its commands should be run in a transaction or not.  If this method returns
- * true(ie. not in a transaction) the Commands are wrapped in a IRunnableWithProgress.
- * If false( ie. in a transaction ) the Commands are wrapped in a WorkspaceModifyOperation. 
- *
- */
-public class SimpleCommandEngineManager
-{
-  protected CommandFragmentEngine engine_;
-  protected DataFlowManager       dataManager_;
-  private   EclipseEnvironment    environment_;
-  
-  private   boolean               foundStop_;
-  private   boolean               doNotRunInTransaction_;
-  
-  public SimpleCommandEngineManager( EclipseEnvironment environment, DataFlowManager dataManager )
-  {
-    environment_ = environment;
-    dataManager_ = dataManager;
-  }
-  
-  /**
-   * Sets the root fragment.  The execution engine will start executing commands
-   * at the beginning of this root fragment.
-   * 
-   * @param root the root fragment.
-   */
-  public void setRootFragment( CommandFragment root )
-  {
-  	engine_ = new CommandFragmentEngine( root, dataManager_, environment_ );
-	
-	environment_.setCommandManager( engine_ );
-  	
-    engine_.setPeekFragmentListener( 
-      new FragmentListener()
-      {
-        public  boolean notify( CommandFragment fragment )
-        {
-          return peekFragment( fragment );
-        }
-      } );  
-                  
-    engine_.setNextFragmentListener( 
-      new FragmentListener()
-      {
-        public  boolean notify( CommandFragment fragment )
-        {
-          return nextFragment( fragment );
-        }
-      } );  
-                                                             
-	engine_.setUndoFragmentListener(
-      new FragmentListener()
-      {
-        public boolean notify( CommandFragment fragment )
-        {
-          return undoFragment( fragment );
-        }
-      } );               
-  }
-  
-  /**
-   * The CommandFragmentEngine calls this method when it is peeking forward
-   * in the fragments.  When peeking forward the command stack state in the
-   * engine is not changes.
-   * 
-   * 
-   * @param fragment the fragment that it is peeking at.
-   * @return Indicates whether peeking should stop or not.
-   */
-  protected boolean peekFragment( CommandFragment fragment )
-  {     
-    return true;
-  }
-  
-  /**
-   * The CommandFragmentEngine calls this method when it is moving forward
-   * in the fragments.   When moving forward the command stack state is saved
-   * at each fragment is traversed.
-   * 
-   * @param fragment the fragment that is being traversed.
-   * @return indicates if the forward traversal should continue.  
-   */
-  protected boolean nextFragment( CommandFragment fragment )
-  {     
-    if( fragment.doNotRunInTransaction() != doNotRunInTransaction_ )
-    {
-      // The fragment is requesting a different transaction environment than
-      // the one that we are in so we must stop and change environments.
-      doNotRunInTransaction_ = fragment.doNotRunInTransaction();
-      foundStop_             = false;      
-    }
-    
-    return foundStop_;
-  }
-  
-  /**
-   * This method is called for each fragment when the command engine is unwinding
-   * its stack during an undo operation.
-   * 
-   * @param fragment  the fragment being undone.
-   * @return returns true if the undo process should continue.
-   */
-  protected boolean undoFragment( CommandFragment fragment )
-  {  	  	
-    return true;
-  }
-    
-  /**
-   * The method executes the CommandFragment commands in the context provided.
-   * 
-   * @param context the context
-   * @return returns the status of executing the commands.
-   */
-  public IStatus runForwardToNextStop( IRunnableContext context )
-  {
-    IRunnableWithProgress operation = null;
-    
-  	doNotRunInTransaction_ = false;
-  	
-  	do
-  	{
-  	  // We will stop unless we are changing transaction modes.
-      foundStop_ = true;
-      
-  	  if( doNotRunInTransaction_ )
-  	  {
-  	    operation = getNoTransactionOperation();
-  	  }
-  	  else
-  	  {
-  	    operation = getTransactionOperation();
-  	  }
-  	  
-   	  try
-  	  {  	   
-  	    if( context == null )
-  	    {
-  	   	  // We don't have a container yet so just run the operation.
-  	   	  operation.run( null );
-  	    }
-  	    else
-  	    {
-  	   	  // We have a container where this operation can run and have
-  	   	  // its progress displayed.
-  	      context.run( false, false, operation );
-  	    }
-  	  }
-  	  catch( InterruptedException exc )
-  	  {
-  	    //TODO should log these exceptions.
-  	    exc.printStackTrace();
-  	  }
-  	  catch( InvocationTargetException exc )
-  	  {
-  	    //TODO should log these exceptions.
-  	    exc.printStackTrace();
-  	  }
-  	}  
-  	while( !foundStop_ ); 
-  	
-  	return engine_.getLastStatus();
-  }
-  
-  private IRunnableWithProgress getTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-    //WorkspaceModifyOperation operation = new WorkspaceModifyOperation()
-    //{
-    //  public void execute( IProgressMonitor monitor )
-      {
-        environment_.getLog().log(Log.INFO, "command", 5002, this, "getTransactionOperation", "Start of transaction");
-        engine_.moveForwardToNextStop( monitor );
-        environment_.getLog().log(Log.INFO, "command", 5003, this, "getTransactionOperation", "End of transaction");
-      }
-    };
-    
-    return operation;
-  }
-  
-  private IRunnableWithProgress getNoTransactionOperation()
-  {
-    IRunnableWithProgress operation = new IRunnableWithProgress()
-    {
-      public void run( IProgressMonitor monitor )
-      {
-        environment_.getLog().log(Log.INFO, "command", 5085, this, "getNoTransactionOperation", "Start of NON transaction");
-        engine_.moveForwardToNextStop( monitor );
-        environment_.getLog().log(Log.INFO, "command", 5086, this, "getNoTransactionOperation", "End of NON transaction");
-      }
-    }; 
-    
-    return operation;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
deleted file mode 100644
index 4c02e6be5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePageFactory.java
+++ /dev/null
@@ -1,20 +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.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePageFactory implements WizardPageFactory
-{   
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
-  {
-    return new SimpleWizardPage( pageInfo, manager );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
deleted file mode 100644
index ada9688e7..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupPageFactory.java
+++ /dev/null
@@ -1,27 +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.wst.command.internal.env.ui.widgets;
-
-
-public class SimplePopupPageFactory implements WizardPageFactory
-{   
-  private String id_;
-  
-  public SimplePopupPageFactory( String id )
-  {
-    id_ = id;  
-  }
-  
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager )
-  {
-    return new SimplePopupWizardPage( pageInfo, manager, id_ );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
deleted file mode 100644
index a263997e4..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimplePopupWizardPage.java
+++ /dev/null
@@ -1,79 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-
-public class SimplePopupWizardPage extends SimpleWizardPage
-{  
-  private String id_;
-  
-  public SimplePopupWizardPage( PageInfo pageInfo, WizardPageManager pageManager, String id )
-  {
-  	super( pageInfo, pageManager );
-  	
-  	id_ = id;
-  } 	  
-  	
-  public void createControl( Composite parent ) 
-  {
-  	      Composite                      composite = new Composite( parent, SWT.NONE );
-  	      MessageUtils                   msgUtils  = new MessageUtils("org.eclipse.wst.command.env.ui.environmentui", this );
-  	final PersistentActionDialogsContext context   = PersistentActionDialogsContext.getInstance();
-  	
-    GridLayout gridlayout   = new GridLayout();
-    gridlayout.marginHeight = 0;
-    gridlayout.marginWidth  = 0;
-    
-    composite.setLayout( gridlayout );
-    GridData griddata = new GridData(GridData.FILL_BOTH );
-    composite.setLayoutData( griddata );
-      	
-  	super.createControl( composite );
-  	
-  	// If the current page is null then this must be the first page.
-  	if( pageManager_.getCurrentPage() == null && context.showCheckbox(id_) )
-  	{
-      final  Button button  = new Button( composite, SWT.CHECK );
-      String label   = msgUtils.getMessage( "CHECKBOX_DO_NOT_SHOW_DIALOG_AGAIN" );
-      
-      /*CONTEXT_ID TWP0001 for the show/hide check box*/
-      String infopop =	"org.eclipse.wst.command.env.ui.TWP0001";
-      String tooltip = msgUtils.getMessage( "TOOLTIP_DO_NOT_SHOW_DIALOG_AGAIN" );
-      
-      button.setText( label );
-      button.setToolTipText( tooltip );
-      button.addSelectionListener( new SelectionAdapter()
-                                   {
-                                     public void widgetSelected( SelectionEvent evt )
-                                     {
-                                       context.setActionDialogEnabled( id_, button.getSelection() );  
-                                     }
-                                   });
-      button.setSelection( false );
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infopop );  	
-  	}
-  	
-  	setControl( composite );
-  }  
-}  
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
deleted file mode 100644
index c1c6c3951..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetContributor.java
+++ /dev/null
@@ -1,75 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-
-public class SimpleWidgetContributor implements INamedWidgetContributor 
-{
-    private WidgetContributorFactory factory_;
-	private String                   name_;
-	private String                   description_;
-	private String                   title_;
-	
-	public void setDescription(String description) 
-	{
-		description_ = description;
-	}
-	
-
-	public void setFactory(WidgetContributorFactory factory) 
-	{
-		factory_ = factory;
-	}
-	
-
-	public void setName(String name) 
-	{
-		name_ = name;
-	}
-	
-
-	public void setTitle(String title) 
-	{
-		title_ = title;
-	}
-	
-
-	public WidgetContributorFactory getWidgetContributorFactory() 
-	{
-		return factory_;
-	}
-
-	public String getName() 
-	{
-		return name_;
-	}
-
-	public String getDescription() 
-	{
-		return description_;
-	}
-
-	public String getTitle() 
-	{
-		return title_;
-	}
-
-	/**
-	 * Subsclassers should override this method.
-	 */
-	public void registerDataMappings(DataMappingRegistry dataRegistry) 
-	{
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
deleted file mode 100644
index 5484c9ef0..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetDataContributor.java
+++ /dev/null
@@ -1,54 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This class provides a simple WidgetDataContributor class that concrete 
- * WidgetDataContributors can subclass.
- *
- */
-public class SimpleWidgetDataContributor implements WidgetDataContributor
-{  
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener)
-  {
-    return this;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor#getStatus()
-   */
-  public IStatus getStatus()
-  {
-    return null;
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#externalize()
-   */
-  public void externalize()
-  {
-  }
-
-  /**
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents#internalize()
-   */
-  public void internalize()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
deleted file mode 100644
index 0489bca3f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWidgetRegistry.java
+++ /dev/null
@@ -1,34 +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.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-
-
-
-public class SimpleWidgetRegistry implements WidgetRegistry
-{
-  private Hashtable table_ = new Hashtable();
-  
-  public void add( String fragmentId,
-                   String pageName,
-                   String pageTitle,
-                   WidgetContributorFactory widgetFactory )
-  {
-  	PageInfo entry = new PageInfo( pageName, pageTitle, widgetFactory );
-  	table_.put( fragmentId, entry );
-  }                   
-  
-  public PageInfo getPageInfo( String fragmentId )
-  {
-    return (PageInfo)table_.get( fragmentId );
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
deleted file mode 100644
index 4d2bb595f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/SimpleWizardPage.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-
-
-
-public class SimpleWizardPage extends WizardPage implements PageWizardDataEvents
-{
-  private   WidgetContributor widget_;
-  private   WidgetDataEvents  dataEvents_;
-  private   Listener          statusListener_;
-  protected WizardPageManager pageManager_;
-  	
-  public SimpleWizardPage( PageInfo pageInfo, WizardPageManager pageManager )
-  {
-  	super( "" );
-  	
-  	setTitle( pageInfo.getPageName() );
-  	setDescription( pageInfo.getPageTitle());
-  	  
-  	widget_         = pageInfo.getWidgetFactory().create();
-  	statusListener_ = new StatusListener();
-  	pageManager_    = pageManager;
-  } 	  
-  	
-  public void createControl( Composite parent ) 
-  {
-  	Composite control = new Composite( parent, SWT.NONE );
-  	control.setLayout( new GridLayout() );
-  	control.setLayoutData( new GridData( GridData.FILL_BOTH ));
-  	
-	dataEvents_ = widget_.addControls( control, statusListener_ );
-	  
-    org.eclipse.jface.dialogs.Dialog.applyDialogFont(control);
-    setControl( control );
-  }
-  
-  public WidgetDataEvents getDataEvents()
-  {
-    return dataEvents_;
-  }
-  	  
-  public void validatePageToStatus()
-  {
-    IStatus status  = widget_.getStatus();
-    
-    if( status != null )
-    {
-      if( status.getSeverity() == IStatus.ERROR )
-      {
-        String message = status.getMessage();
-
-        if( message.length() == 0 )
-        {
-          setErrorMessage( null );
-          setMessage( getDescription() );
-        }
-        else
-        {
-          setErrorMessage( message );
-        }
-          
-        setPageComplete( false );
-      }
-      else if (status.getSeverity() == IStatus.WARNING )
-      {
-        setErrorMessage( null );
-        setMessage(status.getMessage(), IStatus.WARNING );
-        setPageComplete( true );
-      }
-      else if( status.getSeverity() == IStatus.INFO )
-      {
-        setErrorMessage( null );
-        setMessage( status.getMessage(), IStatus.INFO );
-        setPageComplete( true );
-      }
-      else
-      {
-        setErrorMessage( null );
-        setMessage( getDescription() );
-        setPageComplete( true );
-      }
-    }
-    else
-    {
-      setErrorMessage( null );
-      setMessage( getDescription() );
-      setPageComplete( true );
-    }
-    
-    getContainer().updateButtons();
-  }
-    
-  public boolean canFlipToNextPage() 
-  {
-	return isPageComplete() && pageManager_.hasNextPage();
-  }
-
-  public IWizardPage getNextPage() 
-  {
-	return pageManager_.getNextPage();
-  }
-  
-  public void setVisible(boolean value) 
-  {
-  	pageManager_.handlePageVisible( this, value );
-  	
-    super.setVisible(value);
-  }
-  
-  private class StatusListener implements Listener
-  {
-	public void handleEvent( Event evt ) 
-	{
-      validatePageToStatus();
-	}
-  }
-}  
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
deleted file mode 100644
index c8725c7f3..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetBindingToWidgetFactoryAdapter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-
-public class WidgetBindingToWidgetFactoryAdapter 
-{
-  private Hashtable            widgetContributor_;
-  private CommandWidgetBinding binding_;
-  
-  public WidgetBindingToWidgetFactoryAdapter( CommandWidgetBinding binding )
-  {
-    widgetContributor_ = new Hashtable(); 
-	binding_           = binding;
-	
-	binding.registerWidgetMappings( new MyWidgetRegistry() );
-  }
-  
-  public INamedWidgetContributor getWidget( String id )
-  {
-    return (INamedWidgetContributor)widgetContributor_.get( id );  
-  }
-  
-  public void registerDataMappings( DataMappingRegistry registry )
-  {
-    binding_.registerDataMappings( registry );  
-  }
-  
-  private class MyWidgetRegistry implements WidgetRegistry
-  {
-	public void add(String fragmentId, String pageName, String pageTitle, WidgetContributorFactory widgetFactory) 
-	{
-	  SimpleWidgetContributor widget = new SimpleWidgetContributor();
-	  widget.setTitle( pageName );
-	  widget.setDescription( pageTitle );
-	  widget.setFactory( new MyWidgetContributorFactory( widgetFactory ) );
-	  
-	  widgetContributor_.put( fragmentId, widget );
-	}	  
-  }
-  
-  private class MyWidgetContributorFactory implements WidgetContributorFactory
-  {
-	private WidgetContributorFactory factory_;
-	private WidgetContributor        widget_;
-	
-	public MyWidgetContributorFactory( WidgetContributorFactory factory )
-	{
-	  factory_ = factory;	
-	}
-	
-	public WidgetContributor create() 
-	{
-      if( widget_ == null )
-	  {
-	    widget_ = factory_.create();
-	  }
-	  
-	  return widget_;
-	}	  
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
deleted file mode 100644
index b6db62601..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributor.java
+++ /dev/null
@@ -1,71 +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.wst.command.internal.env.ui.widgets;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-
-
-/**
- * This interface provides a way for developers to create validatable widgets
- * that can be used in many different Eclipse UI contexts. (ie. in a Windows, Diaglogs,
- * wizard pages, etc)
- *
- * The main functionality this interface has over just a regular Eclipse Composite
- * is that it provides a mechanism for validating the Widget.  When validating
- * there are two aspects to keep in mind.  The first aspect deals with WHEN validation
- * occurs and the second aspect deals with WHAT to do for a validation event.
- * 
- * The first aspect of triggering validation events is handled by the statusListener
- * parameter of the addControls method.  If a particular control that is contributed can
- * affect the validity of this WidgetContributor then the statusListener object
- * should be added to the listener list of that control.  For example, if the text in
- * a Text widget can affect the validity of this WidgetContributor then you would
- * add the statusListener to the Text widgets Modify listener list:
- * 
- * 
- *   Text someText = new Text( parent, SWT.NONE );
- *   someText.addListener( SWT.Modify, statusListener );
- * 
- * Note: if you want to force validation of this widget you can call
- *       the statusListener.handleEvent(null) method directly.  This
- *       is not the prefered may to trigger validation, however.
- *       
- * The second aspect of valiation is what to do when the validation event occurs.
- * This is handled by getStatus method.  Any code that ensures that this widget is
- * valid should be put in the getStatus implementation. 
- * 
- * 
-*/
-public interface WidgetContributor 
-{
-  /**
-   * This method should be used to implement the UI contributions for this widget.
-   * 
-   * @param parent The composite parent that sub widgets should use.
-   * @param statusListener This listener should be added to any widget that can
-   *                       affect the validity of this WidgetContributor.
-   * @return returns a WidgetDataEvents object.  This object is used by the
-   *         framework to internalize and externalize data for this widget.
-   */
-  public WidgetDataEvents addControls( Composite parent, Listener statusListener );
-  
-  /**
-   * This method should implement validation code for this WidgetContributor.
-   * 
-   * @return returns a status object indicating the validity of this widget.
-   *         If the status severity is ERROR then this widget is considered to
-   *         be invalid.  For any other status severity or if the status returned
-   *         is null this widget is considered to be valid.
-   */
-  public IStatus getStatus();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
deleted file mode 100644
index 65b5d0aa3..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetContributorFactory.java
+++ /dev/null
@@ -1,21 +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.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provide a way for creating WidgetContributors
- *
- *
- */
-public interface WidgetContributorFactory 
-{
-  public WidgetContributor create();
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
deleted file mode 100644
index e9aa31db7..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataContributor.java
+++ /dev/null
@@ -1,20 +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.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface is a combination of the WidgetContributor interface and
- * the WidgetDataEvents interface.
- *
- */
-public interface WidgetDataContributor extends WidgetContributor, WidgetDataEvents 
-{
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
deleted file mode 100644
index 4cb03f0fc..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetDataEvents.java
+++ /dev/null
@@ -1,34 +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.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface provides a way for internalizing and externalizing state
- * data in a WidgetContributor.  The internalize method will be called
- * before the widget is displayed so that it can set the default data
- * for that widget.  The externalize method provides a way of getting data
- * from the widget after it is displayed.
- *
- */
-public interface WidgetDataEvents 
-{
-  /**
-   * Implementations should set widget state data here.
-   *
-   */
-  public void internalize();
-  
-  /**
-   * Implemenations should get widget state data here.
-   *
-   */
-  public void externalize();  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
deleted file mode 100644
index c01107c0f..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WidgetRegistry.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.ui.widgets;
-
-/**
- * This interface defines how WidgetContributors are made known to the
- * dynamic wizard framework.  This widget will be displayed as a wizard page
- * with the name and title specified in the add method.  The fragmentId is 
- * used to associate this widget with a particular CommandFragment.  When
- * a CommandFragment with this fragmentId is traversed the corresponding
- * WidgetContributor will be displayed.
- *
- */
-public interface WidgetRegistry
-{
-  /**
-   * Adds a WidgetContributorFactory to the framework.  This factory
-   * is used to get the WidgetContributor.  This WidgetContributor
-   * will be used to render the wizard page.
-   * 
-   * @param fragmentId the CommandFragment id that this WidgetContributor is associated with.
-   * @param pageName the name of this wizard page.
-   * @param pageTitle the title of this wizard page.
-   * @param widgetFactory the factory which will create the WidgetContributor.
-   */
-  public void add( String fragmentId,
-				   String pageName,
-				   String pageTitle,
-				   WidgetContributorFactory widgetFactory );
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
deleted file mode 100644
index c520979b2..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageFactory.java
+++ /dev/null
@@ -1,23 +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.wst.command.internal.env.ui.widgets;
-
-
-/**
- * 
- *
- *
- *
- */
-public interface WizardPageFactory 
-{
-  public PageWizardDataEvents getPage( PageInfo pageInfo, WizardPageManager manager ); 
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
deleted file mode 100644
index f4caf2ed5..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/WizardPageManager.java
+++ /dev/null
@@ -1,471 +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.wst.command.internal.env.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.Stack;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.registry.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-
-
-public class WizardPageManager extends SimpleCommandEngineManager
-{
-  private   WizardPageFactory      pageFactory_;
-  private   Hashtable              pageTable_;
-  private   IWizard                wizard_;
-  protected SimpleWidgetRegistry   registry_;
-  
-  // These variables are used and set by our methods which is
-  // why they are not initialized in the constructor.
-  private PageWizardDataEvents currentPage_;
-  private PageWizardDataEvents nextPage_;
-  private PageWizardDataEvents firstPage_;
-  private CommandFragment      lastUndoFragment_;
-  private boolean              firstFragment_;
-  
-  private INamedWidgetContributorFactory widgetFactory_;
-  private Stack                          widgetStack_;
-  private Stack                          widgetStackStack_;
-  private Hashtable                      widgetTable_;
-  private WidgetRegistry                 widgetRegistry_;
-  private Hashtable                      widgetFactoryTable_;
-    
-  public WizardPageManager( SimpleWidgetRegistry  registry,
-                            WizardPageFactory     pageFactory,
-                            IWizard               wizard,
-                            DataFlowManager       dataManager,
-                            EclipseEnvironment    environment )
-  { 
-    super( environment, dataManager );  
-    
-  	pageFactory_        = pageFactory;
-  	pageTable_          = new Hashtable();  
-  	registry_           = registry;
-  	wizard_             = wizard;
-	widgetTable_        = new Hashtable();
-	widgetFactoryTable_ = new Hashtable();
-	widgetRegistry_     = WidgetRegistry.instance();
-	widgetStackStack_   = new Stack();
-  }
-  
-  public IStatus runForwardToNextStop()
-  {    
-  	firstFragment_  = true;
-  	nextPage_       = null;
- 
-  	IWizardContainer container = wizard_.getContainer();
-  	
-  	if( container == null || container.getCurrentPage() == null )
-  	{
-  	  container = null;
-  	}
-  	
-  	return super.runForwardToNextStop( container );
-  }
-    
-  public IWizardPage getCurrentPage()
-  {
-    return currentPage_;
-  }
-    
-  public boolean hasNextPage()
-  {	
-	 
-    nextPage_ = null;
-    
-	try
-	{
-  	  nextPage_ = getNextPageInGroup( widgetFactory_, false );
-		
-	  if( nextPage_ == null )
-	  {
-	    // If a page is found nextPage_ will be set to its value in the method below.
-  	    engine_.peekForwardToNextStop();
-	  }
-	}
-	catch( Throwable exc )
-	{
-	  exc.printStackTrace();
-	}
-  	
-    return nextPage_ != null;
-  }
-  
-  public IWizardPage getNextPage()
-  {  	
-	try
-	{
-  	  // Need to externalize the data for the current page so that
-  	  // when we move forward below the data is available.
-  	  if( currentPage_ != null ) currentPage_.getDataEvents().externalize();
-  	
-	  nextPage_ = getNextPageInGroup( widgetFactory_, true );
-	
-	  if( nextPage_ == null )
-	  {
-	    widgetFactory_ = null;
-	    widgetStack_   = null;
-		
-  	    IStatus status = runForwardToNextStop();
-  	
-  	    if( status.getSeverity() == IStatus.ERROR )
-  	    {
-  	      // An error has occured so we need undo to the previous stop point.
-  	      undoToLastPage();
-  	    }
-	  }
-	
-  	  if( nextPage_ != null ) nextPage_.setWizard( wizard_ );
-  	  	
-  	  return nextPage_;
-	}
-	catch( Throwable exc )
-	{
-	  exc.printStackTrace();	
-	}
-	
-	return null;
-  }
-    
-  public void handlePageVisible( PageWizardDataEvents page, boolean isPageVisible )
-  {
-    if( !isPageVisible && page == firstPage_ && page == currentPage_ )
-    {
-      // We are moving back one page from the first page.  This can't happen with popup wizards
-      // since the previous button would be greyed out.  But when the new wizard launches this wizard
-      // the previous button is not greyed out and brings the user back to the list wizards to select.
-      // Therefore, we must unwind the command engine and get ready for the user to invoke this wizard 
-      // again.  We are assuming here that the first page is never part of a widget group!
-  	  undoToLastPage();	  
-      currentPage_ = null;
-      firstPage_   = null;
-    }
-  	if( currentPage_ != null && page == currentPage_.getPreviousPage() && isPageVisible )
-  	{
-  	  // We are moving back one page.
-  	  // Note: we don't internalize the previous page and we do not externalize the current page.
-  	  //       we are basically just leaving the current page without retrieving its state and
-  	  //       moving to the previous page which already has its state set.
-	
-	  if( widgetFactory_ != null )
-	  {
-		if( widgetStack_.size() > 0 )
-		{
-		  widgetStack_.pop();
-		}
-		
-		if( widgetStack_.size() == 0 )
-		{
-		  widgetFactory_ = null;
-		  widgetStack_ = null;
-		  widgetStackStack_.pop();
-		}
-	  }
-	  
-	  if( widgetFactory_ == null )
-	  {
-  	    undoToLastPage();
-	  }
-	  
-  	  currentPage_ = page;
-  	}	
-  	else if( isPageVisible )
-  	{
-	  try
-	  {
-  	    // We are moving forward one page.
-  	    WidgetDataEvents dataEvents = page.getDataEvents();
-  	  
-  	    dataManager_.process( dataEvents );  // Push model data into the new page.
-  	    dataEvents.internalize();
-  	  
-  	    page.validatePageToStatus();  	  
-	  }
-	  catch( Throwable exc )
-	  {
-		exc.printStackTrace();
-	  }
-	  finally
-	  {
-	  	if( currentPage_ != null ) page.setPreviousPage( currentPage_ );
-	    	  
-	  	if( firstPage_ == null ) firstPage_ = page;
-	  	  
-	  	currentPage_ = page;  
-	  }
-  	}
-  }
-  
-  public boolean performFinish()
-  { 	
-  	// We need to simulate the next button being pressed until there are no more pages.
-  	// If an error occurs we will return false and reset the command stack back our original state.
-  	boolean    doneOk    = true;
-  	PageWizardDataEvents startPage = currentPage_;
-  	
-  	// Externalize the current page.
-  	currentPage_.getDataEvents().externalize();
-  	
-  	// Loop through subsequent pages.
-  	do
-  	{  	  
-  	  IStatus status = runForwardToNextStop();	  
-  	  
-  	  if( status.getSeverity() == IStatus.ERROR )
-  	  {
-  	  	// An error occured in one of the commands.
-  	  	doneOk = false;
-  	  }
-  	  else
-  	  {
-  	  	currentPage_ = nextPage_;
-  	  }
-  	}
-  	while( nextPage_ != null && doneOk);
-  	
-  	if( !doneOk )
-  	{
-  	  // An error occured, so we need to return the command stack to it's
-  	  // orginal state.
-  	  PageWizardDataEvents page = null;
-  	  boolean              done = false;
-  	  
-  	  do
-  	  {
-  	    done = engine_.undoToLastStop();
-  	    page = getPage( lastUndoFragment_ );
-  	  }
-  	  while( page != startPage && !done ); 	  
-  	  
-  	  currentPage_ = page;
-  	}
-  	
-  	return doneOk;
-  }
-  
-  public boolean performCancel()
-  {
-  	while( !engine_.undoToLastStop() ){}
-  	
-  	return true;
-  }
-    
-  protected boolean peekFragment( CommandFragment fragment )
-  {     	
-    // Check to see if this fragment is in our page table.
-    nextPage_ = getPage( fragment );
-          	
-	if( nextPage_ == null )
-	{
-	  INamedWidgetContributorFactory factory = getWidgetFactory( fragment.getId() );
-	  
-	  if( factory != null )
-	  {
-		nextPage_ = getNextPageInGroup( factory, false );  
-	  }
-	}
-	
-    return nextPage_ == null;
-  }
-  
-  protected boolean nextFragment( CommandFragment fragment )
-  {
-    // If the super class nextFragment want us to stop then we will stop right away.
-    if( !super.nextFragment( fragment ) ) return false;
-    
-  	// The first fragment is either at the start of the wizard
-  	// or it is on a wizard page.  In either case we do not want 
-  	// to stop if a page is found.
-  	if( firstFragment_ )
-  	{
-  	  firstFragment_ = false;
-  	}
-  	else
-  	{
-	  widgetFactory_ = getWidgetFactory( fragment.getId() );
-	  
-	  if( widgetFactory_ != null )
-	  {
-		widgetStack_ = new Stack();
-		
-		StackEntry entry = new StackEntry();
-		
-		entry.factory_ = widgetFactory_;
-		entry.stack_   = widgetStack_;
-		widgetStackStack_.push( entry );
-		
-		nextPage_ = getNextPageInGroup( widgetFactory_, true );
-	  }
-	  else
-	  {
-  	    nextPage_ = getPage( fragment );
-	  }
-  	}  	  	
-  	
-    return nextPage_ == null;
-  }
-  
-  protected boolean undoFragment( CommandFragment fragment )
-  {
-  	lastUndoFragment_ = fragment;
-  	
-  	return true;
-  }
-  
-  
-  private PageWizardDataEvents getNextPageInGroup( INamedWidgetContributorFactory factory, boolean pushNewWidget )
-  {
-	PageWizardDataEvents page = null;
-	
-	if( factory != null )
-	{	  
-	  INamedWidgetContributor newWidget = null;
-		  
-	  if( widgetStack_ == null || widgetStack_.size() == 0 )
-	  {
-		newWidget = factory.getFirstNamedWidget();   
-	  }
-	  else
-	  {
-		INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-		newWidget = factory.getNextNamedWidget( currentWidget ); 
-	  }
-		  
-	  if( newWidget != null )
-	  {
-		page = getPage( newWidget );
-		
-		if( pushNewWidget )
-		{
-		  widgetStack_.push( newWidget );
-		}
-	  }
-	}
-		
-	return page;  
-  }
-  
-  private void undoToLastPage()
-  {
-    boolean stackEmpty  = false;
-	boolean doneUndoing = false;
-    
-	while( !doneUndoing )
-	{
-	  stackEmpty = engine_.undoToLastStop();
-	  
-	  IWizardPage page = null;
-	  
-	  if( lastUndoFragment_ != null )
-	  {
-	    page = getPage( lastUndoFragment_ );
-		
-	    if( page == null )
-	    {
-		  // Check to see if a group page fragment was found.
-		  INamedWidgetContributorFactory factory = getWidgetFactory( lastUndoFragment_.getId() );
-		  
-		  if( factory != null )
-		  {
-		    StackEntry entry = (StackEntry)widgetStackStack_.peek();
-			
-		    widgetFactory_ = entry.factory_;
-		    widgetStack_   = entry.stack_;	
-			
-		    if( widgetStack_ != null && !widgetStack_.empty() )
-		    {
-		      INamedWidgetContributor currentWidget = (INamedWidgetContributor)widgetStack_.peek();
-			
-		      page = getPage( currentWidget );
-		    }
-		  }
-	    }
-	  }
-	  
-	  doneUndoing = page != null || stackEmpty;
-	}
-  }
-  
-  private PageWizardDataEvents getPage( CommandFragment fragment )
-  {
-    // Check to see if this fragment is in our page table.
-  	PageWizardDataEvents page = (PageWizardDataEvents)pageTable_.get( fragment ); 
-  	String      id   = fragment.getId();      	
-          	
-    if( page == null && id != null )
-    {
-      // Check to see if this fragment id is in the registry.
-      PageInfo pageInfo = registry_.getPageInfo( id );          	  
-              
-      if( pageInfo != null )
-      {
-        page = pageFactory_.getPage( pageInfo, this );
-        pageTable_.put( fragment, page );            	
-      }
-    }
-
-    return page;
-  }    
-  
-  private PageWizardDataEvents getPage( INamedWidgetContributor widget )
-  {
-	PageWizardDataEvents page = (PageWizardDataEvents)widgetTable_.get( widget );
-
-	if( page == null )
-	{
-	  PageInfo pageInfo = new PageInfo(widget.getTitle(), widget.getDescription(), widget.getWidgetContributorFactory() );
-	  
-	  page = pageFactory_.getPage( pageInfo, this );
-	  widgetTable_.put( widget, page );
-	}
-	
-	return page;
-  }
-  
-  private INamedWidgetContributorFactory getWidgetFactory( String id )
-  {
-	INamedWidgetContributorFactory factory = (INamedWidgetContributorFactory)widgetFactoryTable_.get( id );
-	
-	if( factory == null )
-	{
-	  // The factory is not in our table so we will try the registry.
-	  factory = widgetRegistry_.getFactory( id );
-	  
-	  if( factory != null )
-	  {
-	    widgetFactoryTable_.put( id, factory );
-	    factory.registerDataMappings( dataManager_.getMappingRegistry() );
-		dataManager_.process( factory );
-	  }
-	}
-	else
-	{
-	  dataManager_.process( factory );
-	}
-	
-	return factory;
-  }
-  
-  private class StackEntry
-  {
-    INamedWidgetContributorFactory factory_;
-	Stack                          stack_;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
deleted file mode 100644
index 4f1a34d39..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/env/ui/widgets/popup/DynamicPopupWizard.java
+++ /dev/null
@@ -1,223 +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.wst.command.internal.env.ui.widgets.popup;
-
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimplePopupPageFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WizardPageFactory;
-
-
-/**
- * This class is used to popup dynamic wizards.  The popupMenus extension is used
- * the contribute a popup to Eclipse.  The class in the action element should reference
- * this DynamicPopupWizard class.  This id attribute in the action element should contain
- * an id that references a dynamicWizard extension point.  This is how the DynamicPopupWizard
- * class knows which wizard to display.
- *   
- * Note: the id attribute in the objectContribution element refers to an
- *       actionDialogPreferenceType extension point.  The ids in objectContribution
- *       element and the action element need not be the same as they are in the
- *       example below.
- *
- *<pre>
- *   &lt;extension
- *         point="org.eclipse.ui.popupMenus"&gt;
- *&lt;!-- IFile *.wsdl popup menu --&gt;
- *     &lt;objectContribution
- *           objectClass="org.eclipse.core.resources.IFile"
- *           nameFilter="*.wsdl"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *&lt;!-- WSDL To Java Bean Proxy --&gt;
- *        &lt;action
- *              label="%ACTION_GENERATE_JAVA_PROXY"
- *              class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- *              menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- *              id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *        &lt;/action&gt;
- *     &lt;/objectContribution&gt;
- *  &lt;/extension&gt;
- *
- *   &lt;extension
- *        point="org.eclipse.wst.command.env.dynamicWizard"&gt;
- *     &lt;dynamicWizard
- *           iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- *           class="org.eclipse.jst.ws.consumption.ui.widgets.binding.ClientWidgetBinding"
- *           title="%WIZARD_TITLE_WSC"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/dynamicWizard&gt;
- *  &lt;/extension&gt;
- *</pre>
- *
- */
-public class DynamicPopupWizard extends DynamicWizard implements IActionDelegate
-{
-  private ISelection selection_;
-  
-  public DynamicPopupWizard()
-  {
-	super();
-  }
-  
-  /**
-   * 
-   * @see org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard#getWizardPageFactory()
-   */
-  protected WizardPageFactory getWizardPageFactory()
-  {
-    return new SimplePopupPageFactory( getId() );
-  }
-  
-  private String getId()
-  {
-    return ((IConfigurationElement)originalElement_.getParent()).getAttribute( "id" );  
-  }
-  
-  /**
-   * @see IActionDelegate#run
-   */
-  public void run(IAction action) 
-  {
-    PersistentActionDialogsContext context = PersistentActionDialogsContext.getInstance();
-    String                         id      = getId();
-    
-	if( context.showDialog(id) )
-	{
-	  // Launch the wizard.
-	  init( PlatformUI.getWorkbench(), getSelection() );  
-	    
-	  WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), this);
-	  dialog.setPageSize( 400, 500 );
-	  dialog.create();
-    
-    if( startPage_ != null )
-    {
-	    dialog.open();
-    }
-	}
-	else
-	{
-	  final ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-	  
-	  try
-	  {
-	    monitor.run( false, false, new IRunnableWithProgress()
-	                               {
-	                                 public void run( IProgressMonitor progressMonitor )
-	                                 {
-	                             	     runHeadLess( getSelection(), monitor );
-	                                 }
-	                               } );
-	  }
-	  catch( InterruptedException exc )
-	  { 
-	  }
-	  catch( InvocationTargetException exc )
-	  {
-	  }
-	}
-  }
-  
-  /**
-   * Runs only the Commands associated with the dynamic wizard.
-   * 
-   * @param selection the initial selection from the user.
-   * @param context the context that this execution should take place in.  This
-   *                is usually a progress context so that the user can get feedback
-   *                on how execution is progressing.  The context may be null.
-   */
-  public void runHeadLess( IStructuredSelection selection, IRunnableContext context )
-  {
-	PersistentResourceContext  resourceContext = PersistentResourceContext.getInstance();
-	EclipseStatusHandler       handler         = new EclipseStatusHandler();
-	EclipseEnvironment         environment     = new EclipseEnvironment( null, resourceContext, handler );
-	    
-	DataMappingRegistryImpl    dataRegistry_   = new DataMappingRegistryImpl();	    
-	DataFlowManager            dataManager     = new DataFlowManager( dataRegistry_, environment );
-	SimpleCommandEngineManager manager         = new SimpleCommandEngineManager(environment, dataManager );
-	
-    try
-    {
-      commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" );
-    }
-    catch( CoreException exc )
-    {
-      exc.printStackTrace();
-    }
-	  
-	commandWidgetBinding_.registerDataMappings( dataRegistry_ );
-	
-	CommandFragment rootFragment = getRootFragment( selection, null );
-	
-	manager.setRootFragment( rootFragment );
-	manager.runForwardToNextStop( context );
-  }
-  
-  /**
-   * @see IActionDelegate#selectionChanged
-   */
-  public void selectionChanged(IAction action, ISelection selection) 
-  {
-      selection_ = selection;
-  }
-  
-  private IStructuredSelection getSelection()
-  {
-    IStructuredSelection result = new StructuredSelection();
-    
-	if( selection_ != null) 
-	{	
-	  if( selection_ instanceof IStructuredSelection ) 
-	  {
-	    result = (IStructuredSelection)selection_;
-	  }
-	}
-	else 
-	{
-	  IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-	  
-	  if( window != null ) 
-	  {
-		ISelection selection = window.getSelectionService().getSelection();
-		
-		if( selection instanceof IStructuredSelection ) 
-		{
-		  result = (IStructuredSelection)selection;
-		}
-	  }
-	}
-	
-	return result;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributor.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributor.java
deleted file mode 100644
index da54ce967..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributor.java
+++ /dev/null
@@ -1,43 +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.wst.command.internal.provisional.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-
-public interface INamedWidgetContributor 
-{
-  /**
-   * 
-   * @return returns the WidgetContributor for this Named widget.
-   */
-  public WidgetContributorFactory getWidgetContributorFactory();
-  
-  /**
-   * 
-   * @return returns the name.
-   */
-  public String getName ();
-  
-  /**
-   * 
-   * @return returns a description that might be displayed on
-   * a wizard page.
-   */
-  public String getDescription ();
-  
-  /**
-   * 
-   * @return returns title that may be displayed on 
-   * a wizard page.
-   */
-  public String getTitle();  
-}
diff --git a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributorFactory.java b/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributorFactory.java
deleted file mode 100644
index 0485ffd96..000000000
--- a/bundles/org.eclipse.wst.command.env.ui/src/org/eclipse/wst/command/internal/provisional/env/ui/widgets/INamedWidgetContributorFactory.java
+++ /dev/null
@@ -1,39 +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.wst.command.internal.provisional.env.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-public interface INamedWidgetContributorFactory 
-{
-  /**
-   * 
-   * @return returns the first named widget.
-   */
-  INamedWidgetContributor getFirstNamedWidget();
-  
-  /**
-   * 
-   * @param widgetContributor
-   * @return returns the next named widget after the one specified.
-   */
-  INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor );
-  
-  /**
-   * This method is used by extenions to register the data mappings
-   * that their widgets use.
-   * 
-   * @param dataRegistry
-   */
-  public void registerDataMappings( DataMappingRegistry dataRegistry );
-  
-}
diff --git a/bundles/org.eclipse.wst.command.env/.classpath b/bundles/org.eclipse.wst.command.env/.classpath
deleted file mode 100644
index 751c8f2e5..000000000
--- a/bundles/org.eclipse.wst.command.env/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.command.env/.cvsignore b/bundles/org.eclipse.wst.command.env/.cvsignore
deleted file mode 100644
index d190fb0e9..000000000
--- a/bundles/org.eclipse.wst.command.env/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-runtime
-temp.folder
-env.jar
diff --git a/bundles/org.eclipse.wst.command.env/.options b/bundles/org.eclipse.wst.command.env/.options
deleted file mode 100644
index 1e0b72469..000000000
--- a/bundles/org.eclipse.wst.command.env/.options
+++ /dev/null
@@ -1,18 +0,0 @@
-# Debugging options for the org.eclipse.wst.env plugin.
-
-# Turn on debugging master switch for the org.eclipse.wst.command.env plugin.
-org.eclipse.wst.command.env/debug=true
-
-# Turn on different tracing level
-org.eclipse.wst.command.env/trace/info=true
-org.eclipse.wst.command.env/trace/warning=true
-org.eclipse.wst.command.env/trace/error=true
-
-# Turn on data flow tracing
-org.eclipse.wst.command.env/trace/data=true
-
-# Turn on command tracing
-org.eclipse.wst.command.env/trace/command=true
-
-# Turn on emitter tracing
-org.eclipse.wst.command.env/trace/emitter=true
diff --git a/bundles/org.eclipse.wst.command.env/.project b/bundles/org.eclipse.wst.command.env/.project
deleted file mode 100644
index 74dad120f..000000000
--- a/bundles/org.eclipse.wst.command.env/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.command.env</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
deleted file mode 100644
index 50f61b807..000000000
--- a/bundles/org.eclipse.wst.command.env/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.command.env; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Activator: org.eclipse.wst.command.internal.env.plugin.EnvPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.command.internal.env.commandline,
- org.eclipse.wst.command.internal.env.common,
- org.eclipse.wst.command.internal.env.context,
- org.eclipse.wst.command.internal.env.eclipse,
- org.eclipse.wst.command.internal.env.plugin,
- org.eclipse.wst.command.internal.env.preferences
-Require-Bundle: org.eclipse.wst.command.env.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.commands,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.command.env/about.html b/bundles/org.eclipse.wst.command.env/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.command.env/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.command.env/build.properties b/bundles/org.eclipse.wst.command.env/build.properties
deleted file mode 100644
index de223926a..000000000
--- a/bundles/org.eclipse.wst.command.env/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = plugin.xml,\
-               *.jar,\
-               plugin.properties,\
-               .,\
-               META-INF/,\
-               about.html
-source.. = src/
-output.. = bin/
-
diff --git a/bundles/org.eclipse.wst.command.env/plugin.properties b/bundles/org.eclipse.wst.command.env/plugin.properties
deleted file mode 100644
index afde0894a..000000000
--- a/bundles/org.eclipse.wst.command.env/plugin.properties
+++ /dev/null
@@ -1,21 +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=Environment Command Framework (headless)
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_XP_DYNAMIC_WIZARD=Dynamic Wizard
-PLUGIN_XP_POPUP_DIALOGS=Optional Pop-up Action Dialogs Types
-
-
diff --git a/bundles/org.eclipse.wst.command.env/plugin.xml b/bundles/org.eclipse.wst.command.env/plugin.xml
deleted file mode 100644
index e03a537d8..000000000
--- a/bundles/org.eclipse.wst.command.env/plugin.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-     <extension-point
-      id="dynamicWizard"
-      name="%PLUGIN_XP_DYNAMIC_WIZARD"/>
-   
-   <extension-point
-      id="actionDialogPreferenceType"
-      name="%PLUGIN_XP_POPUP_DIALOGS"/>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
deleted file mode 100644
index 561fb7589..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/CommandLine.java
+++ /dev/null
@@ -1,856 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.BitSet;
-import java.util.ResourceBundle;
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.env.common.StringUtils;
-
-
-/**
-  * <p>This is a generic command line parsing class.  The programmer need only specify
-  * the characteristics of their command line(ie. positional parameters, flags, etc)
-  * and this class will perform the rest of the parsing work.  As an added bonus this
-  * class will also create formated help text that displays the syntax of this
-  * command line.
-  *
-  * <p>The main parameter to the CommandLine constructor is a two dimensional String
-  * array.  There are 5 columns in this array and as many rows as needed for each
-  * flag or positional parameter.  The five columns are:
-  *
-  * <ol>
-  * <li>The name of the flag(eg. "help" or "a", etc)
-  *     Note: no dash should be in the name here.  The user would specify "-help" on the
-  *           command line though.
-  * <li>The name of the flag parameter(if any)
-  * <li>A string indicating whether this flag can appear more than once on the
-  *     command line.
-  * <li>A string indicating whether this flag must be specified on the command line.
-  * <li>A help text string which describes this particular flag or positional parameter.
-  * </ol>
-  *
-  * <p>Each row in the string array is associate with either a positional parameter
-  * or with a flag.  For example, consider this command line:
-  * <ul>
-  * <li>My_prog required_parm1 -ab parm_for_ab required_parm2 -help optional_parms
-  * </ul>
-  *
-  * <p>In this example My_prog is the name of the program.  required_parm1 and
-  * required_parm2 must be specified on the command line.  Notice that they do not
-  * have to be adjacent to each other on the command line. optional_parms may optionally
-  * specified.  optional_parms can be 0 or more parameters.  They does not need to be
-  * adjacent to the required parameters, but they do need to follow the required
-  * parameters. Two flags are specified "-ab" and "-help".  The "-ab" flag has a
-  * parameter "parm_for_ab" associated with it.  Note: a flag can not have an optional
-  * parameter. (ie. a flag either never have a parameter or it always has a parameter)
-  * In this example, the first two rows in the string array would describe required_parm1
-  * and required_parm2.  The third entry would describe optional_parms.  The fourth and
-  * fifth rows would describe "-ab" and "-help".  For this command line the string array
-  * would look like this:
-  *
-  * <ul>
-  * <li>{ { CommandLine.POSITIONAL, "parm1", CommandLine.NO_DUPS,
-  *       CommandLine.REQUIRED, "parm1 help text" },
-  * <li>{ CommandLine.POSITIONAL, "parm2", CommandLine.NO_DUPS,
-  *       CommandLine.REQUIRED, "parm2 help text" },
-  * <li>{ CommandLine.POSITIONAL, "optional_parms", CommandLine.DUPS_OK,
-  *       CommandLine.REQUIRED, "optional help text" },
-  * <li>{ "ab", "parm_for_ab", CommandLine.NO_DUPS,
-  *       CommandLine.OPTIONAL, "ab help text" },
-  * <li>{ "help", CommandLine.NO_PARM, CommandLine.NO_DUPS,
-  *       CommandLine.OPTIONAL, "displays this help text" } }
-  * </ul>
-  *
-  * <p>String array rules:
-  *
-  * <ol>
-  * <li>Positional rows must always come first in the array.  These rows must
-  *     have a name specified in column 2, except for one case.  If you want to indicate that
-  *     there are no optional positional parameters you would put CommandLine.NO_PARM
-  *     in column 2 of the positional row.  You would also need to put CommandLine.OPTIONAL
-  *     in column 4 since this row is for optional parameters(or the non-existence of
-  *     optional parameters as the case may be)
-  * <li>Once a positional row specifies that it is optional, no further positional rows
-  *     may be specified.
-  * <li>At least one positional row must be specified, even if it is to just to specify that
-  *     there are no optional parameters.
-  * <li>Flag names must be in lower case.  Note: the user can specify upper or lower case
-  *     on the command line.
-  * <li>If a flag has a parameter the name of the parameter should be put into column 2.
-  *     otherwise CommandLine.NO_PARM should be put in column 2.
-  * <li>If a flag is allowed to appear more than once on the command line then
-  *     CommandLine.DUPS_OK should be put into column 3, otherwise CommandLine.NO_DUPS
-  *     should be put into column 3.
-  * <li>If a flag must be specified on the command line then CommandLine.REQUIRED should
-  *     be specified in column 4, otherwise CommandLine.OPTIONAL should be specified.
-  * <li>A help flag must be specified.
-  * <li>The strings specified in the flags column, the parameter name column, and the
-  *     help column are always translated using the resource bundle specified.  Of
-  *     course the special string values such as POSITIONAL and NO_PARM are not
-  *     translated.
-  * </ol>
-  *
-  * <p> Flag matching rules:
-  * <ol>
-  * <li>The parser will attempt to match a user specified flag with the minimum number
-  *     of programmer specified flag characters.  For example, if the programmer has
-  *     specified that the flag is "help" the user could specify "-h", "-he", "-hel", or
-  *     "-help".  If the programmer has also specified a flag called "hello", the
-  *     user would get an error message for specifing either "-h", "-he" or "-hel", since
-  *     it is ambiguous which flag is being refered to.  Both "-hell" and "-hello"
-  *     would be ok for the user to specify the hello flag on the command line.
-  * <li>If a flag has a parameter, the parameter may be immediately adjacent to the flag.
-  *     For example if "abcd" is specified as a flag with a parameter, the user could
-  *     specify the following assuming there are no other ambiguous flags. "-abcdparm",
-  *     "-abcparm", "-abparm", or "-aparm" where parm is the parameter for the flag.
-  *     (Of course the user can always put a white space between the flag and the
-  *     parameter.)
-  * <li>If a flag does not have a parameter and a parameter is adjacent to it then this
-  *     parameter is interpreted as a positional parameter.  For example if "abcb" is
-  *     specified as a flag and the user specifies "-abhello", then the first "ab" will be
-  *     interpreted as the flag and "hello" will be interpreted as a positional
-  *     parameter.
-  * </ol>
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-
-public class CommandLine
-{
-  // Constant strings that the user should use in their flags_info input array.
-  /**
-    * Specifies that this flag or positional parameter is required.
-  **/
-  public static final String REQUIRED   = "required";
-  /**
-    * Specifies that this flag or positional parameter is optional.
-  **/
-  public static final String OPTIONAL   = "optional";
-  /**
-    * Specifies that this flag may be specified more than once on the command line.
-    * Note: This string has no meaning for positional parameters.
-  **/
-  public static final String DUPS_OK    = "dups_ok";
-  /**
-    * Specifies that this flag may not be specified more than once on the command line.
-    * Note: This string has no meaning for positional parameters.
-  **/
-  public static final String NO_DUPS    = "no_dups";
-  /**
-    * Specifies that a row is a positional parameter row.
-  **/
-  public static final String POSITIONAL = "";
-  /**
-    * Specifies that a flag has no parameter.  For positional parameters this
-    * string indicates that there are no optional parameters.
-  **/
-  public static final String NO_PARM    = "";
-  
-  /**
-    * @param flags_info This parameter specifies the characteristics of the
-    *                   command line parser.  See the class description for a
-    *                   definition of what this string array should look like.
-    * @param help_flag  This string indicates which flag in the flags_info
-    *                   array is the help flag.
-    * @param tool_name  This string indicates the name of the tool that this
-    *                   command line parser is being used for.  This string
-    *                   is only used when creating the help text.
-  **/
-  public CommandLine( String[][]     flags_info,
-                       String         help_flag,
-                       String         tool_name,
-                       ResourceBundle flagMessages )
-                   
-    throws InternalErrorExc
-  {
-    this.flags_info   = flags_info;
-    this.help_flag    = help_flag;
-    this.tool_name    = tool_name;
-    this.flagMessages = flagMessages;
-    
-    messages = ResourceBundle.getBundle( "org.eclipse.wst.command.internal.env.commandline.commandline" );
-    verify_flags_info();
-  }
-
-  /**
-    * Call this method to parse a command line.
-    * @param args This is the string array from the command line.
-    * @throws Flag_error If the user has specified the command line incorrectly
-    *                    a Flag_error exception will be thrown.  Use getMessage
-    *                    to get a description of the user error.
-    *
-    * @throws Help_specified If the user specifies the help flag this exception
-    *                        will be thrown.  Use getMessage to get a fully
-    *                        formatted syntax description of this command line.
-  **/
-  public void check_flags( String[] args ) throws Flag_error
-  {
-    flags_specified = new Vector[flags_info.length];
-
-    for( int index = 0; index < args.length; index++ )
-    {
-      boolean processed_the_next_arg = process_arg( args, index );
-      if( processed_the_next_arg == true ) index++;
-    }
-
-    // If help was specified we will not check the regular rules.
-    if( !flag_specified( help_flag ) )
-    {
-      // Check for flags breaking the rules specified in flags_info.
-      check_rules();
-
-      // Call subclassed method to see if more processing is required.
-      more_processing();
-    }
-  }
-
-  /**
-    * This method is for subclasses of this class.  This method is called at
-    * the very end of check_flags method.  It is intended that subclasses would
-    * perform additional command line checking here.
-  **/
-  protected void more_processing() throws Flag_error, InternalErrorExc
-  {
-  }
-
-  /**
-    * Once the command line has been parsed by calling check_flags a
-    * call can be made to this method to get the parameters for this flag.
-    * If the flag was not specified on the command line null will be returned.
-    * If the flag was specified, but has no parameters a valid vector will be
-    * returned containing a null.
-  **/
-  public String[] get_flag_parms( String flag )
-  {
-    int     row        = 0;
-    boolean flag_found = false;
-
-    while( flag_found == false && row < flags_info.length )
-    {
-      if( flags_info[row][FLAG_COL].equals( flag ) )
-      {
-        flag_found = true;
-      }
-      else
-      {
-        row++;
-      }
-    }
-
-    if( flag_found == true ) 
-    {
-      Vector parms = flags_specified[row];
-      return parms == null ? null : (String[])(parms.toArray( new String[0] ));
-    }
-
-    return null;
-  }
-
-  /**
-    * Call this method to get all of the positional parameters.
-    * This method returns both the required positionals and the
-    * optional positionals in that order.  If no positional parameters
-    * were specified null will be returned.
-  **/
-  public String[] get_positionals()
-  {
-    return (String[])flags_specified[POSITIONAL_ROW].toArray( new String[0] );
-  }
-
-  /**
-    * This method returns true if this flag was specified by the user
-    * otherwise false is returned.
-  **/
-  public boolean flag_specified( String flag )
-  {
-    return get_flag_parms( flag ) != null;
-  }
-
-  /**
-    * This method returns fully formated help text syntax for this
-    * command line.
-  **/
-  public String get_help_text()
-  {
-    StringBuffer help_text  = new StringBuffer(400);
-    int          help_width = HELP_LINE_LEN -
-                              2 -              // blanks
-                              1 -              // dash
-                              max_flag_size -  // flag field
-                              1 -              // blank
-                              max_name_size -  // name field
-                              1;               // blank
-
-    help_text.append( messages.getString( FlagMessages.PARSER_INFO_SYNTAX ) +
-                      ": " + tool_name + " " );
-
-    // Display the required positionals if any.
-    for( int index = 0; index < required_positionals; index++ )
-    {
-      help_text.append( flagMessages.getString( flags_info[index][NAME_COL] ) +
-                        " " );
-    }
-
-    help_text.append( "[" + messages.getString( FlagMessages.PARSER_FLAGS ) +
-                      "] " );
-
-    if( optional_positionals_allowed == true )
-    {
-      help_text.append( flagMessages.getString( flags_info[optional_list_index][NAME_COL] ) );
-    }
-
-    help_text.append( "\n  " + messages.getString( FlagMessages.PARSER_INFO_WHERE ) + "\n" );
-
-    // Create one line of description for each parameter
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      String columnId   = flags_info[row][NAME_COL];
-      String columnName = columnId == NO_PARM ? "" : flagMessages.getString( columnId );
-
-      String flagId     = flags_info[row][FLAG_COL];
-      String flagName   = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString(flagId);
-
-      int flag_padding = max_flag_size - flagName.length();
-      int name_padding = max_name_size - columnName.length();
-
-      // Skip this row if this is a marker for no optional positionals.
-      if( flags_info[row][FLAG_COL] == POSITIONAL &&
-          flags_info[row][NAME_COL] == NO_PARM ) continue;
-
-      if( flagName == POSITIONAL )
-      {
-        help_text.append( getBlanks(3 ) );
-      }
-      else
-      {
-        help_text.append( "  -" + flagName );
-      }
-
-      help_text.append( getBlanks( flag_padding + 1 ) );
-      help_text.append( columnName );
-      help_text.append( getBlanks( name_padding + 1 ) );
-
-      String   columnHelp = flagMessages.getString( flags_info[row][HELP_COL] );
-      String[] split_help_text
-        = StringUtils.splitter( columnHelp, help_width );
-
-      if( split_help_text.length > 0 )
-        help_text.append( split_help_text[0] + "\n" );
-      else
-        help_text.append( "\n" );
-
-      for( int index = 1; index < split_help_text.length; index++ )
-      {
-        help_text.append( getBlanks( HELP_LINE_LEN - help_width ) );
-        help_text.append( split_help_text[index] + "\n" );
-      }
-      
-      help_text.append( "\n" );
-    }
-
-    return "" + help_text;
-  }
-  
-  /**
-   *  Return a string with the specified number of blanks.
-   */
-  private String getBlanks( int count )
-  {
-  	char[] blanks = new char[count];
-  	Arrays.fill( blanks, 0, count, ' ' );
-  	
-  	return new String( blanks );
-  }
-
-  /**
-    * This class is the base for all command line exception classes.
-  **/
-  static public class ErrorExc extends Exception
-  {
-  	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257567317259793720L;
-
-	public ErrorExc( String message, String[] args )
-  	{
-  	  super( MessageFormat.format( message, args ) );
-  	}
-  }
-
-  /**
-    * This class will be thrown when an internal error is detected.
-    * This usually happens if the flag description information was
-    * specified incorrectly.
-  **/
-  static public class InternalErrorExc extends IllegalArgumentException
-  {  	
-  	/**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3258410621136614450L;
-
-	public InternalErrorExc( String message, String[] args )
-  	{
-  	  super( MessageFormat.format( message, args ) );
-  	}
-  	
-  	public InternalErrorExc( String message )
-  	{
-  	  this( message, (String[])null );
-  	}
-  	
-  	public InternalErrorExc( String message, String arg )
-  	{
-  	  this( message, new String[]{ arg } );
-  	}
-  }
-
-  /**
-    * This class will be thrown if a user error occurs while parsing the command line.
-  **/
-  static public class Flag_error extends ErrorExc
-  {
-    /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3832621776877663537L;
-
-	public Flag_error( String message, String[] args )
-    {
-      super( message, args );
-    }
-
-    public Flag_error( String message, String arg )
-    {
-      super( message, new String[]{ arg } );
-    }
-
-    public Flag_error( String message )
-    {
-      super( message, null );
-    }
-  }
-
-  /**
-    * Tries to process a single flag on the command line.
-    * @param  args      All the command line parameters.
-    * @param  arg_index This is the index of the argument that is to be processed.
-    * @return returns true if the argument we are processing is a flag that has a
-    *         parameter and the parameter is specified in the next argument.
-  **/
-  private boolean process_arg( String[] args, int arg_index ) throws Flag_error
-  {
-    boolean processed_next_arg = false;
-
-    if( args[arg_index].charAt(0) == '-' )
-    {
-      // This is the start of a flag.
-      int flag_index = 1;
-      int info_index = get_info_index( args[arg_index], flag_index );
-      int max_index  = get_max_index( args[arg_index], flag_index, info_index );
-
-      if( flags_info[info_index][NAME_COL] != NO_PARM )
-      {
-        // This flag takes a parameter so check if it is stuck to this
-        // arg.
-        if( max_index < args[arg_index].length() )
-        {
-          add_flag_parm( info_index,
-                         args[arg_index].substring( max_index,
-                                                    args[arg_index].length() ) );
-        }
-        else
-        {
-          // This flag has a parameter and it wasn't stuck to the flag,
-          // so we will try to get it from the next arg.
-          if( arg_index+1 < args.length &&
-              args[arg_index+1].charAt(0) != '-' )
-          {
-            // We found an parameter in the next string so we will use this
-            // one as a parameter for this flag.  Note: if was no parameter
-            // after the flag at all, the error will be caught in the
-            // check_rules method.
-            add_flag_parm( info_index, args[arg_index+1] );
-            processed_next_arg = true;
-          }
-          else
-          {
-            // Error missing paramater. This error is caught by check_rules.
-            add_flag_parm( info_index, null );
-          }
-        }
-      }
-      else
-      {
-        // The flag does not have a parameter so we will add a null.
-        add_flag_parm( info_index, null );
-
-        // Check to see if a positional parameter is stuck to this flag.
-        if( max_index < args[arg_index].length() )
-        {
-          add_positional( args[arg_index].substring( max_index,
-                                                     args[arg_index].length() ) );
-        }
-      }
-    }
-    else
-    {
-      // This is a positional parameter.
-      add_positional( args[arg_index] );
-    }
-
-    return processed_next_arg;
-  }
-
-  /**
-    * Finds the row for the flag that uniquely matched this flag str.
-    * @return returns the flags_info index of the matching flag.
-  **/
-  private int get_info_index( String flag_str, int start_index )
-    throws Flag_error
-  {
-    //int info_start  = 1;
-    //int info_end    = flags_info.length;
-    int info_index;
-    int found_count = 0;
-    int info_col_index = 0;
-    int last_info_index = 0;
-
-    BitSet flags_rejected = new BitSet();
-
-    // Loop over each char in flag_str.  Note: we will probably bail early.
-    for( int flag_col_index = start_index; flag_col_index < flag_str.length(); flag_col_index++ )
-    {
-      // Loop over each flag in flag_info
-      for( info_index = 0; info_index < flags_info.length; info_index++ )
-      {
-        String flagId   = flags_info[info_index][FLAG_COL];
-        String flagName = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-
-        if( flags_rejected.get( info_index ) == false &&
-            info_col_index < flagName.length() &&
-              Character.toLowerCase(flag_str.charAt(flag_col_index)) ==
-              flagName.charAt(info_col_index) )
-        {
-          found_count++;
-          last_info_index = info_index;
-        }
-        else
-        {
-          flags_rejected.set( info_index );
-        }
-      }
-
-      if( found_count == 1 )
-      {
-        // We have a match.
-        return last_info_index;
-      }
-      else if( found_count == 0 )
-      {
-        // Flag not found at all.
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_FOUND ),
-                              flag_str.substring( start_index ) );
-      }
-      else
-      {
-        // More than one flag was found with this char so we will go to the
-        // next char to uniquely match it.
-        info_col_index++;
-        //info_start = last_info_index - found_count + 1;
-        //info_end   = last_info_index + 1;
-        found_count = 0;
-      }
-    }
-
-    // The only way to get to this code is if the loop exited with
-    // the found_count greater than 1.  Therefore, the flag specified is
-    // ambiguous.
-    throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_AMBIGUOUS_FLAG ),
-                          flag_str.substring( start_index) );
-  }
-
-  /**
-    * This method tries to match as many characters as possible of the user
-    * specified flag with the matched flag string.
-    * @return returns the position of the last matching flag chararacter.
-  **/
-  private int get_max_index( String flag_str, int flag_start, int info_index )
-  {
-    int flag_col_index = flag_start;
-    int info_col_index = 0;
-
-    String info_str = flagMessages.getString( flags_info[info_index][FLAG_COL] );
-
-    while( flag_col_index < flag_str.length() &&
-           info_col_index < info_str.length() )
-    {
-      if( Character.toLowerCase( flag_str.charAt(flag_col_index) ) !=
-          info_str.charAt(info_col_index) )
-        break;
-
-      flag_col_index++;
-      info_col_index++;
-    }
-
-    return flag_col_index;
-  }
-
-  /**
-    * Adds a positional parameter to flags_specified.
-  **/
-  private void add_positional( String positional_parm )
-  {
-    if( flags_specified[POSITIONAL_ROW] == null )
-      flags_specified[POSITIONAL_ROW] = new Vector(3);
-
-    flags_specified[POSITIONAL_ROW].add( positional_parm );
-  }
-
-  /**
-    * Adds a flag and its parameter to flags_specified.  If only the
-    * flag was specified, then a null should be passed to flag_parm.
-  **/
-  private void add_flag_parm( int flag_index, String flag_parm )
-    throws Flag_error
-  {
-    if( flags_info[flag_index][DUP_COL] == NO_DUPS &&
-        flags_specified[flag_index] != null )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
-                             flagMessages.getString( flags_info[flag_index][FLAG_COL] ) );
-
-    if( flags_specified[flag_index] == null )
-      flags_specified[flag_index] = new Vector(3);
-
-    flags_specified[flag_index].add( flag_parm );
-  }
-
-  /**
-    * Checks that the user hasn't broken any command line rules.
-  **/
-  private void check_rules() throws Flag_error
-  {
-    // Check that all of the required positionals were specified.
-    int positional_count = 0;
-
-    if( flags_specified[POSITIONAL_ROW] != null )
-    {
-      positional_count = flags_specified[POSITIONAL_ROW].size();
-    }
-
-    if( required_positionals > positional_count )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_POSITIONAL ),
-                             flagMessages.getString( flags_info[required_positionals-1][NAME_COL] ) );
-
-    else if( required_positionals < positional_count &&
-             optional_positionals_allowed == false )
-      throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_TOO_MANY_POSITIONALS ) );
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      if( flags_info[row][FLAG_COL] == POSITIONAL ) continue;
-
-      if( flags_specified[row] == null &&
-          flags_info[row][REQUIRED_COL] == REQUIRED )
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_REQUIRED_FLAG ),
-                               flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
-      int parm_count = 0;
-
-      if( flags_specified[row] != null ) parm_count = flags_specified[row].size();
-
-      // Check for too many flag parameters.
-      if( flags_info[row][DUP_COL] == NO_DUPS && parm_count > 1 )
-        throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED ),
-                               flagMessages.getString( flags_info[row][FLAG_COL] ) );
-
-      // Check for missing flag parameter.
-      if( parm_count > 0 && flags_info[row][NAME_COL] != NO_PARM )
-      {
-        for( int index = 0; index < flags_specified[row].size(); index++ )
-        {
-          if( flags_specified[row].elementAt(index) == null )
-            throw new Flag_error( messages.getString( FlagMessages.PARSER_ERROR_MISSING_FLAG_PARAMETER ),
-                                  new String[]
-                                    { flagMessages.getString( flags_info[row][FLAG_COL] ),
-                                      flagMessages.getString( flags_info[row][NAME_COL] ) } );
-
-        }
-      }
-    }
-  }
-
-  /**
-    * This method verifies that a proper flags_info string array was passed
-    * to us by the programmer.
-  **/
-  private void verify_flags_info() throws InternalErrorExc
-  {
-    boolean done_positionals = false;
-    boolean help_specified   = false;
-
-    required_positionals = 0;
-    optional_positionals_allowed = false;
-    optional_list_index = -1;
-    max_flag_size = 0;
-    max_name_size = 0;
-
-    if( flags_info == null || flags_info.length == 0 )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED  ) );
-
-    if( flags_info[POSITIONAL_ROW] != null &&
-        flags_info[POSITIONAL_ROW].length > 0 &&
-        flags_info[POSITIONAL_ROW][FLAG_COL] != POSITIONAL )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL ) );
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      if( flags_info[row] == null )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_FLAG_ROW ) );
-
-      if( flags_info[row].length != 5 )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_ROW_SIZE ) );
-
-      if( flags_info[row][FLAG_COL] == null ||
-          flags_info[row][NAME_COL] == null ||
-          flags_info[row][HELP_COL] == null )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_NULL_IN_ROW ) );
-
-      if( flags_info[row][FLAG_COL].equals( help_flag ) ) help_specified = true;
-
-      String flagId   = flags_info[row][FLAG_COL];
-      String nameId   = flags_info[row][NAME_COL];
-
-      String flag_col = flagId == POSITIONAL ? POSITIONAL : flagMessages.getString( flagId );
-      String name_col = nameId == NO_PARM ? NO_PARM : flagMessages.getString( nameId );
-
-      if( flag_col.length() > max_flag_size )
-        max_flag_size = flag_col.length();
-
-      if( name_col != NO_PARM && name_col.length() > max_name_size )
-        max_name_size = name_col.length();
-
-      // Ensure that flags are all in lowercase.
-      if( !flag_col.equals( flag_col.toLowerCase() ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_FLAG_NOT_LOWERCASE ),
-                                    flag_col );
-
-      // Ensure that only the predefined dup strings are used.
-      // Note: it's ok to use != when comparing constant strings literals.
-      if( flags_info[row][DUP_COL] == null ||
-          ( flags_info[row][DUP_COL] != NO_DUPS &&
-            flags_info[row][DUP_COL] != DUPS_OK ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_DUP_STRING ),
-                                 flags_info[row][DUP_COL] );
-
-      // Ensure that only the predefined required strings are used.
-      if( flags_info[row][REQUIRED_COL] == null ||
-          ( flags_info[row][REQUIRED_COL] != REQUIRED &&
-            flags_info[row][REQUIRED_COL] != OPTIONAL ) )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_INCORRECT_REQUIRED_STRING ),
-                                 flags_info[row][REQUIRED_COL] );
-
-      // Count the number of required positionals.
-      if( flags_info[row][FLAG_COL] == POSITIONAL )
-      {
-        if( flags_info[row][REQUIRED_COL] == REQUIRED )
-        {
-          if( flags_info[row][NAME_COL] == NO_PARM )
-            throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME ) );
-
-          required_positionals++;
-        }
-        else if( flags_info[row][NAME_COL] != NO_PARM )
-        {
-          // We use the NAME_COL field for an optional positional to denote
-          // whether additional positionals are allowed or not.
-          optional_positionals_allowed = true;
-          optional_list_index = row;
-        }
-      }
-
-      // Ensure that positionals are at the beginning of the info.
-      if( flags_info[row][FLAG_COL] != POSITIONAL ||
-          ( done_positionals == false &&
-            flags_info[row][FLAG_COL] == POSITIONAL &&
-            flags_info[row][REQUIRED_COL] == OPTIONAL ) )
-      {
-        done_positionals = true;
-      }
-      else if( done_positionals == true )
-        throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING ) );
-    }
-
-    // Ensure that a help flag was specified in the info list.
-    if( help_specified == false )
-      throw new InternalErrorExc( messages.getString( FlagMessages.PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED ) );
-  }
-
-  /**
-    * This method is used to dump internal information about a parsed
-    * command line.
-  **/
-  public String toString()
-  {
-    StringBuffer b = new StringBuffer(100);
-
-    for( int row = 0; row < flags_info.length; row++ )
-    {
-      b.append( "\n" );
-
-      if( flags_info[row][FLAG_COL] == POSITIONAL )
-        b.append( "Positional:" );
-      else
-        b.append( flagMessages.getString( flags_info[row][FLAG_COL] ) + ":" );
-
-
-      if( flags_specified[row] == null )
-        b.append( "no parameters" );
-      else
-        for( int parm_index = 0; parm_index < flags_specified[row].size(); parm_index++ )
-        {
-          String parm = (String)flags_specified[row].elementAt(parm_index);
-          b.append( parm + ":" );
-        }
-      b.append( "\n" );
-    }
-
-    return ""+b;
-  }
-
-  private static final int FLAG_COL     = 0;
-  private static final int NAME_COL     = 1;
-  private static final int DUP_COL      = 2;
-  private static final int REQUIRED_COL = 3;
-  private static final int HELP_COL     = 4;
-
-  private static final int POSITIONAL_ROW = 0;
-  private static final int HELP_LINE_LEN  = 75;
-
-  private String[][] flags_info;
-  private String     help_flag;
-  private String     tool_name;
-  private Vector[]   flags_specified;
-  private int        required_positionals;
-  private boolean    optional_positionals_allowed;
-  private int        optional_list_index;
-  private int        max_flag_size;
-  private int        max_name_size;
-
-  protected ResourceBundle messages;
-  private   ResourceBundle flagMessages;
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
deleted file mode 100644
index 49a128c00..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/FlagMessages.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.commandline;
-
-/**
-  * This class is used to store constant string error messages
-  * generated by CommandLine.java
-  *
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-  * @see    org.eclipse.wst.command.internal.env.commandline.CommandLine
-**/
-
-public final class FlagMessages
-{
-
-  // Copyright
-  public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-  public static final String PARSER_ERROR_FLAG_NOT_FOUND = "PARSER_ERROR_FLAG_NOT_FOUND";
-
-  public static final String PARSER_ERROR_AMBIGUOUS_FLAG = "PARSER_ERROR_AMBIGUOUS_FLAG";
-
-  public static final String PARSER_ERROR_MISSING_POSITIONAL = "PARSER_ERROR_MISSING_POSITIONAL";
-
-  public static final String PARSER_ERROR_TOO_MANY_POSITIONALS = "PARSER_ERROR_TOO_MANY_POSITIONALS";
-
-  public static final String PARSER_ERROR_MISSING_REQUIRED_FLAG = "PARSER_ERROR_MISSING_REQUIRED_FLAG";
-
-  public static final String PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED = "PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED";
-
-  public static final String PARSER_ERROR_MISSING_FLAG_PARAMETER = "PARSER_ERROR_MISSING_FLAG_PARAMETER";
-
-  // Error internal error messages.
-  public static final String PARSER_ERROR_MESSAGE_MISSING_ARG = "PARSER_ERROR_MESSAGE_MISSING_ARG";
-
-  // Internal command line error messages.
-  public static final String PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED = "PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED";
-
-  public static final String PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL = "PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL";
-
-  public static final String PARSER_ERROR_NULL_FLAG_ROW = "PARSER_ERROR_NULL_FLAG_ROW";
-
-  public static final String PARSER_ERROR_INCORRECT_ROW_SIZE = "PARSER_ERROR_INCORRECT_ROW_SIZE";
-
-  public static final String PARSER_ERROR_NULL_IN_ROW = "PARSER_ERROR_NULL_IN_ROW";
-
-  public static final String PARSER_ERROR_INCORRECT_DUP_STRING = "PARSER_ERROR_INCORRECT_DUP_STRING";
-
-  public static final String PARSER_ERROR_INCORRECT_REQUIRED_STRING = "PARSER_ERROR_INCORRECT_REQUIRED_STRING";
-
-  public static final String PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING = "PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING";
-
-  public static final String PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED = "PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED";
-
-  public static final String PARSER_ERROR_FLAGS_NOT_ORDERED = "PARSER_ERROR_FLAGS_NOT_ORDERED";
-
-  public static final String PARSER_ERROR_FLAG_NOT_LOWERCASE = "PARSER_ERROR_FLAG_NOT_LOWERCASE";
-
-  public static final String PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME = "PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME";
-
-  public static final String PARSER_INFO_SYNTAX = "PARSER_SYNTAX";
-
-  public static final String PARSER_FLAGS = "PARSER_FLAGS";
-  
-  public static final String PARSER_INFO_WHERE = "PARSER_WHERE";
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
deleted file mode 100644
index 78529810d..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/commandline/commandline.properties
+++ /dev/null
@@ -1,34 +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
-###############################################################################
-
-PARSER_ERROR_FLAG_NOT_FOUND=IWAB0123E Flag -{0} is not valid.
-PARSER_ERROR_AMBIGUOUS_FLAG=IWAB0284E Flag -{0} is ambiguous.
-PARSER_ERROR_MISSING_POSITIONAL=IWAB0285E Missing {0} parameter.
-PARSER_ERROR_TOO_MANY_POSITIONALS=IWAB0286E Too many positional parameters specified.
-PARSER_ERROR_MISSING_REQUIRED_FLAG=IWAB0288E Flag -{0} is missing.
-PARSER_ERROR_DUPLICATE_FLAGS_NOT_ALLOWED=IWAB0293E Flag -{0} has been specified more than once.
-PARSER_ERROR_MISSING_FLAG_PARAMETER=IWAB0294E Flag -{0} is missing parameter {1}.
-PARSER_ERROR_MESSAGE_MISSING_ARG=IWAB0319E Error message {0} is missing an argument.
-PARSER_ERROR_NO_FLAGS_DATA_SPECIFIED=IWAB0345E Specify flag information.
-PARSER_ERROR_FIRST_FLAG_NOT_POSITIONAL=IWAB0346E The first flag must be positional.
-PARSER_ERROR_NULL_FLAG_ROW=IWAB0347E Null flag row.
-PARSER_ERROR_INCORRECT_ROW_SIZE=IWAB0348E Flag row must have 5 strings.
-PARSER_ERROR_NULL_IN_ROW=IWAB0349E Flag information contains a null string.
-PARSER_ERROR_INCORRECT_DUP_STRING=IWAB0350E Duplicate string {0} is not valid.
-PARSER_ERROR_INCORRECT_REQUIRED_STRING=IWAB0351E Required string {0} is not valid.
-PARSER_ERROR_POSITIONAL_NOT_AT_BEGINNING=IWAB0352E Positional flag is not at the beginning.
-PARSER_ERROR_HELP_FLAG_NOT_SPECIFIED=IWAB0353E Help flag is not specified in information array.
-PARSER_ERROR_FLAGS_NOT_ORDERED=IWAB0354E Flags are not in lexical order.
-PARSER_ERROR_FLAG_NOT_LOWERCASE=IWAB0355E Flag {0} is not lowercase.
-PARSER_ERROR_REQUIRED_POSITIONAL_NEEDS_NAME=IWAB0356E Required positional parameters must have a name specified.
-PARSER_SYNTAX=Syntax
-PARSER_FLAGS=Flags
-PARSER_WHERE=Where
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
deleted file mode 100644
index fa1923e7b..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/ClassPath.java
+++ /dev/null
@@ -1,90 +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.wst.command.internal.env.common;
-
-import java.io.File;
-
-/**
- * 
- * The class provides and easy way to build classpaths.
- *
- */
-public class ClassPath 
-{
-  private StringBuffer path = new StringBuffer();
-  
-  /**
-   * 
-   * @param newPath appends this new path to the end of the classpath.
-   */
-  public void appendPath( String newPath )
-  {
-  	// No value to put on path, so just return
-  	if( newPath.equals( "" ) ) return;
-  	
-  	// If this is the first path in the string then we don't need a path
-  	// separator.
-  	if( path.length() == 0 )
-  	{
-  	  path.append( newPath );
-  	}
-  	else
-  	{
-  	  path.append( File.pathSeparatorChar + newPath );
-  	}
-  }
-  
-  /**
-   * This method appends all jar and zip files in a particular directory to
-   * the classpath.
-   * 
-   * @param directory specifies a directory contains jar and zip files.
-   */
-  public void appendDir( String directory )
-  {
-  	File dir = new File( directory );
-  	
-  	if( !dir.isDirectory() ) return;
-  	
-  	File[] files = dir.listFiles();
-  	
-  	for( int index = 0; index < files.length; index++ )
-  	{
-  	  File   file = files[index];
-  	  String name = file.getName();
-  	  
-  	  if( file.isFile() &&
-  	      ( name.endsWith( ".jar" ) ||
-  	        name.endsWith( ".zip" ) ) )
-  	  {
-  	  	appendPath( file.getAbsolutePath() );
-  	  }
-  	        
-  	}
-  }
-  
-  /**
-   * 
-   * @param newPath appends a new classpath to the end of this classpath.
-   */
-  public void appendPath( ClassPath newPath )
-  {
-  	appendPath( newPath.path.toString() );
-  }
-  
-  /**
-   * @return returns the full string classpath with separators.
-   */
-  public String toString()
-  {
-  	return path.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
deleted file mode 100644
index 4d7cd2121..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceOutputStream.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.StatusHandler;
-
-
-
-/**
-* This class defines an output stream that writes to an
-* {@link org.eclipse.core.resources.IFile IFile}.
-*/
-public class FileResourceOutputStream extends OutputStream
-{
-
-  IPath                 fFilePath;
-  ResourceContext       fResourceContext; 
-  IProgressMonitor       fMonitor;   
-  StatusHandler         fStatusHandler;
-  ByteArrayOutputStream fByteArrayOutputStream;
-  boolean               fOpen;
-
-  /**
-  * Constructs an output stream that can be used to write to the
-  * given <code>file</code>. The workspace is neither examined nor
-  * altered during construction. All resource creation is deferred
-  * until later in the stream's lifecycle, such as during writing
-  * or closure.
-  * <b>Note:</b> The preferred mechanism for creating a stream that
-  * writes to an IFile is to call the static factory method
-  * {@link FileResourceUtils#newFileOutputStream FileResourceUtils.newFileOutputStream()}
-  * and work with the resulting <code>OutputStream</code>.
-  * Direct construction of a FileResourceOutputStream is not recommended.
-  * @param file The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file resource to create. The project implied by the
-  * pathname of the file must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  */
-  public FileResourceOutputStream ( 
-  			ResourceContext resourceContext, 
-  			IPath           filePath, 
-  			IProgressMonitor monitor,
-  			StatusHandler   statusHandler
-  			)
-  {
-    fFilePath = filePath;
-    fResourceContext = resourceContext;
-    fMonitor = monitor;
-    fStatusHandler = statusHandler;
-    fByteArrayOutputStream = new ByteArrayOutputStream();
-    fOpen = true;
-  }
-
-  /**
-  * Closes the stream.
-  * @throws IOException If an error occurs while closing the stream.
-  * For example, if this stream was constructed with overwriteFile = false
-  * and a file of the same name already exists, then an IOException will
-  * be thrown either now or during an earlier {@link #write write}.
-  */
-  public void close ()
-  throws IOException
-  {
-    if (!fOpen) return;
-    fOpen = false;
-    fByteArrayOutputStream.close();
-    byte[] buffer = fByteArrayOutputStream.toByteArray();
-    ByteArrayInputStream tempInputStream = new ByteArrayInputStream(buffer);
-    try
-    {
-      FileResourceUtils.createFile(fResourceContext, fFilePath, tempInputStream, fMonitor, fStatusHandler);
-    }
-    catch (CoreException e)
-    {
-      throw new IOException(e.getMessage());
-    }
-  }
-
-  /**
-  * Flushes the stream. This does not imply the File resource
-  * will be created or become visible within the workbench.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void flush ()
-  throws IOException
-  {
-    fByteArrayOutputStream.flush();
-  }
-
-  /**
-  * Writes all bytes from the given array to the stream.
-  * @param b The array of bytes to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( byte[] b )
-  throws IOException
-  {
-    fByteArrayOutputStream.write(b);
-  }
-
-  /**
-  * Writes bytes from the given array beginning at some offset
-  * and continuing for some number of bytes (len) to the stream.
-  * @param b The array of bytes to write.
-  * @param off The offset into the array to begin writing.
-  * @param len The number of bytes to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( byte[] b, int off, int len )
-  {
-    fByteArrayOutputStream.write(b,off,len);
-  }
-
-  /**
-  * Writes a single byte to the stream.
-  * @param b The byte to write.
-  * @throws IOException If an error occurs. For example, if this
-  * stream was constructed with overwriteFile = false and a file of the
-  * same name already exists, then an IOException may be thrown at
-  * this point.
-  */
-  public void write ( int b )
-  {
-    fByteArrayOutputStream.write(b);
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
deleted file mode 100644
index eeae29ec7..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/FileResourceUtils.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Choice;
-import org.eclipse.wst.common.environment.StatusException;
-import org.eclipse.wst.common.environment.StatusHandler;
-
-
-
-/**
-* This class contains useful methods for working with Eclipse resources.
-*/
-public final class FileResourceUtils
-{
-  //
-  // Keeps the IWorkspace hanging around. See getWorkspace().
-  //
-  private static IWorkspace workspace_ = null;
-  //
-  // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
-  //
-  private static IWorkspaceRoot root_ = null;
-  
-  private static MessageUtils msg_ = new MessageUtils( "org.eclipse.wst.command.internal.env.common.environment", new FileResourceUtils() );
-
-
- /**
-  * Returns the IWorkspaceRoot object.
-  * @return The IWorkspaceRoot object.
-  */
-  public static IWorkspaceRoot getWorkspaceRoot ()
-  {
-    if (root_ == null)
-    {
-      root_ = ResourcesPlugin.getWorkspace().getRoot();
-    }
-    return root_;
-  }
-
- /**
-  * Returns the IWorkspace object.
-  * @return The IWorkspace object.
-  */
-  public static IWorkspace getWorkspace ()
-  {
-    if (workspace_ == null)
-    {
-      if (root_ == null)
-      {
-        root_ = ResourcesPlugin.getWorkspace().getRoot();
-      }
-      
-      workspace_ = root_.getWorkspace();
-    }
-    
-    return workspace_;
-  }
-  
-  /**
-   * 
-   * @return returns an array of three common choices. (ie. Yes, yes all, and cancel )
-   */
-  public static Choice[] getThreeStateFileOptions() 
-  {
-    Vector choices = new Vector();
-    
-    choices.add(new Choice( 'Y', msg_.getMessage("LABEL_YES")));
-    choices.add(new Choice( 'A', msg_.getMessage("LABEL_YES_TO_ALL")));
-    choices.add(new Choice( 'C', msg_.getMessage("LABEL_CANCEL")));
-    
-    return (Choice[])choices.toArray(new Choice[choices.size()]);
-  }
-  
-  /**
-  * Returns an
-  * {@link org.eclipse.core.resources.IResource IResource}
-  * of the given absolute pathname or null if no such resource exists.
-  * @param absolutePathname The absolute path of the resource.
-  * @return The <code>IResource</code>.
-  */
-  public static IResource findResource ( String absolutePathname )
-  {
-    if (absolutePathname == null)
-    {
-      return null;
-    }
-    
-    return findResource(new Path(absolutePathname));
-  }
-
-  /**
-  * Returns an
-  * {@link org.eclipse.core.resources.IResource IResource}
-  * of the given absolute path or null if no such resource exists.
-  * @param absolutePath The absolute <code>IPath</code> of the resource.
-  * @return The <code>IResource</code>.
-  */
-  public static IResource findResource ( IPath absolutePath )
-  {
-    if (absolutePath == null)
-    {
-      return null;
-    }
-    
-    return FileResourceUtils.getWorkspaceRoot().findMember(absolutePath);
-  }
-  
-  /**
-   * Copies a file from a plugin's installation location
-   * to an Eclipse folder.
-   * @param plugin The plugin containing the files to copy.
-   * Must not be null.
-   * @param sourcePath The path, relative to the <code>plugin</code>
-   * install location, containing the files to copy.
-   * If null, then the plugin install location is the source path
-   * (ie. null is equivalent to ".").
-   * @param pathname The pathname of the file to copy.
-   * The pathname is relative to the <code>plugin sourcePath</code>.
-   * Must not be null.
-   * @param targetPath The absolute Eclipse path of the folder to
-   * which the file will be copied. The relative pathname of the
-   * file is preserved.
-   * Must not be null.
-   * @param createFolders The intermediate folder creation policy, one of
-   * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
-   * <ul>
-   * <li><code>CREATE</code> -
-   * If any intermediate folders in the given <code>absolutePath</code>
-   * do not exist, they will be created.
-   * <li><code>DONT_CREATE</code> -
-   * If any intermediate folders in the given <code>absolutePath</code>
-   * do not exist, the method will throw a <code>CoreException</code>.
-   * </ul>
-   * @param overwriteFile The policy for existing files, one of
-   * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
-   * <ul>
-   * <li><code>OVERWRITE</code> -
-   * If a resource of the same name as the given
-   * <code>absolutePath</code> already exists and is a file,
-   * it will be replaced.
-   * If the resource already exists and it is not a file,
-   * then no file will be created and
-   * a <code>CoreException</code> will be thrown.
-   * <li><code>DONT_OVERWRITE</code> -
-   * If any resource of the same name as the given
-   * <code>absolutePath</code> already exists,
-   * then no file will be created and
-   * a <code>CoreException</code> will be thrown.
-   * </ul>
-   * @param progressMonitor The progress monitor for the operation, or null.
-   * @throws CoreException An exception containing an
-   * {@link org.eclipse.core.runtime.IStatus IStatus}
-   * with a severity of <code>IStatus.ERROR</code> and a
-   * locale-specific description of the cause.
-   */
-   static public void copyFile( ResourceContext resourceContext,
-                                Plugin plugin,
-                                IPath sourcePath,
-                                IPath pathname,
-                                IPath targetPath,
-                                IProgressMonitor progressMonitor,
-                                StatusHandler statusMonitor )
-     throws CoreException
-   {
-     try
-     {
-       IPath target = targetPath.append(pathname);
-       IPath source = sourcePath == null ? pathname : sourcePath.append(pathname);
-       InputStream input = plugin.openStream(source);
-       createFile(resourceContext, target, input, progressMonitor, statusMonitor);
-     }
-     catch (IOException e)
-     {
-       throw new CoreException(new Status(IStatus.ERROR,
-                               plugin.getBundle().getSymbolicName(),
-                               0,
-                               msg_.getMessage("MSG_ERROR_IO"),e));
-     }
-   }
-   
-  /**
-   * Deletes a file under a container.
-   * The container must already exist.
-   * @param file - the IFile to be deleted
-   * @param progressMonitor
-   * @param statusMonitor
-   * @return True if the file does not exist or if it exists and is successfully deleted. False otherwise.
-   */
-  public static boolean deleteFile( ResourceContext resourceContext, 
-                                    IFile file,
-                                    IProgressMonitor progressMonitor, 
-                                    StatusHandler statusMonitor)
-    throws CoreException
-  {
-    if (file.exists())
-    {
-      if (!resourceContext.isOverwriteFilesEnabled())
-      {
-        IStatus status 
-          = StatusUtils.warningStatus( msg_.getMessage( "MSG_ERROR_FILE_OVERWRITE_DISABLED",
-                                                        new Object[]{ file.getParent().getFullPath().toString(),
-                                                                      file.getName()}) );
-                            
-        
-        Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-        
-        if( choice.getShortcut() == 'C' ) return false;
-        
-        if( choice.getShortcut() == 'A' ) resourceContext.setOverwriteFilesEnabled(true);
-      }
-      
-      //We have permission to overwrite so check if file is read-only
-      if (file.isReadOnly())
-      {
-        if (!resourceContext.isCheckoutFilesEnabled())
-        {
-          IStatus status 
-            = StatusUtils.warningStatus( msg_.getMessage( "MSG_ERROR_FILE_CHECKOUT_DISABLED",
-                                                          new Object[]{ file.getParent().getFullPath().toString(),
-                                                                        file.getName()}) );
-          
-          Choice choice = statusMonitor.report( status, getThreeStateFileOptions() );
-          
-          if( choice.getShortcut() == 'C' ) return false;
-          
-          if( choice.getShortcut() == 'A' ) resourceContext.setCheckoutFilesEnabled(true);          
-        }
-        
-        IFile[] files = new IFile[1];
-        files[0] = file;
-        IStatus status = getWorkspace().validateEdit(files, null);
-        
-        if( status.getSeverity() == IStatus.ERROR )
-        {
-          statusMonitor.reportError( status );
-          return false;
-        }
-      }
-      
-      file.delete(true, null);
-    }
-    //At this point, either the file did not exist or we successfully deleted
-    // it. Return success.
-    return true;
-  }
-
-  /**
-   * Deletes a folder under a container.
-   * @param folder - the IFolder to be deleted
-   * @param progressMonitor
-   * @param statusMonitor
-   * @return True if the folder does not exist or if it exists and is successfully deleted along with its members. False otherwise.
-   */
-   public static boolean deleteFolder( ResourceContext resourceContext,
-                                       IFolder folder,
-                                       IProgressMonitor progressMonitor,
-                                       StatusHandler statusMonitor )
-     throws CoreException
-   {
-     if (!folder.exists()) return true;
-
-     boolean     deleted   = true;
-     IResource[] resources = folder.members();
-     
-     for (int i=0; i<resources.length; i++)
-     {
-       IResource resource = resources[i];
-       if (resource instanceof IFile)
-       {
-         deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor, statusMonitor);
-       }
-       if (resource instanceof IFolder)
-       {
-         deleted = deleteFolder( resourceContext, (IFolder)resource, progressMonitor, statusMonitor);
-       }
-
-       if( !deleted ) break;
-     }
-     
-     if( deleted )
-     {
-       folder.delete(true, true, null);
-       return true;
-     }
-     else
-       return false;
-   }
-
-  /**
-  * Creates a file of the given <code>absolutePath</code>
-  * and returns its handle as an <code>IFile</code>.
-  * If the file cannot be created, a
-  * <code>CoreException</code> containing an
-  * <code>IStatus</code> object is thrown.
-  * @param absolutePath The absolute path of the file to create.
-  * The project at the beginning of the path must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  */
-  public static IFile createFile (
-    ResourceContext resourceContext,
-    IPath           absolutePath,
-    InputStream     inputStream,
-    IProgressMonitor progressMonitor,
-    StatusHandler   statusHandler )
-
-    throws CoreException 
-  {    
-    if (!absolutePath.isAbsolute())
-    {
-      throw new CoreException(new Status(IStatus.ERROR, "ResourceUtils",0,msg_.getMessage("MSG_ERROR_PATH_NOT_ABSOLUTE",new Object[] {absolutePath.toString()}),null));
-    }
-    if (absolutePath.segmentCount() < 1)
-    {
-      throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,msg_.getMessage("MSG_ERROR_PATH_EMPTY",new Object[] {absolutePath.toString()}),null));
-    }
-    if (absolutePath.segmentCount() < 2)
-    {
-      throw new CoreException(new Status(IStatus.ERROR,"ResourceUtils",0,msg_.getMessage("MSG_ERROR_PATH_NOT_FOLDER",new Object[] {absolutePath.toString()}),null));
-    }
-    IContainer parent   = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler);
-    String     fileName = absolutePath.lastSegment();
-    
-    return makeFile(resourceContext, parent, fileName, inputStream, progressMonitor, statusHandler);
-  }
-
-  /**
-  * Creates under the given <code>project</code>
-  * a file of the given <code>relativePath</code>
-  * and returns its handle as an <code>IFile</code>.
-  * If the file cannot be created, a
-  * <code>CoreException</code> containing an
-  * <code>IStatus</code> object is thrown.
-  * @param absolutePath The absolute path of the file to create.
-  * The project at the beginning of the path must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param createFolders The intermediate folder creation policy, one of
-  * {@link #CREATE CREATE} or {@link #DONT_CREATE DONT_CREATE}.
-  * <ul>
-  * <li><code>CREATE</code> -
-  * If any intermediate folders in the given <code>absolutePath</code>
-  * do not exist, they will be created.
-  * <li><code>DONT_CREATE</code> -
-  * If any intermediate folders in the given <code>absolutePath</code>
-  * do not exist, the method will throw a <code>CoreException</code>.
-  * </ul>
-  * @param overwriteFile The policy for existing files, one of
-  * {@link #OVERWRITE OVERWRITE} or {@link #DONT_OVERWRITE DONT_OVERWRITE}.
-  * <ul>
-  * <li><code>OVERWRITE</code> -
-  * If a resource of the same name as the given
-  * <code>absolutePath</code> already exists and is a file,
-  * it will be replaced.
-  * If the resource already exists and it is not a file,
-  * then no file will be created and
-  * a <code>CoreException</code> will be thrown.
-  * <li><code>DONT_OVERWRITE</code> -
-  * If any resource of the same name as the given
-  * <code>absolutePath</code> already exists,
-  * then no file will be created and
-  * a <code>CoreException</code> will be thrown.
-  * </ul>
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  */
-  public static IFile createFile (
-    ResourceContext resourceContext,
-    IProject        project,
-    IPath           relativePath,
-    InputStream     inputStream,
-    IProgressMonitor progressMonitor,
-    StatusHandler   statusMonitor )
- 
-    throws CoreException 
-  {
-    IPath absolutePath = project.getFullPath().append(relativePath);
-    return createFile(resourceContext, absolutePath, inputStream, progressMonitor, statusMonitor);
-  }
-
-  /**
-  * Creates an output stream that can be used to write to the
-  * given <code>file</code>. Actual changes to the workspace
-  * may occur during creation of the stream, while writing to
-  * the stream, or when the stream is closed.
-  * A <code>CoreException</code> containing
-  * an <code>IStatus</code> will be thrown
-  * at some point in the lifecycle of the stream
-  * if the file resource cannot be created.
-  * @param file The {@link org.eclipse.core.resources.IFile IFile}
-  * handle of the file resource to create. The project implied by the
-  * pathname of the file must already exist,
-  * that is, this method cannot be used to create projects.
-  * @param progressMonitor The progress monitor for the operation, or null.
-  * @return An <code>OutputStream</code> tied to the file resource.
-  * Actual checks of or changes to the workspace may occur as early during
-  * stream creation, closure, or any time in between.
-  * @throws CoreException An exception containing an
-  * {@link org.eclipse.core.runtime.IStatus IStatus}
-  * with a severity of <code>IStatus.ERROR</code> and a
-  * locale-specific description of the cause.
-  * Reasons include:
-  * <ol>
-  * <li>The project of the given file's path does not exist.
-  * <li>A non-file resource of the same name of the given file
-  * already exists.
-  * <li>A file resource of the same name of the given file
-  * already exists, and <code>overwriteFile</code> is false.
-  * <li>One or more intermediate folders to the given file
-  * do not exist, and <code>createFolders</code> is false.
-  * </ol>
-  */
-
-  public static OutputStream newFileOutputStream (
-       ResourceContext  context,
-       IPath            file,
-       IProgressMonitor progressMonitor,
-       StatusHandler    statusHandler )
- 
-  {
-    return new FileResourceOutputStream(context, file, progressMonitor, statusHandler);
-  }
-
-  //----------------------------------------------------------------------
-  // Naughty bits...
-  //----------------------------------------------------------------------
-
-  //
-  // Creates a path of folders.
-  // Do not call with an absolutePath of less than one segment.
-  //
-  /**
-   * Creates a path of folders.
-   * Do not call with an absolutePath of less than one segment.
-   * @param resourceContext the resource context for making folders.
-   * @param absolutePath the path of folders that will be created.
-   * @param progressMonitor the progress monitor to be used.
-   * @param statusHandler the status handler.
-   * @return returns the IContainer of the created folder.
-   */
-  public static IContainer makeFolderPath (
-    ResourceContext  resourceContext,
-    IPath            absolutePath,
-    IProgressMonitor progressMonitor,
-    StatusHandler    statusHandler )
-  
-    throws CoreException
-  {
-    if (absolutePath.segmentCount() <= 1)
-    {
-      return getWorkspaceRoot().getProject(absolutePath.segment(0));
-    }
-    else
-    {
-      IContainer parent = makeFolderPath(resourceContext, absolutePath.removeLastSegments(1), progressMonitor, statusHandler );
-      String folderName = absolutePath.lastSegment();
-      
-      return makeFolder(resourceContext, parent,folderName, progressMonitor , statusHandler );
-    }
-  }
-  //
-  // Creates a folder under a container.
-  // The container must already exist.
-  //
- private static IFolder makeFolder (
-    ResourceContext  resourceContext,
-    IContainer       parent,
-    String           folderName,
-    IProgressMonitor progressMonitor,
-    StatusHandler    statusHandler )
-  
-  throws CoreException
-  {
-    IResource child  = parent.findMember(folderName);
-    Choice    result = null;
-    
-    if( child == null )
-    {
-      if (!resourceContext.isCreateFoldersEnabled())  
-      {
-        result = statusHandler.report(
-                StatusUtils.warningStatus(
-        	                      msg_.getMessage("MSG_ERROR_FOLDER_CREATION_DISABLED",
-        	                      new Object[]{ parent.getFullPath().toString(), folderName} ) ), 
-                getThreeStateFileOptions() );
-        
-        if( result == null || result.getShortcut() == 'C' )
-        {
-          return null;
-        }
-        else if( result.getShortcut() == 'A' )
-        {
-          resourceContext.setCreateFoldersEnabled(true);
-        }
-      }
-      
-      IFolder folder = parent.getFolder(new Path(folderName));
-      folder.create(true,true,null);
-      return folder;
-    }
-    else if( child.getType() == IResource.FOLDER )
-    {
-      return (IFolder)child;
-    }
-    else
-    {
-      throw new CoreException(
-        new Status( IStatus.ERROR, 
-                    "ResourceUtils",
-                    0, 
-					msg_.getMessage( "MSG_ERROR_RESOURCE_NOT_FOLDER",
-					                 new Object[]{ parent.getFullPath().append(folderName).toString() }),
-			null ) );
-    }
-  }
-
-  //
-  // Creates a file under a container.
-  // The container must already exist.
-  //
- private static IFile makeFile (
-    ResourceContext  resourceContext,
-    IContainer       parent,
-    String           fileName,
-    InputStream      inputStream,
-    IProgressMonitor progressMonitor,
-    StatusHandler    statusHandler )
- 
-    throws CoreException
-  {
-    IResource child  = parent.findMember(fileName);
-    Choice    result = null;
-    
-    if( child != null )
-    {
-      if( child.getType() == IResource.FILE )
-      {
-        if( !resourceContext.isOverwriteFilesEnabled() )   
-        {
-          result = statusHandler.report( 
-                StatusUtils.warningStatus( msg_.getMessage( "MSG_ERROR_FILE_OVERWRITE_DISABLED",
-                                           new Object[] {parent.getFullPath().toString(),fileName}) ),					  		    
-                getThreeStateFileOptions() );
-          
-          if( result == null || result.getShortcut() == 'C' )
-          {
-            return null;
-          }
-          else if( result.getShortcut() == 'A' )
-          {
-            resourceContext.setOverwriteFilesEnabled(true);
-          }
-        }	
-        
-        //We have permission to overwrite so check if file is read-only
-        if( child.getResourceAttributes().isReadOnly() )
-        {
-          if( !resourceContext.isCheckoutFilesEnabled() ) 
-          {            
-            result = statusHandler.report( 
-                         StatusUtils.errorStatus( msg_.getMessage( "MSG_ERROR_FILE_CHECKOUT_DISABLED",
-                                                  new Object[]{ parent.getFullPath().toString(),fileName} ) ), 
-                         getThreeStateFileOptions() );
-            
-		    if( result == null || result.getShortcut() == 'C' )
-		    {
-              return null;
-		    }
-            else if( result.getShortcut() == 'A' )
-            {
-              resourceContext.setCheckoutFilesEnabled(true);
-            }
-          }
-
-          IFile[] files = new IFile[1];
-          files[0] = (IFile)child;
-          
-          IStatus status = getWorkspace().validateEdit(files,null);
-          
-          try
-          {
-            statusHandler.report( status );
-          }
-          catch( StatusException exc )
-          {
-            return null;
-          }
-        }
-
-        //Change the contents of the existing file.
-        IFile file = parent.getFile( new Path(fileName) );
-        file.setContents( inputStream, true, true, null );
-        
-        return file;
-      
-      }
-      else
-      {
-        throw new CoreException( 
-          new Status( IStatus.ERROR,
-                      "ResourceUtils",
-                      0, 
-				      msg_.getMessage( "MSG_ERROR_RESOURCE_NOT_FILE",
-				                       new Object[] {parent.getFullPath().append(fileName)}),
-					  null ) );
-      }
-    }
-    else
-    {
-      //Create a new file.
-      IFile file = parent.getFile( new Path(fileName) );
-      file.create( inputStream, true, null);
-      
-      return file;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
deleted file mode 100644
index 601e15a2b..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/StringUtils.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.common;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.util.Enumeration;
-import java.util.Vector;
-
-/**
-  * This class contains some useful string utilities that are not provided by
-  * either String or StringBuffer.
-  *
-  * @author Peter Moogk
-  * @date   July 13, 2000
-**/
-public final class StringUtils
-{
-  /**
-  * The platform-specific line separator.
-  */
-  public static final String NEWLINE = System.getProperty("line.separator");
-
-  private StringUtils(){};
-
-  /**
-    * This method splits a single line of text into multiple lines
-    * based on a maximum line length.  The method will try to fit as
-    * many words as possible onto a line without exceeding the maximum
-    * line length.  Note: the only case where a line might exceed the
-    * maximum is if a single word is longer than the maximum.
-    * @param text a single line a text that is to be split.
-    * @param max_length the maximum length of each split line.
-    * @return a string array of the split lines.
-  **/
-  public static String[] splitter( String text, int max_length )
-  {
-    Vector          return_text = new Vector(20);
-    String[]        return_str;
-    int             index = 0;
-
-    while( index < text.length() )
-    {
-      String str = text.substring( index, Math.min( max_length + index,
-                                                    text.length() ) );
-      int space_index = str.lastIndexOf( " " );
-
-      if( index + str.length() < text.length() &&
-          text.charAt( index + str.length() - 1 ) != ' ' &&
-          text.charAt( index + str.length() ) != ' ' &&
-          space_index != -1 )
-      {
-        return_text.addElement( str.substring( 0, space_index ) );
-        index += space_index + 1;
-      }
-      else
-      {
-        return_text.addElement( str.trim() );
-        index += str.length();
-      }
-    }
-
-    return_str = new String[return_text.size()];
-
-    for( index = 0; index < return_text.size(); index++ )
-    {
-      return_str[index] = (String)(return_text.elementAt(index));
-    }
-
-    return return_str;
-  }
-
-  /**
-    * This method returns a string with a repeated number of characters.
-    * @param the_char the character to be repeated.
-    * @param count the number of time this character should be repeated.
-    * @return the resulting string of repeated characters.
-  **/
-  static public String repeat( char the_char, int count )
-  {
-    StringBuffer buf = new StringBuffer( count );
-
-    for( int index = 0; index < count; index++ )
-    {
-      buf.append( the_char );
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method flattens an array of arguments to a string.
-    * The method respects embedded whitespace and quotes.
-    * <ul>
-    * <li>Any argument with embedded whitespace will be flattened out
-    * with enclosing quotes. For example, the single argument
-    * <u>Hello World</u>
-    * will be returned as
-    * <u>"Hello World"</u>.
-    * <li>Any argument with quotes will be flattened out with the
-    * quotes escaped. For example, the single argument
-    * <u>"Happy days"</u>
-    * will be returned as
-    * <u>\"Happy days\"</u>.
-    * </ul>
-    * @param arguments The array of strings to flatten.
-    * @return the flattened string.
-  */
-  static public String flattenArguments ( String[] arguments )
-  {
-    StringBuffer buf = new StringBuffer();
-
-    for (int i=0; i<arguments.length; i++)
-    {
-      //
-      // Append a separator (except the first time).
-      //
-      if (i > 0) buf.append(' ');
-
-      //
-      // Look for whitespace.
-      //
-      boolean whitespace = false;
-      char[] chars = arguments[i].toCharArray();
-      for (int j=0; !whitespace && j<chars.length; j++)
-      {
-        if (Character.isWhitespace(chars[j]))
-        {
-          whitespace = true;
-        }
-      }
-
-      //
-      // Append the argument, quoted as necessary.
-      //
-      if (whitespace) buf.append('"');
-      for (int j=0; j<chars.length; j++)
-      {
-        if (chars[j] == '"') buf.append('\\');
-        buf.append(chars[j]);
-      }
-      if (whitespace) buf.append('"');
-    }
-
-    return buf.toString();
-  }
-
-  /**
-    * This method parses whitespace-delimitted filenames from
-    * the given <code>input</code> stream. <b>Limitation:</b>
-    * Quoted filenames or filenames with embedded whitespace
-    * are not currently supported.
-    * @param input The input stream.
-    * @return An enumeration of filenames from the stream.
-  */
-  static public Enumeration parseFilenamesFromStream ( InputStream input )
-  throws IOException
-  {
-    Vector filenames = new Vector(64,64);
-    StringBuffer buffer = null;
-    byte state = STATE_WS;
-    int ic = input.read();
-    while (ic >= 0)
-    {
-      char c = (char)ic;
-      switch (state)
-      {
-        case STATE_WS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer = new StringBuffer();
-            buffer.append(c);
-            state = STATE_NWS;
-          }
-          break;
-        case STATE_NWS:
-          if (!Character.isWhitespace(c))
-          {
-            buffer.append(c);
-          }
-          else
-          {
-            String filename = buffer.toString();
-            filenames.add(filename);
-            buffer = null;
-            state = STATE_WS;
-          }
-          break;
-        default:
-          break;
-      }
-      ic = input.read();
-    }
-    return filenames.elements();
-  }
-
-  private static final byte STATE_WS = 0;
-  private static final byte STATE_NWS = 1;
-
-
-  /**
-  * Returns true is the type passed in is a primtive java type
-  * @param class name String
-  * @return true is primitive type
-  */
-  public static boolean isPrimitiveType(String typeName) 
-  {
-
-    if (typeName.equalsIgnoreCase("boolean") ||
-      typeName.equalsIgnoreCase("byte") ||
-      typeName.equalsIgnoreCase("double") ||
-      typeName.equalsIgnoreCase("float") ||
-      typeName.equalsIgnoreCase("int") ||
-      typeName.equalsIgnoreCase("long") ||
-      typeName.equalsIgnoreCase("short") ||
-      typeName.equalsIgnoreCase("char"))
-      return true;
-    return false;
-
-  }
-
-  /**
-  * The method replace the characters that are allowed in URIs
-  * and not allowed in Java class names to an underscore ('_')
-  * @param URI String
-  * @return valid Java class name String
-  */
-  public static String URI2ClassName( String uri ) {
-    String className = uri;
-    for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
-    	className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
-    }
-    return className;
-  }
-
-  /**
-   * Creates and array of strings containing the exception traceback information of
-   * a Throwable.  This is the same traceback data that is displayed by exc.printStackTrace().
-   * @param exc the exception
-   * @return a string array of the traceback information.
-   */
-  public static String[] getStackTrace( Throwable exc )
-  {
-    Vector       lines        = new Vector();
-    StringWriter stringWriter = new StringWriter();
-    PrintWriter  printWriter  = new PrintWriter( stringWriter );
-    
-    exc.printStackTrace( printWriter );
-    
-    try
-    {
-      printWriter.close();
-      stringWriter.close();
-    }
-    catch( Exception nestedExc )
-    {
-      return new String[0];
-    }
-    
-    StringReader stringReader = new StringReader( stringWriter.toString() );
-    BufferedReader reader     = new BufferedReader( stringReader );
-    String         line       = null;
-    
-    try
-    {
-      line = reader.readLine();
-    
-      while( line != null )
-      {
-        lines.add( line.trim() );
-        line = reader.readLine();
-      }
-    }
-    catch( Exception nestedExc )
-    {
-      return new String[0];
-    }
-    
-    return (String[])lines.toArray( new String[0] );
-  }
-  
-  private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
-  private static final char UNDERSCORE = '_';
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
deleted file mode 100644
index 2eb42d1b3..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/WaitForAutoBuildCommand.java
+++ /dev/null
@@ -1,40 +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.wst.command.internal.env.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-
-public class WaitForAutoBuildCommand extends AbstractDataModelOperation
-{
-  public IStatus execute( IProgressMonitor montitor, IAdaptable adaptable ) 
-  {
-  	IStatus status = Status.OK_STATUS;
-  	
-	try 
-	{
-	  Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null);
-	} 
-	catch( InterruptedException exc ) 
-	{
-	  // UISynchronizer.syncExec seems to interrupt the UI tread when the autobuilder is done.  Not sure, why.
-	  // I'm assuming here that the autobuilder has actually completed its stuff.	
-	}
-		
-	return status;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/environment.properties b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/environment.properties
deleted file mode 100644
index 6c160b00d..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/common/environment.properties
+++ /dev/null
@@ -1,42 +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 for EclipseScheme
-#
-MSG_INVALID_PLATFORM_URL=Invalid URL: {0} for an Eclipse platform.
-
-#
-# Messages for ResouceUtils
-#
-MSG_ERROR_PATH_NOT_ABSOLUTE=IWAB0003E Path {0} is not absolute for creating a file.
-MSG_ERROR_PATH_EMPTY=IWAB0004E Path {0} is empty while creating a file.
-MSG_ERROR_PATH_NOT_FOLDER=IWAB0005E Path {0} is not a folder for creating a file.
-MSG_ERROR_FOLDER_CREATION_DISABLED=IWAB0007E Folder creation has been disabled for parent folder {0} and child {1}.
-MSG_ERROR_RESOURCE_NOT_FOLDER=IWAB0008E Resource {0} is not a folder.
-MSG_WARN_FILE_OVERWRITE_DISABLED=IWAB0009W Can not overwrite file {1} in folder {0}.
-MSG_ERROR_FILE_CHECKOUT_DISABLED=IWAB0010E Can not checkout file {1} in folder {0}.
-MSG_ERROR_RESOURCE_NOT_FILE=IWAB0011E The following path is not a resource: {0}.
-MSG_ERROR_FOLDER_HAS_CHILDREN=IWAB0012E Can not create folder: {0} that already has children.
-MSG_ERROR_IO=IWAB0006E An input/output error occurred while processing the resource "{0}".
-MSG_ERROR_FILE_OVERWRITE_DISABLED=IWAB0164E Cannot create the file "{1}" relative to the path "{0}" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_FILE_CHECKOUT_DISABLED=IWAB0061E Cannot create the file "{1}" relative to the path "{0}" because automatic file check out has not been enabled. Do you want to enable it for this file?
-
-LABEL_YES=Yes
-LABEL_YES_TO_ALL=Yes All
-LABEL_CANCEL=Cancel
-
-TITLE_WARNING=Warning:
-TITLE_ERROR=Error:
-TITLE_INFO=Info:
-
-
-
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index 9ada4f3b9..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.command.internal.env.context;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class ActionDialogPreferenceTypeRegistry
-{
-  private Vector preferences_;
-  
-  private static ActionDialogPreferenceTypeRegistry registry_;
-
-  private ActionDialogPreferenceTypeRegistry()
-  {
-    preferences_ = new Vector();
-    
-    loadDialogsPreferences();  
-  }
-  
-  static public ActionDialogPreferenceTypeRegistry getInstance()
-  {
-    if( registry_ == null )
-    {
-      registry_ = new ActionDialogPreferenceTypeRegistry();
-    }
-    
-    return registry_;
-  }
-  
-  //
-  private void loadDialogsPreferences ()
-  {
-  	IExtensionRegistry reg = Platform.getExtensionRegistry();
-    IConfigurationElement[] config = reg.getConfigurationElementsFor( "org.eclipse.wst.command.env",
-                                                                      "actionDialogPreferenceType");
-    
-    for(int idx=0; idx<config.length; idx++) 
-    {
-      IConfigurationElement      elem   = config[idx];     
-      ActionDialogPreferenceType dialog = new ActionDialogPreferenceType();
-      
-      dialog.setId( elem.getAttribute("id") );
-      dialog.setName( elem.getAttribute("name") );
-      dialog.setInfopop( elem.getAttribute("infopop") );
-      dialog.setTooltip( elem.getAttribute("tooltip") );
-      dialog.setCategory( elem.getAttribute("category") );
-      
-      String showCheckbox = elem.getAttribute( "showcheckbox" );
-      String alwaysHide   = elem.getAttribute( "alwayshide" );
-      
-      dialog.setShowCheckbox( showCheckbox == null ? true : showCheckbox.equals( "true" ) );
-      dialog.setAlwaysHide( alwaysHide == null ? false : alwaysHide.equals( "true" ) );
-      
-      preferences_.add(dialog);        
-    }
-  }
-
-  /**
-  * Returns all registered <code>WebServiceType</code> objects.
-  * @return All registered <code>WebServiceType</code> objects.
-  */
-  public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
-  {
-    return (ActionDialogPreferenceType[])preferences_.toArray( new ActionDialogPreferenceType[0]);
-  }
-  
-  public ActionDialogPreferenceType getActionDialogsPrefrence( String id )
-  {
-    int                        length = preferences_.size();
-    ActionDialogPreferenceType result = null;
-    
-    for( int index = 0; index < length; index++ )
-    {
-      ActionDialogPreferenceType preference = (ActionDialogPreferenceType)preferences_.elementAt( index );
-      
-      if( preference.getId().equals( id ) )
-      {
-        result = preference;
-        break;
-      }
-    }
-    
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
deleted file mode 100644
index 91e266e9d..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
-  private ActionDialogPreferenceTypeRegistry registry;
-  
-  private static PersistentActionDialogsContext instance_ = null;
-
-  private PersistentActionDialogsContext()
-  {
-    super(EnvPlugin.getInstance());
-  }
-  
-  static public PersistentActionDialogsContext getInstance()
-  {
-    if( instance_ == null )
-    {
-      instance_ = new PersistentActionDialogsContext();
-      instance_.load();
-    }
-    
-    return instance_;
-  }
-
-  public void load()
-  {
-    registry = ActionDialogPreferenceTypeRegistry.getInstance();
-    ActionDialogPreferenceType[] dialogs = registry.getActionDialogsPrefrences();
-  
-    for (int i = 0; i < dialogs.length; i++)
-    {
-      setDefault(dialogs[i].getId(), false);
-    }
-  }
-
-  public ActionDialogPreferenceType[] getDialogs()
-  {
-    return registry.getActionDialogsPrefrences();
-  }
-
-  public void setActionDialogEnabled(String id, boolean value)
-  {
-    setValue(id, value);
-  }
-
-  public boolean isActionDialogEnabled(String id)
-  {
-    if (id == null) return true;
-    return getValueAsBoolean(id);
-  }
-  
-  public boolean showDialog( String id )
-  {
-    ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );    
-   
-    return (dialog.getShowCheckbox() && !dialog.getAlwaysHide() && !isActionDialogEnabled( id )) ||
-            !dialog.getShowCheckbox() && !dialog.getAlwaysHide();
-  }
-  
-  public boolean showCheckbox( String id )
-  {
-    ActionDialogPreferenceType dialog = registry.getActionDialogsPrefrence( id );    
-    
-    return dialog == null ? false : dialog.getShowCheckbox();
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
deleted file mode 100644
index e2f2d3bf0..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentContext.java
+++ /dev/null
@@ -1,192 +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.wst.command.internal.env.context;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.command.internal.provisional.env.core.context.Context;
-
-/**
- * This class is used as the base class for types that what to persist preference
- * data in the plugin preferences area.
- *
- *
- */
-public abstract class PersistentContext implements Context
-{
- protected Preferences preferences_;
- protected Plugin plugin_;
-
- public PersistentContext ( Plugin plugin)
- 	{
- 		plugin_ = plugin;
- 	  	preferences_ = plugin.getPluginPreferences();
- 	}
-
- /**
-  * Sets the default for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, boolean value) {
- 	preferences_.setDefault(name, value);
- 	}
- 
- /**
-  * Sets the default for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, String value) {
- 	preferences_.setDefault(name,value);
- 	}
- 
- /**
-  * Sets the default for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setDefault (String name, int value) {
- 	preferences_.setDefault(name,value);
- 	}
- 
- /**
-  * Sets the value for a string preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, String value) {
- 	preferences_.setValue(name,value);
- 	plugin_.savePluginPreferences();
- 	}
- 
- /**
-  * Sets the value for a boolean preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, boolean value) {
- 	preferences_.setValue(name, value);
- 	plugin_.savePluginPreferences();
- 	}
- 
- /**
-  * Sets the value for a int preference.
-  * @param name the preference name.
-  * @param value the preference value.
-  */
- public void setValue (String name, int value) {
- 	preferences_.setValue(name, value);
- 	plugin_.savePluginPreferences();
-	}
-
- /**
-  * Gets the value for a string preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
- public String getValueAsString ( String name) {
- 	return preferences_.getString(name);
- 	}
- 
- /**
-  * Gets the value for a boolean preference.
-  * @param name the preference name.
-  * @return the preference value.
-  */
-  public boolean getValueAsBoolean ( String name) {
- 	return preferences_.getBoolean(name);
- 	}
-  
-  /**
-   * Gets the value for a int preference.
-   * @param name the preference name.
-   * @return the preference value.
-   */
- public int getValueAsInt( String name) {
- 		return preferences_.getInt(name);
- 	}
- 
- /**
-  * Gets the default value for a string preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public String getDefaultString(String name)
- {
- 	return preferences_.getDefaultString(name);
- }
- 
- /**
-  * Gets the default value for a boolean preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public boolean getDefaultBoolean(String name)
- {
- 	return preferences_.getDefaultBoolean(name);
- }
- 
- /**
-  * Gets the default value for a int preference.
-  * @param name the preference name.
-  * @return the default preference value.
-  */
- public int getDefaultInt(String name)
- {
- 	return preferences_.getDefaultInt(name);
- }
- 
- /**
-  * Sets the default value for a string preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultStringIfNoDefault( String key, String value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
- 
- /**
-  * Sets the default value for a boolean preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultBooleanIfNoDefault( String key, boolean value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
- 
- /**
-  * Sets the default value for a int preference if a default value has
-  * not already been set.
-  * @param name the preference name.
-  * @param value the default preference value
-  */
- public void setDefaultIntIfNoDefault( String key, int value )
- {
-   // If the key already has a default value we don't want to override it.
-   if( preferences_.getDefaultString( key ).equals("") ) 
-   {
-     preferences_.setDefault( key, value );
-   }
- }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
deleted file mode 100644
index d30a35dc7..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/context/PersistentResourceContext.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.context;
-
-import org.eclipse.wst.command.internal.env.plugin.EnvPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceDefaults;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-
-
-public class PersistentResourceContext extends PersistentContext implements ResourceContext
-{
-  private static PersistentResourceContext context_ = null;
-  
-  public static PersistentResourceContext getInstance()
-  {
-    if( context_ == null )
-    {
-      context_ = new PersistentResourceContext();
-      context_.load();
-    }
-    
-    return context_;
-  }
-  
-  private PersistentResourceContext()
-  {
-    super(EnvPlugin.getInstance());
-  }
-
-  public void load()
-  {
-    setDefault(PREFERENCE_OVERWRITE, ResourceDefaults
-        .getOverwriteFilesDefault());
-    setDefault(PREFERENCE_CREATE_FOLDERS, ResourceDefaults
-        .getCreateFoldersDefault());
-    setDefault(PREFERENCE_CHECKOUT, ResourceDefaults.getCheckoutFilesDefault());
-  }
-
-  public void setOverwriteFilesEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_OVERWRITE, enable);
-  }
-
-  public boolean isOverwriteFilesEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_OVERWRITE);
-  }
-
-  public void setCreateFoldersEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_CREATE_FOLDERS, enable);
-  }
-
-  public boolean isCreateFoldersEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_CREATE_FOLDERS);
-  }
-
-  public void setCheckoutFilesEnabled(boolean enable)
-  {
-    setValue(PREFERENCE_CHECKOUT, enable);
-  }
-
-  public boolean isCheckoutFilesEnabled()
-  {
-    return getValueAsBoolean(PREFERENCE_CHECKOUT);
-  }
-
-  public ResourceContext copy()
-  {
-    ResourceContext cc = new TransientResourceContext();
-    cc.setOverwriteFilesEnabled(isOverwriteFilesEnabled());
-    cc.setCreateFoldersEnabled(isCreateFoldersEnabled());
-    cc.setCheckoutFilesEnabled(isCheckoutFilesEnabled());
-    return cc;
-  }
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
deleted file mode 100644
index 261e92daa..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/eclipse/BaseEclipseEnvironment.java
+++ /dev/null
@@ -1,27 +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.wst.command.internal.env.eclipse;
-
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.environment.Environment;
-
-
-/**
- * This interface adds resources to the base Environment.
- */
-public interface BaseEclipseEnvironment extends Environment 
-{
-  /**
-   * 
-   * @return returns a ResourceContext object for this environment.
-   */	
-  public ResourceContext getResourceContext();
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java
deleted file mode 100644
index cb8f4abd1..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/plugin/EnvPlugin.java
+++ /dev/null
@@ -1,38 +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.wst.command.internal.env.plugin;
-
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class EnvPlugin extends Plugin {
-
-	//The shared instance.
-	private static EnvPlugin instance;
-
-	/**
-	 * The constructor.
-	 */
-	public EnvPlugin() {
-		super();
-		instance = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static EnvPlugin getInstance() {
-		return instance;
-	}
-}
diff --git a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index d1a551e53..000000000
--- a/bundles/org.eclipse.wst.command.env/src/org/eclipse/wst/command/internal/env/preferences/ActionDialogPreferenceType.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.command.internal.env.preferences;
-
-/**
- * This class is used to define preference ids. It corresponds to information
- * specified by a actionDialogPreferenceType extension point.
- * Each actionDialogPreferenceType entry will result in an entry in the
- * action dialogs preference page if the showcheckbox field is true.
- *   
- * Here is an example of this extension point.
- * 
- * <pre>
-  *   &lt;extension
- *       point="org.eclipse.wst.command.env.actionDialogPreferenceType"&gt;
- *     &lt;actionDialogPreferenceType
- *           showcheckbox="true"
- *           name="%CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG"
- *           category="org.eclipse.jst.wss.popup.category"
- *           tooltip="%TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY"
- *           infopop="org.eclipse.jst.ws.consumption.ui.PPAD0004"
- *           alwayshide="false"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard"&gt;
- *     &lt;/actionDialogPreferenceType&gt;
- * </pre>
- *
- * This actionDialogPreferenceType extension point is associated with an ObjectContribution
- * extension point.  For example: 
- * 
- *      <objectContribution
- *           objectClass="org.eclipse.core.resources.IFile"
- *           nameFilter="*.wsdl"
- *           id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard">
- * <!-- WSDL To Java Bean Proxy -->
- *        <action
- *              label="%ACTION_GENERATE_JAVA_PROXY"
- *              class="org.eclipse.wst.command.env.ui.widgets.popup.DynamicPopupWizard"
- *              menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- *              id="org.eclipse.jst.ws.consumption.ui.wizard.client.clientwizard">
- *        </action>
- *     </objectContribution>
- *
- * The ObjectContribution entry is linked with the actionDialogPreferenceType entry
- * via the id attribute of the ObjectContirbution and the id attribute of actionDialogPreferenceType.
- * Note: the id in the action entry is always associated with the dynamic wizard that
- * should be popuped up.  In the example above the ObjectionContribution id and the
- * action ids are the same, but this need not be the case.  
- */
-public class ActionDialogPreferenceType
-{
-  private String  id_;
-  private String  name_;
-  private String  infopop_;
-  private String  tooltip_;
-  private boolean showCheckbox_;
-  private boolean alwaysHide_;
-  private String  category_;
-
-  /**
-   * Sets the id for this popup action.  This id link the actionDialogPreference
-   * with an ObjectContribution.
-   * @param id the id.
-   */
-  public void setId(String id)
-  {
-    id_ = id;
-  }
-
-  /**
-   * Gets the id for this popup action.
-   * @return the id.
-   */
-  public String getId()
-  {
-    return id_;
-  }
-
-  /**
-   * Sets the name for this popup action.  This name is displayed on the
-   * dialog preferences page and must be translated.
-   * @param name the name of the popup check box.
-   */
-  public void setName(String name)
-  {
-    name_ = name;
-  }
-
-  /**
-   * Gets the display value for this popup check box.
-   * Note: this value may be null if the getShowCheckBox method returns false.
-   * @return the name.
-   */
-  public String getName()
-  {
-    return name_;
-  }
-
-  /**
-   * Sets the info pop value for this popup check box.
-   * @param infopop
-   */
-  public void setInfopop(String infopop)
-  {
-    infopop_ = infopop;
-  }
-
-  /**
-   * Gets the info pop value for this popup check box.
-   * Note: this value may be null if the getShowCheckBox method returns false.
-   * 
-   * @return the infopop value.
-   */
-  public String getInfopop()
-  {
-    return infopop_;
-  }
-
-  /**
-   * Sets the tooltip value for this popup check box.
-   * @param tooltip
-   */
-  public void setTooltip(String tooltip)
-  {
-    tooltip_ = tooltip;
-  }
-
-  /**
-   * Gets the tooltip value for this popup check box.
-   * Note: this value may be null if the getShowCheckBox method returns false.
-   * 
-   * @return the tooltip value.
-   */
-  public String getTooltip()
-  {
-    return tooltip_;
-  }
-  
-  /**
-   * Sets the show check box value for this popup.  If the value is true then
-   * this popup will appear on an action dialogs preference page.  Also if this
-   * value is true and the always hide value is false then a check box will be displayed
-   * on the first page of this popup which asks the user if they want the popup
-   * to be displayed the next time are to just execute the popup action.
-   * @param value the show check box value.
-   */
-  public void setShowCheckbox( boolean value )
-  {
-    showCheckbox_ = value;
-  }
-  
-  /**
-   * Gets the show check box value.
-   * @return the show check box value.
-   */
-  public boolean getShowCheckbox()
-  {
-    return showCheckbox_;
-  }
-  
-  /**
-   * Sets the always hide value.  This value specifies that the popup should always
-   * be executed without bringing up the popup wizard.
-   * @param value the always hide value.
-   */
-  public void setAlwaysHide( boolean value )
-  {
-    alwaysHide_ = value;
-  }
-  
-  /**
-   * 
-   * @return returns the always hide value.
-   */
-  public boolean getAlwaysHide()
-  {
-    return alwaysHide_; 
-  }
-  
-  /**
-   * Sets the category id for popup action.  All popup actions with the same
-   * category id will be grouped together on the same popup action preference page.
-   * @param value the category.
-   */
-  public void setCategory( String value )
-  {
-    category_ = value;
-  }
-  
-  /**
-   * 
-   * @return the category id.
-   */
-  public String getCategory()
-  {
-    return category_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/.classpath b/bundles/org.eclipse.wst.ws.explorer/.classpath
deleted file mode 100644
index 91e409660..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="wsexplorer-properties"/>
-	<classpathentry kind="src" path="wsexplorer-src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.ws.explorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/.cvsignore
deleted file mode 100644
index d97a75614..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-bin
-build
-webapps
-temp.folder
-build.xml
-*.jar
-*.war
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/.project b/bundles/org.eclipse.wst.ws.explorer/.project
deleted file mode 100644
index 9621998fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.ws.explorer</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7d6f5a254..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Jun 03 01:06:53 EDT 2005
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 1300f7816..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Fri Jun 03 00:32:02 EDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
deleted file mode 100644
index 8b4d9a44e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,70 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.ws.explorer; singleton:=true
-Bundle-Version: 0.7.1
-Bundle-ClassPath: explorer.jar,
- wsexplorer-properties.jar
-Bundle-Activator: org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.ws.internal.explorer,
- org.eclipse.wst.ws.internal.explorer.favorites,
- org.eclipse.wst.ws.internal.explorer.platform.actions,
- org.eclipse.wst.ws.internal.explorer.platform.constants,
- org.eclipse.wst.ws.internal.explorer.platform.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.engine,
- org.eclipse.wst.ws.internal.explorer.platform.engine.constants,
- org.eclipse.wst.ws.internal.explorer.platform.engine.data,
- org.eclipse.wst.ws.internal.explorer.platform.engine.transformer,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.actions,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.constants,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.actions,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.constants,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.uddi.util,
- org.eclipse.wst.ws.internal.explorer.platform.util,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.util,
- org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.actions,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.constants,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective,
- org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer,
- org.eclipse.wst.ws.internal.explorer.plugin,
- org.eclipse.wst.ws.internal.explorer.popup
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.tomcat,
- org.eclipse.help.appserver,
- org.eclipse.ui,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.xsd,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.wsdl,
- org.wsdl4j,
- org.apache.wsil4j,
- org.uddi4j,
- org.apache.axis,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.frameworks.ui,
- org.eclipse.wst.common.environment
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.wst.ws.explorer/about.html b/bundles/org.eclipse.wst.ws.explorer/about.html
deleted file mode 100644
index 6f6b96c4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>February 24, 2005</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml b/bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml
deleted file mode 100644
index 25b5feda6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build-war-pde.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.ws.explorer" default="build.wars" basedir=".">
-
-	<!--
-	This script builds wsexplorer.war within the PDE.
-	Instructions for use:
-	1. If you have a prior build of wsexplorer.war in your workspace,
-	   you should first:
-	   a. Replace wsexplorer/WEB-INF/web.xml from HEAD
-	   b. Delete wsexplorer/WEB-INF/lib/wsexplorer.jar
-	   c. Delete wsexplorer.war
-       d. Delete wsexplorer/**/*.java
-	   e. Delete wsexplorer/**/*.class
-	   f. Refresh the project.
-	   TODO: Update this script's "clean" rules to do this stuff automagically.
-	2. Generate and run build.xml to create
-	   wsexplorer/WEB-INF/lib/wsexplorer.jar:
-	   a. plugin.xml -> PDE Tools -> Create Ant Build File
-	   b. build.xml -> Run As -> Ant Build
-	   c. Refresh the project.
-	3. Run build-war-pde.xml to create the WAR:
-	   a. build-war-pde.xml -> Run As -> Ant Build...
-	      to open the "Modify attributes and launch" dialog.
-	   b. Click on the "Properties" tab.
-	   c. Deselect "Use global properties...".
-	   d. Add the following two properties:
-	      baseLocation = the absolute path to your target platform's "eclipse" directory.
-	      buildDirectory = the absolute path to your workspace directory.
-	   e. Click on "Run" to run the script.
-	   f. Refresh the project when the build is done.
-	-->
-	
-	<property name="wsexplorerDir" value="${buildDirectory}/org.eclipse.wst.ws.explorer/wsexplorer"/>
-
-	<target name="jspcompile" unless="wsexplorer.war" description="Pre-compile the JSPs in the org.eclipse.wst.ws.explorer plugin">
-		<java classname="org.apache.jasper.JspC" fork="true">
-			<arg line="-webxml ${wsexplorerDir}/WEB-INF/web.xml -d ${wsexplorerDir} -webapp ${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.eclipse.tomcat*/*.jar" />
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.apache.ant*/lib/*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-		<javac destdir="${wsexplorerDir}/WEB-INF/classes" includeAntRuntime="false">
-			<src path="${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${buildDirectory}">
-					<include name="**/*.jar" /> 
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="**/*.jar" /> 
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="wsexplorer.war" unless="wsexplorer.war" description="Create war: wsexplorer.war.">
-		<zip
-			basedir="${wsexplorerDir}"
-			destfile="${wsexplorerDir}/../wsexplorer.war"
-			whenempty="skip" update="false"
-			excludes="**/*.java **/*.jsp **/*.inc"
-		/>
-	</target>	
-	
-	<target name="build.wars" description="Build all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<available property="wsexplorer.war" file="${wsexplorerDir}/../wsexplorer.war"/>
-		<antcall target="jspcompile"/>
-		<antcall target="wsexplorer.war"/>
-	</target>
-
-	<target name="clean.wars" description="Clean all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<delete file="wsexplorer.war"/>
-	</target>
-</project>
diff --git a/bundles/org.eclipse.wst.ws.explorer/build-war.xml b/bundles/org.eclipse.wst.ws.explorer/build-war.xml
deleted file mode 100644
index 37aba57e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build-war.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="org.eclipse.wst.ws.explorer" default="build.wars" basedir=".">
-
-	<property name="wsexplorerDir" value="${buildDirectory}/plugins/org.eclipse.wst.ws.explorer/wsexplorer"/>
-
-	<target name="jspcompile" unless="wsexplorer.war" description="Pre-compile the JSPs in the org.eclipse.wst.ws.explorer plugin">
-		<java classname="org.apache.jasper.JspC" fork="true">
-			<arg line="-webxml ${wsexplorerDir}/WEB-INF/web.xml -d ${wsexplorerDir} -webapp ${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.eclipse.tomcat*/*.jar" />
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="org.apache.ant*/lib/*.jar" />
-				</fileset>
-			</classpath>
-		</java>
-		<javac destdir="${wsexplorerDir}/WEB-INF/classes" includeAntRuntime="false" failonerror="false">
-			<src path="${wsexplorerDir}"/>
-			<classpath>
-				<fileset dir="${buildDirectory}/plugins">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${buildDirectory}/plugins">
-					<include name="*.jar" />
-				</fileset>
-				<dirset dir="${buildDirectory}/plugins">
-					<include name="**/@dot"/>
-				</dirset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${baseLocation}/plugins">
-					<include name="*.jar" />
-				</fileset>
-			</classpath>
-		</javac>
-	</target>
-
-	<target name="wsexplorer.war" unless="wsexplorer.war" description="Create war: wsexplorer.war.">
-		<zip
-			basedir="${wsexplorerDir}"
-			destfile="${wsexplorerDir}/../wsexplorer.war"
-			whenempty="skip" update="false"
-			excludes="**/*.java **/*.jsp **/*.inc"
-		/>
-	</target>	
-	
-	<target name="build.wars" description="Build all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<available property="wsexplorer.war" file="${wsexplorerDir}/../wsexplorer.war"/>
-		<antcall target="jspcompile"/>
-		<antcall target="wsexplorer.war"/>
-	</target>
-
-	<target name="clean.wars" description="Clean all the wars for the plug-in: org.eclipse.wst.ws.explorer.">
-		<delete file="wsexplorer.war"/>
-	</target>
-
-</project>
diff --git a/bundles/org.eclipse.wst.ws.explorer/build.properties b/bundles/org.eclipse.wst.ws.explorer/build.properties
deleted file mode 100644
index cfff00102..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-source.explorer.jar = src/
-source.wsexplorer/WEB-INF/lib/wsexplorer.jar = wsexplorer-src/
-jars.compile.order = explorer.jar,\
-                     wsexplorer/WEB-INF/lib/wsexplorer.jar,\
-                     wsexplorer-properties.jar
-output.wsexplorer/WEB-INF/lib/wsexplorer.jar = bin/
-bin.includes = plugin.xml,\
-               *.jar,\
-               explorer.jar,\
-               plugin.properties,\
-               properties/,\
-               webapps/,\
-               wsexplorer.war,\
-               META-INF/,\
-               about.html,\
-               wsexplorer-properties.jar
-src.includes = wsexplorer/**/*.zip,\
-               wsexplorer/**/*.jsp,\
-               wsexplorer/**/*.inc
-
-custom = false
-source.wsexplorer-properties.jar = wsexplorer-properties/
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.properties b/bundles/org.eclipse.wst.ws.explorer/plugin.properties
deleted file mode 100644
index 5ec01b2e5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.properties
+++ /dev/null
@@ -1,35 +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 Services Explorer
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Messages for the client type extension
-#
-WEBSERVICECLIENTTYPE_NAME_WSEXPLORER=Stubless (Web Services Explorer)
-TASK_LABEL_EXPLORE_WSDL_USING_WSE=Explorer WSDL using Web Services Explorer.
-
-#
-# Messages for the WSExplorer type extension
-#
-MSG_ERROR_LAUNCH_WSEXPLORER=IWAB0366E Unable to launch Web Services Explorer.
-MSG_ERROR_LOAD_LAUNCH_OPTIONS=IWAB0367E Unable to load launch options.
-MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8=Broken VM does not support UTF-8.
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/plugin.xml b/bundles/org.eclipse.wst.ws.explorer/plugin.xml
deleted file mode 100644
index 50dc1e806..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/plugin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-    
-<!-- ================================================================= -->
-<!-- Extension point: Eclipse Popup Action (org.eclipse.ui.popupMenus) -->
-<!-- ================================================================= -->
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.wsdl"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.wst.wsdl.Service"
-            nameFilter="*"
-            id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
-         <action
-               label="%POPUP_TEST_WSDL"
-               class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
-               menubarPath="additions"
-               id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
-         </action>
-      </objectContribution>
-   </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil b/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
deleted file mode 100644
index 10658f4bc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/properties/favorites_default.wsil
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<inspection xmlns="http://schemas.xmlsoap.org/ws/2001/10/inspection/"
-  xmlns:wsilwsdl="http://schemas.xmlsoap.org/ws/2001/10/inspection/wsdl/"
-  xmlns:wsiluddi="http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/"
-  xmlns:uddi="urn:uddi-org:api">
-  <abstract xml:lang="en-US">v5_0_1_0</abstract>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/testregistry/inquiryapi</abstract>
-    <abstract xml:lang="en-US">https://uddi.ibm.com/testregistry/publishapi</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/testregistry/registry.html</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_IBM</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/ubr/inquiryapi</abstract>
-    <abstract xml:lang="en-US">https://uddi.ibm.com/ubr/publishapi</abstract>
-    <abstract xml:lang="en-US">http://uddi.ibm.com/ubr/registry.html</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST</abstract>
-    <abstract xml:lang="en-US">http://test.uddi.microsoft.com/inquire</abstract>
-    <abstract xml:lang="en-US">https://test.uddi.microsoft.com/publish</abstract>
-    <abstract xml:lang="en-US">https://test.uddi.microsoft.com/register.aspx</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT</abstract>
-    <abstract xml:lang="en-US">http://uddi.microsoft.com/inquire</abstract>
-    <abstract xml:lang="en-US">https://uddi.microsoft.com/publish</abstract>
-    <abstract xml:lang="en-US">https://uddi.microsoft.com/register.aspx</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST</abstract>
-    <abstract xml:lang="en-US">http://udditest.sap.com/UDDI/api/inquiry/</abstract>
-    <abstract xml:lang="en-US">https://udditest.sap.com/UDDI/api/publish/</abstract>
-    <abstract xml:lang="en-US">http://udditest.sap.com/</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_SAP</abstract>
-    <abstract xml:lang="en-US">http://uddi.sap.com/UDDI/api/inquiry/</abstract>
-    <abstract xml:lang="en-US">https://uddi.sap.com/UDDI/api/publish/</abstract>
-    <abstract xml:lang="en-US">http://uddi.sap.com/</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS</abstract>
-    <abstract xml:lang="en-US">http://uddi.xmethods.net/inquire</abstract>
-    <abstract xml:lang="en-US">https://uddi.xmethods.net/publish</abstract>
-    <abstract xml:lang="en-US">http://www.xmethods.net/ve2/Register.po?event=registerOrg</abstract>
-  </link>
-
-  <link referencedNamespace="urn:uddi-org:api">
-    <abstract xml:lang="en-US">%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM</abstract>
-    <abstract xml:lang="en-US">http://www.uddi.ne.jp/registry/inquiryapi</abstract>
-    <abstract xml:lang="en-US">https://www.uddi.ne.jp/registry/publishapi</abstract>
-    <abstract xml:lang="en-US">http://www.uddi.ne.jp/registry/registry.html</abstract>
-  </link>
-
-  <link referencedNamespace="http://schemas.xmlsoap.org/ws/2001/10/inspection/" location="http://www.xmethods.com/inspection.wsil"/>
-</inspection>
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java
deleted file mode 100644
index 19ba1f16f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/CatalinaRunnable.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.help.internal.appserver.AppserverPlugin;
-import org.eclipse.help.internal.appserver.WebappManager;
-
-public class CatalinaRunnable {
-
-	private static CatalinaRunnable catalinaRunnable_;
-
-	private CatalinaRunnable() {
-	}
-
-	public static CatalinaRunnable getCatalinaRunnable() {
-		if (catalinaRunnable_ == null) {
-			catalinaRunnable_ = new CatalinaRunnable();
-			catalinaRunnable_.init();
-		}
-		return catalinaRunnable_;
-	}
-
-	public boolean isTomcatStarted() {
-		try {
-			return AppserverPlugin.getDefault().getAppServer().isRunning();
-		} catch (Throwable t) {
-			return false;
-		}
-	}
-
-	public int getTomcatPort() {
-		return WebappManager.getPort();
-	}
-
-	private void init() {
-		WSExplorer wsExplorer = WSExplorer.getInstance();
-		String ctxt = wsExplorer.getContextName();
-		String pluginID = wsExplorer.getParentPluginID();
-		String warLocation = wsExplorer.getWARLocation();
-		String webappLocation = wsExplorer.getWebAppLocation();
-		try {
-			if (warLocation != null)
-				WebappManager.start(ctxt, pluginID, new Path(warLocation));
-			else
-				WebappManager.start(ctxt, pluginID, new Path(webappLocation));
-		} catch (Throwable t) {
-		}
-	}
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
deleted file mode 100644
index 3666ede76..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOption.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This simple class is used to hold a single Web Services
- * Explorer launch option property and its value. Allowed
- * launch option properties are defined by
- * <code>{@link LaunchOptions}</code>.
- */
-public class LaunchOption {
-	private String key_;
-
-	private String option_;
-
-	/*
-	 * Constructs a new launch option with the given
-	 * property name and value. 
-	 */
-	public LaunchOption(String key, String option) {
-		key_ = key;
-		option_ = option;
-	}
-
-	/**
-	 * Returns the property name of this launch option.
-	 * @return The property name.
-	 */
-	public String getKey() {
-		return key_;
-	}
-
-	/**
-	 * Returns the property value of this launch option.
-	 * @return The property value.
-	 */
-	public String getOption() {
-		return option_;
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
deleted file mode 100644
index 392f03b11..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchOptions.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 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.wst.ws.internal.explorer;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This class defines the property names understood by the Web Services Explorer
- * and used to configure it's initial appearance and behaviour at the time it is
- * launched.
- * @see LaunchOption
- */
-public class LaunchOptions {
-	// General purpose preload constants
-	
-	public static final String STATE_LOCATION = "stateLocation";
-	
-	public static final String DEFAULT_FAVORITES_LOCATION = "defaultFavoritesLocation";
-	
-	// WSDL Page preload constants
-
-	public static final String WSDL_URL = "wsdl";
-
-	public static final String WEB_SERVICE_ENDPOINT = "webServiceEndpoint";
-
-	public static final String SERVICE_QNAME_STRING = "serviceQNameString";
-
-	public static final String BINDING_NAME_STRING = "bindingNameString";
-
-	// UDDI Page preload constants
-
-	public static final String INQUIRY_URL = "inquiry";
-
-	public static final String PUBLISH_URL = "publish";
-
-	public static final String SERVICE_NAME = "serviceName";
-
-	public static final String SERVICE_KEY = "serviceKey";
-
-	public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.java
deleted file mode 100644
index 6375d5312..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardRunnable.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.wst.ws.internal.explorer;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-public class LaunchWizardRunnable extends Thread implements Runnable {
-	private String id;
-
-	private String wsdlURL;
-
-	private boolean finish;
-
-	public LaunchWizardRunnable(String id, String wsdlURL) {
-		this.id = id;
-		this.wsdlURL = (wsdlURL != null) ? wsdlURL : "";
-		finish = false;
-	}
-
-	public boolean isFinish() {
-		return finish;
-	}
-
-	public void run() {
-		try {
-			DynamicWizard wizard = new DynamicWizard();
-			wizard.setInitialData(id);
-			IStructuredSelection sel = new StructuredSelection(wsdlURL);
-			wizard.init(null, sel);
-			WizardDialog wd = new WizardDialog(new Shell(Display.getDefault(),
-					SWT.APPLICATION_MODAL), wizard);
-			wd.open();
-		} catch (Exception e) {
-		} finally {
-			finish = true;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
deleted file mode 100644
index f5329e2f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/LaunchWizardTask.java
+++ /dev/null
@@ -1,65 +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.wst.ws.internal.explorer;
-
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-
-public class LaunchWizardTask {
-	// singleton
-	private static LaunchWizardTask task_;
-
-	// the shell for the wizard to be launched
-	private Shell shell_;
-
-	// the LaunchWizardRunnable that is currently running
-	private LaunchWizardRunnable runnable_;
-
-	private LaunchWizardTask(Shell shell) {
-		shell_ = shell;
-		runnable_ = null;
-	}
-
-	public static LaunchWizardTask getInstance() {
-		if (task_ == null)
-			task_ = new LaunchWizardTask(PlatformUI.getWorkbench()
-					.getActiveWorkbenchWindow().getShell());
-		return task_;
-	}
-
-	public void asyncExec(Runnable runnable) throws SWTException {
-		shell_.getDisplay().asyncExec(runnable);
-	}
-
-	public boolean checkAndAsyncExec(LaunchWizardRunnable runnable) {
-		try {
-			if (!getIsExecuting()) {
-				asyncExec(runnable);
-				runnable_ = runnable;
-				return true;
-			} else
-				return false;
-		} catch (Exception e) {
-			return false;
-		}
-	}
-
-	public boolean getIsExecuting() {
-		if (runnable_ != null) {
-			boolean isFinish = runnable_.isFinish();
-			if (isFinish)
-				runnable_ = null;
-			return !isFinish;
-		} else
-			return false;
-	}
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
deleted file mode 100644
index 31675476f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorer.java
+++ /dev/null
@@ -1,230 +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.wst.ws.internal.explorer;
-
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class WSExplorer {
-	private static WSExplorer instance;
-
-	private static int launchOptionsKey_ = 0;
-
-	public WSExplorer() {
-	}
-
-	public static WSExplorer getInstance() {
-		if (instance == null) {
-			instance = new WSExplorer();
-		}
-		return instance;
-	}
-
-	public String getContextName() {
-		return "wsexplorer";
-	}
-
-	public String getParentPluginID() {
-		return ExplorerPlugin.ID;
-	}
-
-	public String getWARLocation() {
-		return "wsexplorer.war";
-	}
-
-	public String getWebAppLocation() {
-		return "wsexplorer";
-	}
-
-	public String getWelcomeURL() {
-		return "wsexplorer.jsp";
-	}
-
-	public String getLaunchOptionRegistryURL() {
-		return "launch_options_registry.jsp";
-	}
-
-	public String getBaseURL() {
-		StringBuffer sb = new StringBuffer();
-		sb.append("http://localhost:");
-		sb.append(CatalinaRunnable.getCatalinaRunnable().getTomcatPort());
-		sb.append("/");
-		sb.append(getContextName());
-		sb.append("/");
-		return sb.toString();
-	}
-
-	public String getMetadataDirectory() {
-		// <workspace>/.metadata/.plugins/org.eclipse.wst.ws.explorer/ (note
-		// the trailing separator).
-		return ExplorerPlugin.getInstance().getPluginStateLocation();
-	}
-
-	public IStatus launch(IWorkbench wb, IStructuredSelection sel,
-		LaunchOption[] options, boolean forceLaunchOutsideIDE) {
-		// launchOptionKey
-		int launchOptionKey = getLaunchOptionsKey();
-		// Web Services Explorer URL
-		StringBuffer sb = new StringBuffer();
-		sb.append(getBaseURL());
-		sb.append(getWelcomeURL());
-		sb.append("?");
-		if (options != null && options.length > 0) {
-			String encodedID = null;
-			try {
-				encodedID = URLEncoder.encode(ExplorerPlugin.ID,
-						ExplorerPlugin.CHARSET);
-			} catch (UnsupportedEncodingException e) {
-				return new Status(
-						IStatus.ERROR,
-						ExplorerPlugin.ID,
-						0,
-						ExplorerPlugin
-								.getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
-						e);
-			}
-			sb.append(encodedID);
-			sb.append("=");
-			sb.append(launchOptionKey);
-		}
-		// launch Web Services Explorer
-		try {
-			URL url = new URL(sb.toString());
-			if (forceLaunchOutsideIDE) {
-				if (System.getProperty("os.name").toLowerCase().indexOf("win") == -1)
-					Runtime.getRuntime()
-							.exec("mozilla " + url.toExternalForm());
-				else
-					Runtime.getRuntime().exec(
-							"cmd /C start iexplore " + url.toExternalForm());
-			} else {
-				// browserId
-				StringBuffer browserId = new StringBuffer();
-				browserId.append(ExplorerPlugin.ID);
-				browserId.append(getContextName());
-				
-				IWorkbenchBrowserSupport browserSupport = ExplorerPlugin.getInstance().getWorkbench().getBrowserSupport();
-				IWebBrowser browser = browserSupport.createBrowser(browserId.toString());
-				browser.openURL(url);
-			}
-		} catch (Exception e) {
-			return new Status(IStatus.ERROR, ExplorerPlugin.ID, 0,
-					ExplorerPlugin.getMessage("%MSG_ERROR_LAUNCH_WSEXPLORER"),
-					e);
-		}
-		// register launch options
-		if (options != null && options.length > 0) {
-			try {
-				StringBuffer launchOptionsRegURL = new StringBuffer();
-				launchOptionsRegURL.append(getBaseURL());
-				launchOptionsRegURL.append(getLaunchOptionRegistryURL());
-				URL url = new URL(launchOptionsRegURL.toString());
-				URLConnection connection = url.openConnection();
-				connection.setDoOutput(true);
-				PrintWriter out = new PrintWriter(connection.getOutputStream());
-				StringBuffer params = new StringBuffer();
-				String encodedID = null;
-				try {
-					encodedID = URLEncoder.encode(ExplorerPlugin.ID,
-							ExplorerPlugin.CHARSET);
-				} catch (UnsupportedEncodingException e) {
-					return new Status(
-							IStatus.ERROR,
-							ExplorerPlugin.ID,
-							0,
-							ExplorerPlugin
-									.getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
-							e);
-				}
-				params.append(encodedID);
-				params.append("=");
-				params.append(launchOptionKey);
-				params.append("&");
-				for (int i = 0; i < options.length; i++) {
-					if (options[i] != null) {
-						params.append(options[i].getKey());
-						params.append("=");
-						String option = null;
-						try {
-							option = URLEncoder.encode(options[i].getOption(),
-									ExplorerPlugin.CHARSET);
-						} catch (UnsupportedEncodingException e) {
-							return new Status(
-									IStatus.ERROR,
-									ExplorerPlugin.ID,
-									0,
-									ExplorerPlugin
-											.getMessage("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8"),
-									e);
-						}
-						params.append(option);
-						params.append("&");
-					}
-				}
-				out.print(params.toString());
-				out.close();
-				out = null;
-				InputStream is = connection.getInputStream();
-				is.close();
-				is = null;
-			} catch (Exception e) {
-				return new Status(IStatus.WARNING, ExplorerPlugin.ID, 0,
-						ExplorerPlugin
-								.getMessage("%MSG_ERROR_LOAD_LAUNCH_OPTIONS"),
-						e);
-			}
-		}
-		return new Status(IStatus.OK, ExplorerPlugin.ID, 0, "", null);
-	}
-
-	private static int getLaunchOptionsKey() {
-		return launchOptionsKey_++;
-	}
-
-	public IStatus launch(IWorkbench wb, IStructuredSelection sel,
-			String[] inquiryURL, String[] publishURL,
-			boolean forceLaunchOutsideIDE) {
-		int inquiryURLOptionLength = (inquiryURL != null) ? inquiryURL.length
-				: 0;
-		int publishURLOptionLength = (publishURL != null) ? publishURL.length
-				: 0;
-		LaunchOption[] options = new LaunchOption[inquiryURLOptionLength
-				+ publishURLOptionLength];
-		int index = 0;
-		if (inquiryURL != null) {
-			for (int i = 0; i < inquiryURL.length; i++) {
-				options[index] = new LaunchOption(LaunchOptions.INQUIRY_URL,
-						inquiryURL[i]);
-				index++;
-			}
-		}
-		if (publishURL != null) {
-			for (int i = 0; i < publishURL.length; i++) {
-				options[index] = new LaunchOption(LaunchOptions.PUBLISH_URL,
-						publishURL[i]);
-				index++;
-			}
-		}
-		return launch(wb, sel, options, forceLaunchOutsideIDE);
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
deleted file mode 100644
index 9d8ee2c16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerContext.java
+++ /dev/null
@@ -1,15 +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.wst.ws.internal.explorer;
-
-public final class WSExplorerContext {
-	public static final String ID = "org.eclipse.wst.ws.explorer";
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
deleted file mode 100644
index c1a8909ee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/WSExplorerLauncherCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Properties;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation;
-
-/**
- * @author cbrealey@ca.ibm.com
- * 
- * This <code>Command</code>, when executed, launches the
- * Web Services Explorer.
- */
-public class WSExplorerLauncherCommand extends AbstractDataModelOperation {
-	private boolean forceLaunchOutsideIDE;
-
-	private LaunchOption[] launchOptions;
-
-	public WSExplorerLauncherCommand() {
-	}
-
-	public void writeCategoryInfo(String inquiryURL, String categoriesDirectory) {
-		try {
-			Properties p = new Properties();
-			p.setProperty(LaunchOptions.CATEGORIES_DIRECTORY,
-					categoriesDirectory);
-			StringBuffer propertiesFileName = new StringBuffer();
-			propertiesFileName.append(WSExplorer.getInstance()
-					.getMetadataDirectory());
-			File metadataDirectoryFile = new File(propertiesFileName.toString());
-			if (!metadataDirectoryFile.exists()) {
-				metadataDirectoryFile.mkdirs();
-			}
-			propertiesFileName.append(URLEncoder.encode(inquiryURL,"UTF-8")).append(
-					".properties");
-			FileOutputStream fout = new FileOutputStream(propertiesFileName
-					.toString());
-			p.store(fout, null);
-			fout.close();
-		} catch (IOException e) {
-		}
-	}
-
-	public IStatus execute() {
-		return WSExplorer.getInstance().launch(null, null, launchOptions,
-				forceLaunchOutsideIDE);
-	}
-
-	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
-  {
-    return execute();
-	}
-
-	/**
-	 * @param forceLaunchOutsideIDE
-	 *            The forceLaunchOutsideIDE to set.
-	 */
-	public void setForceLaunchOutsideIDE(boolean forceLaunchOutsideIDE) {
-		this.forceLaunchOutsideIDE = forceLaunchOutsideIDE;
-	}
-
-	/**
-	 * @param launchOptions
-	 *            The launchOptions to set.
-	 */
-	public void setLaunchOptions(LaunchOption[] launchOptions) {
-		this.launchOptions = launchOptions;
-	}
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
deleted file mode 100644
index 6d8809f03..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeDefault.java
+++ /dev/null
@@ -1,75 +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.wst.ws.internal.explorer.favorites;
-
-import java.io.IOException;
-import org.apache.wsil.WSILDocument;
-import org.apache.wsil.WSILException;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-public class FavoritesRegistryTypeDefault extends FavoritesRegistryTypeAbstract {
-	private static WSILDocument wsilDoc_;
-
-	public static final String FAVORITES_DEFAULT = "properties/favorites_default.wsil";
-	
-	private String defaultFavorites_ = null;
-
-	public FavoritesRegistryTypeDefault() {
-		super();
-		wsilDoc_ = null;
-	}
-
-	public FavoritesRegistryTypeDefault(String defaultFavorites) {
-		super();
-		wsilDoc_ = null;
-		defaultFavorites_ = defaultFavorites;
-	}
-
-	public String getReadLocation() {
-		StringBuffer readLocation = new StringBuffer();
-		if (defaultFavorites_ == null)
-		{
-			readLocation.append(ExplorerPlugin.getInstance().getPluginInstallLocation());
-			readLocation.append(FAVORITES_DEFAULT);
-		}
-		else
-		{
-			readLocation.append(defaultFavorites_);
-		}
-		return readLocation.toString();
-	}
-
-	public String getWriteLocation() {
-		return null;
-	}
-
-	protected WSILDocument getWSILDocument() {
-		if (wsilDoc_ == null) {
-			wsilDoc_ = loadWSILDocument(getReadLocation(), true);
-			getFavoritesUDDIRegistries();
-			/* TODO: Public registry strings shouldn't be in properties - Ain't extensible.
-			for (int i = 0; i < registries.length; i++) {
-				registries[i].setName(WSPlugin.getResourceString(registries[i].getName()));
-			}
-			*/
-		}
-		return wsilDoc_;
-	}
-
-	public WSILDocument getFavoritesDefault() {
-		return getWSILDocument();
-	}
-
-	public void save() throws WSILException, IOException {
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
deleted file mode 100644
index 253fc8c16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/favorites/FavoritesRegistryTypeWSE.java
+++ /dev/null
@@ -1,76 +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.wst.ws.internal.explorer.favorites;
-
-import org.apache.wsil.WSILDocument;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesRegistryTypeAbstract;
-
-
-public class FavoritesRegistryTypeWSE extends FavoritesRegistryTypeAbstract
-{
-  private static WSILDocument wsilDoc_;
-  public static final String FAVORITES_WSEXPLORER = "favorites.wsil";
-  private String defaultFavorites_ = null;
-  private String stateLocation_ = null;
-  
-  public FavoritesRegistryTypeWSE()
-  {
-    super();
-    wsilDoc_ = null;
-  }
-  
-  public FavoritesRegistryTypeWSE(String defaultFavorites, String stateLocation) {
-	super();
-	wsilDoc_ = null;
-	defaultFavorites_ = defaultFavorites;
-	stateLocation_ = stateLocation;
-  }
-
-  public String getReadLocation()
-  {
-    StringBuffer readLocation = new StringBuffer();
-    readLocation.append(stateLocation_ == null ? ExplorerPlugin.getInstance().getPluginStateLocation() : stateLocation_);
-    readLocation.append(FAVORITES_WSEXPLORER);
-    return readLocation.toString();
-  }
-
-  public String getWriteLocation()
-  {
-    return getReadLocation();
-  }
-
-  protected WSILDocument getWSILDocument()
-  {
-    if (wsilDoc_ == null)
-    {
-      wsilDoc_ = loadWSILDocument(getReadLocation(), false);
-      if (wsilDoc_ == null)
-      {
-        restoreFavoritesDefault();
-        try
-        {
-          save();
-        }
-        catch (Throwable t)
-        {
-        }
-      }
-    }
-    return wsilDoc_;
-  }
-
-  public void restoreFavoritesDefault()
-  {
-    wsilDoc_ = (new FavoritesRegistryTypeDefault(defaultFavorites_)).getWSILDocument();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
deleted file mode 100644
index 364d5e245..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/plugin/ExplorerPlugin.java
+++ /dev/null
@@ -1,195 +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.wst.ws.internal.explorer.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.ws.internal.explorer.LaunchWizardTask;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.osgi.framework.BundleContext;
-
-
-/**
- * This is the plugin class for the Web Services Explorer.
- */
-public class ExplorerPlugin extends AbstractUIPlugin
-{
-  /**
-   * The identifier of the descriptor of this plugin in plugin.xml.
-   */
-  public static final String ID = "org.eclipse.wst.ws.explorer";
-  public static final String CHARSET = "UTF-8";
-  /**
-   * The reference to the singleton instance of this plugin.
-   */
-  private static ExplorerPlugin instance_;
-
-  /**
-   * Constructs a runtime plugin object for this plugin. The "plugin" element
-   * in plugin.xml should include the attribute class =
-   * "org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin".
-   * 
-   * @param descriptor
-   *            The descriptor of this plugin.
-   */
-  public ExplorerPlugin()
-  {
-    super();
-    instance_ = this;
-  }
-
-  /**
-   * Returns the singleton instance of this plugin. Equivalent to calling
-   * (ExplorerPlugin)Platform.getPlugin("org.eclipse.wst.ws.explorer");
-   * 
-   * @return The ExplorerPlugin singleton.
-   */
-  static public ExplorerPlugin getInstance()
-  {
-    return instance_;
-  }
-
-  /**
-   * Called once by the platform when this plugin is first loaded.
-   * 
-   * @throws CoreException
-   *             If this plugin fails to start.
-   */
-  public void start(BundleContext bundle) throws Exception
-  {
-    super.start(bundle);
-    // init the shell of LaunchWizardTask
-    LaunchWizardTask.getInstance();
-  }
-
-  /**
-   * Called once by the platform when this plugin is unloaded.
-   * 
-   * @throws CoreException
-   *             If this plugin fails to shutdown.
-   */
-  public void stop(BundleContext bundle) throws Exception
-  {
-    super.stop(bundle);
-  }
-
-  /**
-   * 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 Platform.getResourceString(instance_.getBundle(), key); 
-  }
-
-  /**
-   * Returns the message string identified by the given key from the
-   * plugin.properties file for the appropriate locale. Substitution sequences
-   * in the message string are replaced by the given array of substitution
-   * objects (which are most frequently strings). See java.text.MessageFormat
-   * for further details on substitution.
-   * 
-   * @param key
-   *            The message key string prefixed by a "%" symbol. That is, the
-   *            string passed in must be of the form "%KEY" where the
-   *            plugin.properties file contains a line of the form: "KEY =
-   *            value".
-   * @param args
-   *            The substitution values for the message as required by the
-   *            message in plugin.properties and by the rules of class
-   *            java.text.MessageFormat.
-   * @return The locale-specific message.
-   */
-  public static String getMessage(String key, Object[] args)
-  {
-    return MessageFormat.format(getMessage(key), args);
-  }
-
-  /**
-   * Returns an image descriptor for the named resource as relative to the
-   * plugin install location.
-   * 
-   * @return An image descriptor, possibly null.
-   */
-  public static ImageDescriptor getImageDescriptor(String name)
-  {
-    try
-    {
-      URL installURL = instance_.getBundle().getEntry("/");
-      URL imageURL = new URL(installURL, name);
-      return ImageDescriptor.createFromURL(imageURL);
-    }
-    catch (MalformedURLException e)
-    {
-      return null;
-    }
-  }
-
-  /**
-   * See IPluginHelper.
-   */
-  public void setMsgLoggerConfig(Hashtable msgLoggerConfig)
-  {
-  }
-
-  /**
-   * See IPluginHelper.
-   */
-  public Hashtable getMsgLoggerConfig(Plugin plugin)
-  {
-    return new Hashtable();
-  }
-
-  /**
-   * See IPluginHelper.
-   */
-  public Hashtable getMsgLoggerConfig()
-  {
-    return getMsgLoggerConfig(this);
-  }
-
-  public String getPluginStateLocation()
-  {
-    return Platform.getPluginStateLocation(this).addTrailingSeparator().toOSString();
-  }
-
-  public String getDefaultFavoritesLocation()
-  {
-	// TODO: getPluginInstallLocation can return null and cause trouble for the WSE's favourites mechanism. 89101 should correct this.
-	return getPluginInstallLocation()+FavoritesRegistryTypeDefault.FAVORITES_DEFAULT;
-  }
-  
-  public String getPluginInstallLocation()
-  {
-    try
-    {
-      return Platform.resolve(instance_.getBundle().getEntry("/")).getFile();
-    }
-    catch (Exception e)
-    {
-      return null;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java b/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
deleted file mode 100644
index cca897f69..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/src/org/eclipse/wst/ws/internal/explorer/popup/PopupTestWSDL.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.popup;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.monitor.GetMonitorCommand;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-public class PopupTestWSDL extends Action implements IActionDelegate
-{
-  public PopupTestWSDL()
-  {
-    super(ExplorerPlugin.getMessage("%POPUP_TEST_WSDL"));
-  }
-
-  private IStructuredSelection getWorkbenchSelection()
-  {
-    IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    if (window != null)
-    {
-      ISelection selection = window.getSelectionService().getSelection();
-      if (selection instanceof IStructuredSelection)
-        return (IStructuredSelection)selection;
-    }
-    return null;
-  }
-
-  public void run()
-  {
-	String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
-	String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
-  	WSExplorerLauncherCommand command = new WSExplorerLauncherCommand();
-    command.setForceLaunchOutsideIDE(false);
-    IStructuredSelection selection = getWorkbenchSelection();
-    Vector launchOptions = new Vector();
-    if (selection != null)
-    {
-      for (Iterator it = selection.iterator(); it.hasNext();)
-      {
-        String wsdlURL = null;
-        Object object = it.next();
-        if (object instanceof IResource)
-        {
-          File wsdlFile = ((IResource)object).getLocation().toFile();
-          try
-          {
-            wsdlURL = wsdlFile.toURL().toString();
-          }
-          catch (MalformedURLException murle)
-          {
-            wsdlURL = wsdlFile.toString();
-          }
-        }
-        /* TODO: Move this up to org.eclipse.jst.ws.ui.
-        if (object instanceof ServiceImpl)
-        {
-          ServiceImpl serviceImpl = (ServiceImpl)object;
-          wsdlURL = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-        }
-        if (object instanceof ServiceRef)
-        {
-          ServiceRef serviceImpl = (ServiceRef)object;
-          wsdlURL = J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
-        }
-        if (object instanceof WSDLResourceImpl)
-        {
-          WSDLResourceImpl WSDLRImpl = (WSDLResourceImpl)object;
-          wsdlURL = J2EEActionAdapterFactory.getWSDLURI(WSDLRImpl);
-        }
-        */
-        GetMonitorCommand getMonitorCmd = new GetMonitorCommand();
-        getMonitorCmd.setMonitorService(true);
-        getMonitorCmd.setCreate(false);
-        getMonitorCmd.setWebServicesParser(new WebServicesParser());
-        getMonitorCmd.setWsdlURI(wsdlURL);
-        getMonitorCmd.execute(null, null);
-        List endpoints = getMonitorCmd.getEndpoints();
-        for (Iterator endpointsIt = endpoints.iterator(); endpointsIt.hasNext();)
-          launchOptions.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, (String)endpointsIt.next()));
-        launchOptions.add(new LaunchOption(LaunchOptions.WSDL_URL, wsdlURL));
-		launchOptions.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
-		launchOptions.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
-      }
-    }
-    command.setLaunchOptions((LaunchOption[])launchOptions.toArray(new LaunchOption[0]));
-    command.execute();
-  }
-
-  public void run(IAction action)
-  {
-    run();
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
deleted file mode 100644
index 974ce4a85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/explorer.properties
+++ /dev/null
@@ -1,181 +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
-###############################################################################
-
-TITLE_WSEXPLORER=Web Services Explorer
-
-# Tree Nodes
-ALT_OPEN=Open
-ALT_CLOSE=Close
-
-# Perspective Toolbar
-ALT_BACK=Back
-ALT_FORWARD=Forward
-ALT_ACTION_ENGINE=Action Recorder
-ALT_UDDI_PERSPECTIVE=UDDI Page
-ALT_WSIL_PERSPECTIVE=WSIL Page
-ALT_WSDL_PERSPECTIVE=WSDL Page
-ALT_FAVORITES_PERSPECTIVE=Favorites
-
-# Toolbars
-ALT_DOUBLE_CLICK_TO_MAXIMIZE=Double Click to Maximize
-ALT_DOUBLE_CLICK_TO_RESTORE=Double Click to Restore
-
-# SetDefaultViewTool
-ALT_BACK_TO_TOP=Back to top
-
-# Common Actions
-ALT_REFRESH=Refresh
-ALT_CLEAR=Clear
-ALT_RESULTS=Results
-
-# Common Labels
-ALT_NAVIGATOR=Navigator
-ALT_ACTIONS=Actions
-ALT_STATUS=Status
-ALT_OTHER_ACTIONS=Other Actions
-FORM_BUTTON_GO=&nbsp;&nbsp;Go&nbsp;&nbsp;
-FORM_BUTTON_RESET=Reset
-FORM_BUTTON_CANCEL=Cancel
-FORM_LABEL_ACTIONS=Actions
-FORM_LABEL_ACTIONS_NONE=None
-
-# Placeholder for blank table entries
-TABLE_BLANK_PLACEHOLDER=--
-
-# Common Form Control Titles
-FORM_CONTROL_TITLE_SELECT_ALL_CHECK_BOX=Select all
-FORM_CONTROL_TITLE_SELECT_ROW_CHECK_BOX=Select row
-
-# Common Messages
-MSG_ERROR_UNEXPECTED=IWAB0135E An unexpected error has occurred.
-MSG_ERROR_NO_ACTION_SELECTED=IWAB0124E Select an action.
-MSG_ERROR_NO_NODE_SELECTED=IWAB0125E Select a node.
-MSG_SUBMIT_IN_PROGRESS=Please wait. The operation is still in progress.
-MSG_LOAD_IN_PROGRESS=Please wait while the form loads...
-
-#LaunchWebServiceWizardAction
-ALT_LAUNCH_WEB_SERVICE_WIZARD=Launch Web Service Wizard
-FORM_LABEL_CHOOSE_WIZARD=Select a wizard to launch:
-FORM_RADIO_WEB_SERVICE_CLIENT_WIZARD=Web Service Client
-FORM_RADIO_WEB_SERVICE_SKELETON_WIZARD=Web Service Skeleton
-MSG_ERROR_WIZARD_ALREADY_RUNNING=IWAB0126E A Web service wizard is already in progress.  Finish with the existing wizard before launching a new one.
-MSG_ERROR_WSDL_URL_IS_UNREACHABLE=IWAB0127E The WSDL document is unreachable.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-MSG_ERROR_RETRIEVING_WSDL_DOC=IWAB0128E Unable to retrieve WSDL document.
-MSG_ERROR_RETRIEVING_WSIL_DOC=IWAB0129E Unable to retrieve WSIL document.
-MSG_IMPORT_WSDL_SUCCESSFUL=WSDL document successfully imported.
-MSG_IMPORT_WSIL_SUCCESSFUL=WSIL document successfully imported.
-
-# ImportToWorkbenchAction
-ALT_IMPORT_WSDL_TO_WORKBENCH=Import WSDL To workbench
-FORM_LABEL_IMPORT_TO_WORKBENCH_DESC=Select a workbench project to save the WSDL file into. You may also change the name of the WSDL file.
-WEB_PROJECT_NAME=Web project:
-WORKBENCH_PROJECT_NAME=Workbench project:
-LABEL_IMPORT_WSDL=Import WSDL document
-LABEL_IMPORT_TO_WSIL=Import as a service reference to a WSIL document
-IMPORTED_WSDL_FILE_NAME=WSDL file name:
-WSIL_FILE_NAME=WSIL file name:
-MSG_ERROR_FILE_OVERWRITE_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file overwriting has not been enabled. Do you want to enable it for this file?
-MSG_ERROR_INVALID_WORKBENCH_PROJECT=IWAB0130E Select a workbench project.
-MSG_ERROR_INVALID_WSDL_FILE_NAME=IWAB0131E Invalid file name.
-MSG_ERROR_INVALID_WSIL_FILE_NAME=IWAB0470E Invalid WSIL file name.
-MSG_ERROR_NO_IMPORT_OPTION_SELECTED=IWAB0471E No import option is selected.  Please choose at least one import option.
-MSG_ERROR_WRITING_TEMP_FILE_TO_FS=IWAB0132E Unable to write temporary file.
-MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL=IWAB0314I %1 was successfully imported to the workbench.
-MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL=IWAB0472I Service reference was successfully imported to %1.
-
-# CheckWorkbenchFileReadOnlyAction
-MSG_ERROR_FILE_CHECKOUT_DISABLED=Cannot create the file "%2" relative to the path "%1" because automatic file check out has not been enabled. Do you want to enable it for this file?
-
-# ClearNodeAction
-MSG_INFO_NODE_CLEARED=IWAB0133I %1 cleared.
-
-# Table twistees
-ALT_TWIST_OPENED=Hide
-ALT_TWIST_CLOSED=Expand
-
-# WSDL Browser
-FORM_LINK_BROWSE=Browse...
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Workspace Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Workspace Project
-FORM_LABEL_WSDL_URL=WSDL URL
-FORM_BUTTON_REFRESH=Refresh
-ALT_WSDL_BROWSER=WSDL Browser
-WSDL_TYPE_SERVICE_INTERFACES=Service Interfaces
-WSDL_TYPE_SERVICES=Services
-
-# Calendar Browser
-TITLE_CALENDAR_BROWSER=Calendar Browser
-# 2 character abbreviations for days of the week.
-FORM_LABEL_SH_SUNDAY=Su
-FORM_LABEL_SH_MONDAY=Mo
-FORM_LABEL_SH_TUESDAY=Tu
-FORM_LABEL_SH_WEDNESDAY=We
-FORM_LABEL_SH_THURSDAY=Th
-FORM_LABEL_SH_FRIDAY=Fr
-FORM_LABEL_SH_SATURDAY=Sa
-# Months of the year
-FORM_LABEL_MONTH=Month:
-FORM_LABEL_JANUARY=January
-FORM_LABEL_FEBRUARY=February
-FORM_LABEL_MARCH=March
-FORM_LABEL_APRIL=April
-FORM_LABEL_MAY=May
-FORM_LABEL_JUNE=June
-FORM_LABEL_JULY=July
-FORM_LABEL_AUGUST=August
-FORM_LABEL_SEPTEMBER=September
-FORM_LABEL_OCTOBER=October
-FORM_LABEL_NOVEMBER=November
-FORM_LABEL_DECEMBER=December
-FORM_LABEL_YEAR=Year:
-FORM_LABEL_TIME=Time:
-FORM_LINK_TODAY=Today
-FORM_LINK_PREVIOUS_YEAR=<<
-FORM_LINK_PREVIOUS_MONTH=<
-FORM_LINK_NEXT_MONTH=>
-FORM_LINK_NEXT_YEAR=>>
-ALT_PREVIOUS_YEAR=Previous Year
-ALT_PREVIOUS_MONTH=Previous Month
-ALT_NEXT_MONTH=Next Month
-ALT_NEXT_YEAR=Next Year
-ALT_TODAY=Today
-ALT_CALENDAR_BROWSER=Calendar Browser
-MSG_ERROR_INVALID_TIME_FORMAT=IWAB0368E Time was not formatted as HH:MM:SS[.SSS]. Do you wish to use the current time instead?
-
-# Action engine
-TITLE_ACTION_RECORDER=Action Recorder
-FORM_LABEL_MODE=Mode:
-FORM_LABEL_MODE_PLAY=Play
-FORM_LABEL_MODE_STOP=Stop
-FORM_LABEL_MODE_RECORD=Record
-FORM_LABEL_SAVE=Save
-FORM_LABEL_PLAY_FILE=Play file:
-MSG_ERROR_INVALID_PLAY_FILE=IWAB0362E Enter a play file.
-
-# Frame titles
-FRAME_TITLE_PERSPECTIVE_WORKAREA=Web Services Explorer Internal Work Area
-FRAME_TITLE_PERSPECTIVE_TOOLBAR=Web Services Explorer Toolbar
-FRAME_TITLE_PERSPECTIVE_CONTENT=Web Services Explorer Page Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_PAGE_LOADER=Page Loader
-FORM_TITLE_PAGE_CONTENT=Loaded Page Content
-FORM_TITLE_LAUNCH_WEBSERVICE_WIZARD=Launch Web Service Wizard Form
-FORM_TITLE_IMPORT_TO_WORKBENCH=Import to Workbench Form
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
deleted file mode 100644
index 78de864b2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/favorites.properties
+++ /dev/null
@@ -1,145 +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
-###############################################################################
-
-title=Favorites
-
-# Navigator
-FAVORITES_MAIN_NODE=Favorites Main
-FAVORITES_WSIL_FOLDER_NODE=Favorite WSILs
-FAVORITES_WSDL_SERVICE_FOLDER_NODE=Favorite WSDL Services
-FAVORITES_UDDI_SERVICE_FOLDER_NODE=Favorite UDDI Services
-FAVORITES_UDDI_BUSINESSES_FOLDER_NODE=Favorite UDDI Businesses
-FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE=Favorite UDDI Service Interfaces
-FAVORITES_UDDI_REGISTRIES_FOLDER_NODE=Favorite UDDI Registries
-
-# Form
-FORM_LABEL_FAVORITE_WSIL=Favorite WSILs
-FORM_LABEL_FAVORITE_WSDL=Favorite WSDLs
-FORM_LABEL_FAVORITE_UDDI_REGISTRY=Favorite UDDI Registries
-FORM_LABEL_FAVORITE_UDDI_SERVICE=Favorite UDDI Services
-FORM_LABEL_FAVORITE_UDDI_BUSINESS=Favorite UDDI Business Entities
-FORM_LABEL_FAVORITE_UDDI_SERVICE_INTERFACE=Favorite UDDI Service Interfaces
-FORM_LABEL_REMOVE=Remove
-FORM_LABEL_IMPORT_TO_WSIL_PERSPECTIVE=Add To WSIL Page
-FORM_LABEL_IMPORT_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_IMPORT_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_NAME=Name
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_BUSINESS_NAME=Business Name
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_NAME=Service Name
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_NAME=Service Interface Name
-FORM_LABEL_SERVICE_INTERFACE_KEY=Service Interface Key
-FORM_LABEL_REGISTRY_URL=<a href="%1" target="_blank">Click here</a> to obtain a user ID and password for this registry.
-FORM_LABEL_USER_DEFINED_CATEGORY_DATA_FILES=Data files for User Defined Categories
-MSG_ERROR_NOTHING_SELECTED=IWAB0315E Select at least one item.
-
-# ListFavoriteWSILAction
-ALT_LIST_FAVORITE_WSIL=List Favorite WSILs
-FORM_LABEL_LIST_FAVORITE_WSIL_DESC=Select a set of favorite WSIL links and press <strong>Add to WSIL Page</strong> to open them in the WSIL navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteWSDLServiceAction
-ALT_LIST_FAVORITE_WSDL_SERVICE=List Favorite WSDL Services
-FORM_LABEL_LIST_FAVORITE_WSDL_SERVICE_DESC=Select a set of favorite WSDL services and press <strong>Remove</strong> to remove them.
-
-# ListFavoriteUDDIServiceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE=List Favorite UDDI Services
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_DESC=Select a set of favorite UDDI services and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIBusinessAction
-ALT_LIST_FAVORITE_UDDI_BUSINESS=List Favorite UDDI Businesses
-FORM_LABEL_LIST_FAVORITE_UDDI_BUSINESS_DESC=Select a set of favorite UDDI businesses and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIRegistryAction
-ALT_LIST_FAVORITE_UDDI_REGISTRY=List Favorite UDDI Registries
-FORM_LABEL_LIST_FAVORITE_UDDI_REGISTRY_DESC=Select a set of favorite UDDI registries and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# ListFavoriteUDDIServiceInterfaceAction
-ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE=List Favorite UDDI Service Interfaces
-FORM_LABEL_LIST_FAVORITE_UDDI_SERVICE_INTERFACE_DESC=Select a set of favorite UDDI service interfaces and press <strong>Add to UDDI Page</strong> to open them in the UDDI navigator. Press <strong>Remove</strong> to remove the selections.
-
-# FavoritesWSILDetailsAction
-ALT_FAVORITES_WSIL_DETAILS=Favorite WSIL Details
-
-# FavoritesWSDLDetailsAction
-ALT_FAVORITES_WSDL_DETAILS=Favorite WSDL Details
-
-# FavoritesUDDIRegistryDetailsAction
-ALT_FAVORITES_UDDI_REGISTRY_DETAILS=Favorite UDDI Registry Details
-
-# FavoritesUDDIBusinessDetailsAction
-ALT_FAVORITES_UDDI_BUSINESS_DETAILS=Favorite UDDI Business Details
-
-# FavoritesUDDIServiceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_DETAILS=Favorite UDDI Service Details
-
-# FavoritesUDDIServiceInterfaceDetailsAction
-ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS=Favorite UDDI Service Interface Details
-
-# AddWSILToWSILPerspectiveAction
-ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE=Add to WSIL Page
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0316E %1 is already opened in WSIL Page.
-MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL=IWAB0317I %1 is added to WSIL Page.
-MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE=IWAB0318E WSIL %1 could not be loaded.
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_TO_UDDI_PERSPECTIVE=Add to UDDI Page
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0320E %1 could not be found in the registry.
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0321I %1 is added to UDDI Page.
-
-# FavoritesAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add to WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0369I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0370E WSDL %1 could not be loaded.
-
-# RemoveFavoriteAction
-ALT_REMOVE_FAVORITE=Remove Favorite
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable.  Do you wish to clear it?
-
-# FavoritesRestoreDefaultFavoritesAction
-ALT_RESTORE_DEFAULT_FAVORITES=Restore Default Favorites
-MSG_CONFIRM_RESTORE_DEFAULT_FAVORITES=This operation will overwrite the current favorites.  Do you wish to continue?
-MSG_ERROR_OPEN_FAVORITES_BACKUP=IWAB0134E Unable to load the default favorites.
-MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT=IWAB0322I Default Favorites are restored.
-MSG_ERROR_SAVE_FAVORITES_WSIL=IWAB0186E Unable to save favorites to %1.
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_REGISTRY_DETAILS=UDDI Registry Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_UDDI_SERVICE_INTERFACE_DETAILS=UDDI Service Interface Details Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESS_LIST=UDDI Businesses List View
-VIEW_TITLE_UDDI_REGISTRY_LIST=UDDI Registries List View
-VIEW_TITLE_UDDI_SERVICE_INTERFACE_LIST=UDDI Service Interfaces List View
-VIEW_TITLE_UDDI_SERVICE_LIST=UDDI Services List View
-VIEW_TITLE_WSDL_SERVICE_LIST=WSDL Services List View
-VIEW_TITLE_WSIL_LIST=WSIL Links List View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
deleted file mode 100644
index 2972b79ee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/uddi.properties
+++ /dev/null
@@ -1,495 +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
-###############################################################################
-
-title=UDDI
-
-# Nodes
-NODE_NAME_UDDI_MAIN=UDDI Main
-NODE_NAME_QUERIES_FOLDER=Executed Queries
-NODE_NAME_PUBLISHED_BUSINESSES_FOLDER=Published Businesses
-NODE_NAME_PUBLISHED_SERVICES_FOLDER=Published Services
-NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER=Published Service Interfaces
-
-# OpenRegistryAction
-ALT_OPEN_REGISTRY=Open Registry
-FORM_LABEL_OPEN_REGISTRY_DESC=Specify the name and inquiry URL of the registry to be opened. Selecting a favorite registry will automatically fill in the required information. Press <strong>Go</strong> to open the registry.
-FORM_LABEL_FAVORITE_REGISTRY=Favorite Registry
-FORM_LABEL_REGISTRY_NAME=Registry Name
-FORM_LABEL_INQUIRY_URL=Inquiry URL
-FORM_LABEL_CHECK_USER_DEFINED_CATEGORIES=Check for user-defined categories
-DEFAULT_REGISTRY_NAME=IBM UDDI Test Registry
-MSG_ERROR_INVALID_REGISTRY_NAME=IWAB0136E Enter a valid registry name.
-MSG_ERROR_INVALID_INQUIRY_URL=IWAB0138E Enter a valid inquiry URL.
-MSG_INFO_REGISTRY_OPENED=IWAB0139I The registry named %1 located at %2 was opened successfully.
-FORM_LABEL_IS_WEBSPHERE_UDDI_REGISTRY=Is WebSphere UDDI registry?
-DEFAULT_REGISTRY_NAME_WEBSPHERE=IBM WebSphere Private UDDI Registry
-FORM_LABEL_REGISTRY_HOST=Host
-FORM_LABEL_REGISTRY_PORT=Port
-
-# User-defined Categories
-FORM_LABEL_ADD_CATEGORY_DATA=<a href="%1">Click here</a> to load this category's data.
-FORM_CONTROL_TITLE_CATEGORY_FILE=Category data file name
-MSG_INFO_NO_USER_DEFINED_CATEGORIES_FOUND=IWAB0371I No user defined categories detected.
-MSG_INFO_NO_CATEGORY_DATA=IWAB0372I Category data for %1 is not available or is invalid.
-MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED=IWAB0373I Data for user defined category %1 was successfully loaded.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY=IWAB0374E Invalid data file for user defined category %1. A category key '%2' was found but '%3' was expected.
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT=IWAB0473E Unknown format in line: %1 of the data file for user defined category %2. The line is: "%3"
-MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE=IWAB0375E Invalid data file for user defined category %1.
-MSG_ERROR_SAVING_CATEGORY_DATA=IWAB0474E An error occured while saving data for category %1. Exception text: %2
-
-# UDDI Category Browser
-TITLE_CATEGORY_BROWSER=Category Browser
-ALT_CATEGORIES=Categories
-
-# Details
-ALT_REGISTRY_DETAILS=Registry Details
-ALT_BUSINESS_DETAILS=Business Details
-ALT_SERVICE_DETAILS=Service Details
-ALT_SERVICE_INTERFACE_DETAILS=Service Interface Details
-FORM_LABEL_DETAILS_EDITABLE=Details for <strong>%1</strong> are shown below. Some items may be added, removed, or changed. Authentication may be required for changes. Other actions are listed at the bottom of this page.
-
-# Get
-ALT_GET=Get
-
-# Common Form Control Title
-FORM_CONTROL_TITLE_NAME_TEXT_VALUE=Name value
-FORM_CONTROL_TITLE_DESCRIPTION_TEXT_VALUE=Description value
-FORM_CONTROL_TITLE_CATEGORY_KEY_NAME=Category key name
-FORM_CONTROL_TITLE_CATEGORY_KEY_VALUE=Category key value
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_NAME=Identifier key name
-FORM_CONTROL_TITLE_IDENTIFIER_KEY_VALUE=Identifier key value
-FORM_CONTROL_TITLE_DISCOVERY_URL=Discovery URL
-
-# Find actions
-ALT_FIND=Find
-ALT_SUBQUERY=Find %1 Subquery
-FORM_LABEL_QUERY_NAME=Name of this query
-DEFAULT_QUERY_NAME=query results
-DEFAULT_SUBQUERY_NAME=%1 - %2 subquery
-FORM_LABEL_SEARCH_FOR=Search for
-FORM_OPTION_BUSINESSES=Businesses
-FORM_OPTION_SERVICES=Services
-FORM_OPTION_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_SEARCH_TYPE=Type of search
-FORM_RADIO_SIMPLE=Simple
-FORM_RADIO_ADVANCED=Advanced
-FORM_RADIO_UUID=UUID
-FORM_LABEL_FIND_BUSINESSES_SIMPLE_DESC=Enter the partial or complete name of a business to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_ADVANCED_DESC=Enter values for one or more of the parameters listed below. The '%' symbol can be used as a wildcard that matches any character in the Name field of the Names table. Authentication may be required. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_BUSINESS_UUID_DESC=Enter the UUID of the business to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_NAMES=Names
-FORM_LINK_ADD=Add
-FORM_LINK_GET=Get
-FORM_LINK_FIND=Find
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_OWNED=Owned
-FORM_LABEL_PUBLISH_URL=Publish URL
-FORM_LABEL_USERID=User ID
-FORM_LABEL_PASSWORD=Password
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_NAME=Name
-FORM_LABEL_DESCRIPTION=Description
-FORM_OPTION_LANGUAGE_EN=English
-FORM_OPTION_LANGUAGE_AA=Afar
-FORM_OPTION_LANGUAGE_AB=Abkhazian
-FORM_OPTION_LANGUAGE_AF=Afrikaans
-FORM_OPTION_LANGUAGE_AM=Amharic
-FORM_OPTION_LANGUAGE_AR=Arabic
-FORM_OPTION_LANGUAGE_AS=Assamese
-FORM_OPTION_LANGUAGE_AY=Aymara
-FORM_OPTION_LANGUAGE_AZ=Azerbaijani
-FORM_OPTION_LANGUAGE_BA=Bashkir
-FORM_OPTION_LANGUAGE_BE=Byelorussian
-FORM_OPTION_LANGUAGE_BG=Bulgarian
-FORM_OPTION_LANGUAGE_BH=Bihari
-FORM_OPTION_LANGUAGE_BI=Bislama
-FORM_OPTION_LANGUAGE_BN=Bengali; Bangla
-FORM_OPTION_LANGUAGE_BO=Tibetan
-FORM_OPTION_LANGUAGE_BR=Breton
-FORM_OPTION_LANGUAGE_CA=Catalan
-FORM_OPTION_LANGUAGE_CO=Corsican
-FORM_OPTION_LANGUAGE_CZ=Czech
-FORM_OPTION_LANGUAGE_CY=Welsh
-FORM_OPTION_LANGUAGE_DA=Danish
-FORM_OPTION_LANGUAGE_DE=German
-FORM_OPTION_LANGUAGE_DZ=Bhutani
-FORM_OPTION_LANGUAGE_EL=Greek
-FORM_OPTION_LANGUAGE_EO=Esperanto
-FORM_OPTION_LANGUAGE_ES=Spanish
-FORM_OPTION_LANGUAGE_ET=Estonian
-FORM_OPTION_LANGUAGE_EU=Basque
-FORM_OPTION_LANGUAGE_FA=Persian
-FORM_OPTION_LANGUAGE_FI=Finnish
-FORM_OPTION_LANGUAGE_FJ=Fiji
-FORM_OPTION_LANGUAGE_FO=Faeroese
-FORM_OPTION_LANGUAGE_FR=French
-FORM_OPTION_LANGUAGE_FY=Frisian
-FORM_OPTION_LANGUAGE_GA=Irish
-FORM_OPTION_LANGUAGE_GD=Scots Gaelic
-FORM_OPTION_LANGUAGE_GL=Galician
-FORM_OPTION_LANGUAGE_GN=Guarani
-FORM_OPTION_LANGUAGE_GU=Gujarati
-FORM_OPTION_LANGUAGE_HA=Hausa
-FORM_OPTION_LANGUAGE_HI=Hindi
-FORM_OPTION_LANGUAGE_HR=Croatian
-FORM_OPTION_LANGUAGE_HU=Hungarian
-FORM_OPTION_LANGUAGE_HY=Armenian
-FORM_OPTION_LANGUAGE_IA=Interlingua
-FORM_OPTION_LANGUAGE_IE=Interlingue
-FORM_OPTION_LANGUAGE_IK=Inupiak
-FORM_OPTION_LANGUAGE_IN=Indonesian
-FORM_OPTION_LANGUAGE_IS=Icelandic
-FORM_OPTION_LANGUAGE_IT=Italian
-FORM_OPTION_LANGUAGE_IW=Hebrew
-FORM_OPTION_LANGUAGE_JA=Japanese
-FORM_OPTION_LANGUAGE_JI=Yiddish
-FORM_OPTION_LANGUAGE_JW=Javanese
-FORM_OPTION_LANGUAGE_KA=Georgian
-FORM_OPTION_LANGUAGE_KK=Kazakh
-FORM_OPTION_LANGUAGE_KL=Greenlandic
-FORM_OPTION_LANGUAGE_KM=Cambodian
-FORM_OPTION_LANGUAGE_KN=Kannada
-FORM_OPTION_LANGUAGE_KO=Korean
-FORM_OPTION_LANGUAGE_KS=Kashmiri
-FORM_OPTION_LANGUAGE_KU=Kurdish
-FORM_OPTION_LANGUAGE_KY=Kirghiz
-FORM_OPTION_LANGUAGE_LA=Latin
-FORM_OPTION_LANGUAGE_LN=Lingala
-FORM_OPTION_LANGUAGE_LO=Laothian
-FORM_OPTION_LANGUAGE_LT=Lithuanian
-FORM_OPTION_LANGUAGE_LV=Latvian, Lettish
-FORM_OPTION_LANGUAGE_MG=Malagasy
-FORM_OPTION_LANGUAGE_MI=Maori
-FORM_OPTION_LANGUAGE_MK=Macedonian
-FORM_OPTION_LANGUAGE_ML=Malayalam
-FORM_OPTION_LANGUAGE_MN=Mongolian
-FORM_OPTION_LANGUAGE_MO=Moldavian
-FORM_OPTION_LANGUAGE_MR=Marathi
-FORM_OPTION_LANGUAGE_MS=Malay
-FORM_OPTION_LANGUAGE_MT=Maltese
-FORM_OPTION_LANGUAGE_MY=Burmese
-FORM_OPTION_LANGUAGE_NA=Nauru
-FORM_OPTION_LANGUAGE_NE=Nepali
-FORM_OPTION_LANGUAGE_NL=Dutch
-FORM_OPTION_LANGUAGE_NO=Norwegian
-FORM_OPTION_LANGUAGE_OC=Occitan
-FORM_OPTION_LANGUAGE_OM=(Afan) Oromo
-FORM_OPTION_LANGUAGE_OR=Oriya
-FORM_OPTION_LANGUAGE_PA=Punjabi
-FORM_OPTION_LANGUAGE_PL=Polish
-FORM_OPTION_LANGUAGE_PS=Pashto, Pushto
-FORM_OPTION_LANGUAGE_PT=Portuguese
-FORM_OPTION_LANGUAGE_QU=Quechua
-FORM_OPTION_LANGUAGE_RM=Rhaeto-Romance
-FORM_OPTION_LANGUAGE_RN=Kirundi
-FORM_OPTION_LANGUAGE_RO=Romanian
-FORM_OPTION_LANGUAGE_RU=Russian
-FORM_OPTION_LANGUAGE_RW=Kinyarwanda
-FORM_OPTION_LANGUAGE_SA=Sanskrit
-FORM_OPTION_LANGUAGE_SD=Sindhi
-FORM_OPTION_LANGUAGE_SG=Sangro
-FORM_OPTION_LANGUAGE_SH=Serbo-Croatian
-FORM_OPTION_LANGUAGE_SI=Singhalese
-FORM_OPTION_LANGUAGE_SK=Slovak
-FORM_OPTION_LANGUAGE_SL=Slovenian
-FORM_OPTION_LANGUAGE_SM=Samoan
-FORM_OPTION_LANGUAGE_SN=Shona
-FORM_OPTION_LANGUAGE_SO=Somali
-FORM_OPTION_LANGUAGE_SQ=Albanian
-FORM_OPTION_LANGUAGE_SR=Serbian
-FORM_OPTION_LANGUAGE_SS=Siswati
-FORM_OPTION_LANGUAGE_ST=Sesotho
-FORM_OPTION_LANGUAGE_SU=Sundanese
-FORM_OPTION_LANGUAGE_SV=Swedish
-FORM_OPTION_LANGUAGE_SW=Swahili
-FORM_OPTION_LANGUAGE_TA=Tamil
-FORM_OPTION_LANGUAGE_TE=Tegulu
-FORM_OPTION_LANGUAGE_TG=Tajik
-FORM_OPTION_LANGUAGE_TH=Thai
-FORM_OPTION_LANGUAGE_TI=Tigrinya
-FORM_OPTION_LANGUAGE_TK=Turkmen
-FORM_OPTION_LANGUAGE_TL=Tagalog
-FORM_OPTION_LANGUAGE_TN=Setswana
-FORM_OPTION_LANGUAGE_TO=Tonga
-FORM_OPTION_LANGUAGE_TR=Turkish
-FORM_OPTION_LANGUAGE_TS=Tsonga
-FORM_OPTION_LANGUAGE_TT=Tatar
-FORM_OPTION_LANGUAGE_TW=Twi
-FORM_OPTION_LANGUAGE_UK=Ukrainian
-FORM_OPTION_LANGUAGE_UR=Urdu
-FORM_OPTION_LANGUAGE_UZ=Uzbek
-FORM_OPTION_LANGUAGE_VI=Vietnamese
-FORM_OPTION_LANGUAGE_VO=Volapuk
-FORM_OPTION_LANGUAGE_WO=Wolof
-FORM_OPTION_LANGUAGE_XH=Xhosa
-FORM_OPTION_LANGUAGE_YO=Yoruba
-FORM_OPTION_LANGUAGE_ZH=Chinese
-FORM_OPTION_LANGUAGE_ZU=Zulu
-FORM_LABEL_EXACT_NAME_MATCH=Exact match
-FORM_LABEL_CASE_SENSITIVE_MATCH=Case sensitive
-FORM_LABEL_SOUNDEX=Sound alike
-FORM_LABEL_IDENTIFIERS=Identifiers
-FORM_LABEL_IDENTIFIER_TYPE=Type
-
-# Do not translate the two items below.
-FORM_OPTION_IDENTIFIER_DUNS=D-U-N-S
-FORM_OPTION_IDENTIFIER_THOMAS_REGISTRY=Thomas Registry
-
-FORM_LABEL_KEY_NAME=Key name
-FORM_LABEL_KEY_VALUE=Key value
-FORM_LABEL_CATEGORIES=Categories
-FORM_LABEL_CATEGORY_TYPE=Type
-FORM_OPTION_CATEGORY_NAICS=NAICS
-FORM_OPTION_CATEGORY_UNSPSC_73=UNSPSC 7.3
-FORM_OPTION_CATEGORY_GEO=GEO
-FORM_OPTION_CATEGORY_DWCOMMUNITY=dW Community
-FORM_LABEL_BUSINESS_CATEGORIES=Compare with:
-FORM_OPTION_BUSINESSES_ONLY=Businesses only
-FORM_OPTION_SERVICES_ONLY=Services only
-FORM_OPTION_BOTH=Businesses and Services
-FORM_LABEL_DISCOVERYURLS=Discovery URLs
-FORM_LABEL_DISCOVERYURL=Discovery URL
-FORM_LABEL_FINDQUALIFIERS=Find Qualifiers
-FORM_LABEL_COMBINE_KEYS=Combine keys:
-FORM_OPTION_ANDALLKEYS=And
-FORM_OPTION_ORALLKEYS=Or
-FORM_OPTION_ORLIKEKEYS=Or Like
-FORM_LABEL_SORT_BY_NAME=Sort by name:
-FORM_RADIO_SORT_ASC=Ascending
-FORM_RADIO_SORT_DESC=Descending
-FORM_LABEL_SORT_BY_DATE=Sort by date:
-FORM_LABEL_MAX_SEARCH_SET=Maximum size of search set:
-FORM_LABEL_MAX_RESULTS=Maximum number of results:
-FORM_LABEL_FIND_SERVICES_SIMPLE_DESC=Enter the partial or complete name of a service to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_UUID_DESC=Enter the UUID of the service to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACES_SIMPLE_DESC=Enter the partial or complete name of a service interface to search for. The '%' symbol can be used as a wildcard that matches any character. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_FIND_SERVICE_INTERFACE_UUID_DESC=Enter the UUID of the service interface to search for. Press <strong>Go</strong> to execute the search.
-FORM_LABEL_SERVICE_INTERFACES=Service Interfaces
-FORM_LABEL_UUID_KEY=UUID Key:
-FORM_LABEL_USE_SERVICE=Use service
-FORM_LABEL_SERVICE=Service
-FORM_LABEL_BUSINESS=Business
-FORM_LABEL_PUBLISH_ASSERTIONS=Publisher Assertions
-FORM_LABEL_DIRECTION=Direction
-FORM_LABEL_FROM_KEY=From Key
-FORM_LABEL_TO_KEY=To Key
-FORM_LABEL_STATUS=Status
-FORM_LABEL_ASSERTION_TYPE=Assertion Type
-FORM_OPTION_ASSERTION_TYPE_PARENT_CHILD=Parent-Child
-FORM_OPTION_ASSERTION_TYPE_PEER_TO_PEER=Peer-Peer
-FORM_OPTION_ASSERTION_TYPE_IDENTITY=Identity
-FORM_LABEL_ASSERTION_DIRETION_DESC=Direction <strong>From</strong> will create a publisher assertion from this business to the businesses above.  Direction <strong>To</strong> will create a publisher assertion from the above businesses to this business.
-FORM_OPTION_ASSERTION_DIRECTION_FROM=--->
-FORM_OPTION_ASSERTION_DIRECTION_TO=<---
-FORM_LABEL_THIS_BUSINESS=This
-MSG_ERROR_INVALID_QUERY_NAME=IWAB0140E Enter a valid name for the query.
-MSG_ERROR_INVALID_NAMES=IWAB0141E Enter a series of valid names.
-MSG_ERROR_INVALID_PUBLISH_URL=IWAB0142E Enter a valid publish URL.
-MSG_ERROR_INVALID_USERID=IWAB0143E Enter a valid user ID.
-MSG_ERROR_INVALID_MAX_SEARCH_SET=IWAB0145E Enter a valid size for the maximum search set.
-MSG_ERROR_INVALID_MAX_RESULTS=IWAB0146E Enter a valid size for the maximum number of results.
-MSG_INFO_BUSINESSES_FOUND=IWAB0147I Number of businesses found: %1
-MSG_ERROR_NO_BUSINESSES_FOUND=IWAB0148E No businesses found.
-MSG_INFO_SERVICES_FOUND=IWAB0149I Number of services found: %1
-MSG_ERROR_NO_SERVICES_FOUND=IWAB0150E No services found.
-MSG_ERROR_SINGLE_ITEM=IWAB0151E Select just one item.
-MSG_QUESTION_ITEM_REPLACEMENT=The selection will replace an item already in the target. Do you wish to proceed?
-MSG_INFO_SERVICE_INTERFACES_FOUND=IWAB0152I Number of service interfaces found: %1
-MSG_ERROR_NO_SERVICE_INTERFACES_FOUND=IWAB0153E No service interfaces found.
-MSG_ERROR_NOTHING_SELECTED=IWAB0154E Select at least one item.
-MSG_ERROR_INVALID_UUID_KEY=IWAB0155E Enter a valid UUID key.
-MSG_ERROR_QUERY_NAME_CONFLICT=IWAB0156E The subquery's query name cannot be the same as the originator.
-MSG_ERROR_NO_ITEMS_TO_GET=IWAB0157E No items of the specified type have been published or discovered yet.
-
-# Results
-ALT_QUERY_RESULTS=Query Results
-FORM_LABEL_SUBQUERY=The results may be used as inputs of another operation. Click the <strong>target</strong> link at the top to see the operation. Selected results can be used in the operation by clicking the <strong>Transfer</strong> button.
-FORM_LABEL_QUERY=Select a result to see more details or select a set of results and click a button to perform an operation.
-FORM_LINK_TARGET=target
-FORM_BUTTON_TRANSFER=Transfer
-FORM_BUTTON_REFRESH=Refresh
-FORM_BUTTON_ADD_TO_FAVORITES=Add to favorites
-FORM_BUTTON_UNPUBLISH=Unpublish
-FORM_BUTTON_CLEAR=Clear
-
-# Publish actions
-ALT_PUBLISH=Publish
-FORM_LABEL_PUBLISH=Publish:
-FORM_OPTION_BUSINESS=Business
-FORM_OPTION_SERVICE=Service
-FORM_OPTION_SERVICE_INTERFACE=Service Interface
-FORM_LABEL_PUBLISH_BUSINESS_SIMPLE_DESC=Enter a name and an optional description for the business to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_BUSINESS_ADVANCED_DESC=Provide a name for the business to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_SIMPLE_DESC=Get or find a business and then provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_ADVANCED_DESC=Get or find a business and then provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_SIMPLE_DESC=Provide the WSDL URL, name and an optional description for the service to be published. Authentication may be required.
-FORM_LABEL_BUSINESS_PUBLISH_SERVICE_ADVANCED_DESC=Provide the WSDL URL and a name for the service to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_SIMPLE_DESC=Enter a WSDL URL, name and an optional description for the service interface to be published. Authentication may be required.
-FORM_LABEL_PUBLISH_SERVICE_INTERFACE_ADVANCED_DESC=Provide the WSDL URL and name for the service interface to be published. Other parameters may also be specified. Authentication may be required.
-FORM_LABEL_PUBLISH_FORM=Publication format
-FORM_LABEL_DESCRIPTION=Description
-FORM_LABEL_DESCRIPTIONS=Descriptions
-MSG_INFO_BUSINESS_PUBLISHED=IWAB0158I Business %1 was successfully published.
-MSG_INFO_SERVICE_PUBLISHED=IWAB0159I Service %1 was successfully published.
-MSG_INFO_SERVICE_INTERFACE_PUBLISHED=IWAB0160I Service interface %1 was successfully published.
-MSG_ERROR_INVALID_NAME=IWAB0161E Enter a valid name.
-MSG_ERROR_ROW_BLANK_LANGUAGE=IWAB0250E Select a non-blank language for the %1 in row %2. Only the first row can have a blank language.
-MSG_ERROR_ROW_DUPLICATE_LANGUAGE=IWAB0251E Change the language for the %1 in row %2. The current one is already in use.
-MSG_ERROR_ROW_INVALID_TEXT=IWAB0252E Enter a valid %1 in row %2
-MSG_ERROR_INVALID_WSDL_URL=IWAB0253E Enter a valid WSDL URL.
-MSG_ERROR_NO_NAMES=IWAB0254E Add at least one name.
-MSG_ERROR_INVALID_SERVICE=IWAB0255E Provide a valid service.
-MSG_ERROR_INVALID_BUSINESS=IWAB0256E Provide a valid business.
-
-# Business Publish Service action
-ALT_PUBLISH_SERVICE=Publish Service
-
-# WSDL Browser
-TITLE_WSDL_BROWSER=WSDL Browser - %1
-FORM_LABEL_WSDL_SOURCE=Select a WSDL source:
-FORM_LABEL_WSDL_SOURCE_WEBPROJECTS=Web Projects
-FORM_LABEL_WSDL_SOURCE_FAVORITES=Favorites
-FORM_LABEL_WEB_PROJECT=Web Project
-FORM_LABEL_WSDL_URL=WSDL URL
-ALT_WSDL_BROWSER=WSDL Browser
-
-# Details
-FORM_LINK_EDIT=Edit
-FORM_LINK_CANCEL=Cancel
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_SERVICE_INTERFACE_KEY=TModel Key
-FORM_LABEL_USER_DEFINED_CATEGORIES=User Defined Categories
-FORM_LABEL_CHECKED=Checked
-FORM_LABEL_FILE=File
-MSG_QUESTION_PUBLISH_ITEM=The item could not be found in the registry. Do you wish to publish it?
-MSG_QUESTION_SERVICE_PUBLISH_BUSINESS=The service and its business could not be found in the registry. Proceed to publish?
-MSG_INFO_BUSINESS_UPDATED=IWAB0257I Business %1 was successfully updated.
-MSG_INFO_SERVICE_UPDATED=IWAB0258I Service %1 was successfully updated.
-MSG_INFO_SERVICE_INTERFACE_UPDATED=IWAB0259I Service Interface %1 was successfully updated.
-MSG_INFO_REGISTRY_UPDATED=IWAB0323I Registry %1 was successfully updated.
-
-# UnpublishAction
-ALT_UNPUBLISH_BUSINESS=Unpublish Business
-ALT_UNPUBLISH_SERVICE=Unpublish Service
-ALT_UNPUBLISH_SERVICE_INTERFACE=Unpublish Service Interface
-FORM_LABEL_UNPUBLISH_DESC=Press <strong>Go</strong> to unpublish this object. Authentication may be required.
-MSG_INFO_BUSINESS_UNPUBLISHED=IWAB0260I Business %1 was successfully unpublished.
-MSG_INFO_SERVICE_UNPUBLISHED=IWAB0261I Service %1 was successfully unpublished.
-MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED=IWAB0262I Service Interface %1 was successfully unpublished.
-
-# Add to WSDL Perspective
-ALT_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE=IWAB0376I %1 was successfully added to WSDL page.
-MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE=IWAB0377E %1 could not be added to WSDL page.
-
-# Add to Favorites
-ALT_ADD_TO_FAVORITES=Add To Favorites
-MSG_INFO_FAVORITE_ADDED=IWAB0263I %1 was successfully added to favorites.
-MSG_ERROR_FAVORITE_NOT_ADDED=IWAB0264E %1 could not be added to favorites.
-MSG_ERROR_FAVORITE_ALREADY_EXISTS=IWAB0324E %1 already exists in favorties.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists.  Do you wish to overwrite?
-
-# Refresh
-MSG_INFO_NODE_REFRESHED=IWAB0265I %1 refreshed.
-MSG_QUESTION_REMOVE_NODE=%1 could not be found in the registry. Do you wish to clear it?
-
-# ManageReferencedServices
-ALT_MANAGE_REFERENCED_SERVICES=Manage Referenced Services
-FORM_LABEL_MANAGE_REFERENCED_SERVICES_DESC=Add discovered or published services to the list of referenced services by clicking the <strong>Add Services</strong> button. Remove selected references by clicking the <strong>Remove References</strong> button. Authentication may be required for changes.
-FORM_LABEL_REFERENCED_SERVICES=Referenced Services
-FORM_BUTTON_ADD_SERVICES=Add Services
-FORM_BUTTON_REMOVE_REFERENCES=Remove References
-MSG_ERROR_NO_REFERENCE_SELECTED=IWAB0266E Select at least one referenced service before proceeding.
-MSG_ERROR_NO_SERVICES=IWAB0267E Get or find at least one service before proceeding.
-MSG_ERROR_SERVICE_NOT_REFERENCED=IWAB0268E Service %1 could not be referenced.
-MSG_ERROR_REFERENCE_NOT_REMOVED=IWAB0269E Service reference %1 could not be removed.
-MSG_INFO_SERVICE_REFERENCED=IWAB0270I Service %1 was successfully referenced.
-MSG_INFO_SERVICE_REFERENCE_REMOVED=IWAB0271I Service reference %1 was successfully removed.
-
-# ManagePublisherAssertions
-ALT_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions
-FORM_LABEL_MANAGE_PUBLISHER_ASSERTIONS_DESC=Add discovered or published businesses to the list of publisher assertions by clicking <strong>Add Assertions</strong>. Remove selected assertions by clicking <strong>Remove Assertions</strong>. Complete selected assertions by clicking <strong>Complete Assertions</strong>. Click <strong>Refresh Assertions</strong> to refresh the list of assertions.
-FORM_LABEL_INCOMPLETE_ASSERTIONS_VISIBILITY_DESC=Please note that incomplete publisher assertions are visible only to the owner of the business.
-FORM_LABEL_BUSINESSES=Businesses
-FORM_BUTTON_SHOW_ALL_PUBLISHER_ASSERTIONS=Refresh Assertions
-FORM_BUTTON_COMPLETE_PUBLISHER_ASSERTIONS=Complete Assertions
-FORM_BUTTON_ADD_PUBLISHER_ASSERTIONS=Add Assertions
-FORM_BUTTON_REMOVE_PUBLISHER_ASSERTIONS=Remove Assertions
-MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED=IWAB0325I Publisher Assertions are refreshed.
-MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED=IWAB0326E Select at least one incomplete publisher assertion.
-MSG_ERROR_NOT_OWNED_BUSINESS=IWAB0327E This operation cannot be performed on a business owned by another party.
-
-# GetBusinesses
-ALT_GET_BUSINESS=Get Business
-ALT_GET_BUSINESSES=Get Businesses
-NODE_NAME_SERVICE_BUSINESS=Business for service %1
-NODE_NAME_SI_BUSINESSES=Businesses for service interface %1
-MSG_QUESTION_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServiceInterfaces
-ALT_GET_SERVICE_INTERFACES=Get Service Interfaces
-NODE_NAME_SERVICE_SERVICE_INTERFACES=Service interfaces for service %1
-MSG_QUESTION_GET_SI_REMOVE_SERVICE_NODE=The service could not be found in the registry. Do you wish to remove this node?
-
-# GetServices
-ALT_GET_SERVICES=Get Services
-NODE_NAME_SI_SERVICES=Services for service interface %1
-NODE_NAME_BUSINESS_SERVICES=Services for business %1
-MSG_QUESTION_REMOVE_SI_NODE=The service interface could not be found in the registry. Do you wish to remove this node?
-MSG_QUESTION_REMOVE_BUSINESS_NODE=The business could not be found in the registry. Do you wish to remove this node?
-
-# RefreshUDDINodesAction
-MSG_ERROR_NODE_DATA_VALIDATION_FAILED=IWAB0272E %1 could not be found in the registry.
-
-# Summaries
-ALT_SUMMARY_QUERIES=Summary of Queries
-ALT_SUMMARY_BUSINESSES=Summary of Businesses
-ALT_SUMMARY_SERVICES=Summary of Services
-ALT_SUMMARY_SERVICE_INTERFACES=Summary of Service Interfaces
-FORM_LABEL_QUERIES=Queries
-
-# SelectSubQueryItemAction
-MSG_QUESTION_ITEM_VALIDATION_FAILED=%1 could not be found in the registry. Do you wish to remove it?
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_UDDI_PERSPECTIVE_CONTENT=UDDI Page Content
-FRAME_TITLE_CATEGORIES_WORKAREA=Categories Work Area
-FRAME_TITLE_CATEGORIES_TOOLBAR=Categories Toolbar
-FRAME_TITLE_CATEGORIES_CONTENT=Categories Content
-FRAME_TITLE_WSDL_TOOLBAR=WSDL Browser Toolbar
-FRAME_TITLE_WSDL_CONTENT=WSDL Browser Content
-
-# Form titles
-FORM_TITLE_BUSINESS_DETAILS=Business Details Form
-FORM_TITLE_BUSINESS_PUBLISH_SERVICE=Business Publish Service Form
-FORM_TITLE_GET_FORM=Select from Discovered and Published Objects Form
-FORM_TITLE_ITEMS_SUMMARY=Summary of Items Form
-FORM_TITLE_MANAGE_PUBLISHER_ASSERTIONS=Manage Publisher Assertions Form
-FORM_TITLE_MANAGE_REFERENCED_SERVICES=Manage Referenced Services Form
-FORM_TITLE_OPEN_REGISTRY=Open Registry Form
-FORM_TITLE_REGISTRY_DETAILS=Registry Details Form
-FORM_TITLE_REGISTRY_PUBLISH=Registry Publish Form
-FORM_TITLE_REGISTRY_FIND=Registry Find Form
-FORM_TITLE_RESULTS=Results Form
-FORM_TITLE_SERVICE_DETAILS=Service Details Form
-FORM_TITLE_SERVICE_INTERFACE_DETAILS=Service Interface Details Form
-FORM_TITLE_UNPUBLISH=Unpublish Form
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
deleted file mode 100644
index f53ffe4ea..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsdl.properties
+++ /dev/null
@@ -1,155 +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
-###############################################################################
-
-title=WSDL
-
-# Nodes
-NODE_NAME_WSDL_MAIN=WSDL Main
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_WSDL_PERSPECTIVE_CONTENT=WSDL Page Content
-FRAME_TITLE_XSD_INFORMATION_TOOLBAR=XSD Information Dialog Toolbar
-FRAME_TITLE_XSD_INFORMATION_CONTENT=XSD Information Dialog Content
-
-# OpenWSDLAction
-ALT_OPEN_WSDL=Open WSDL
-MSG_ERROR_INVALID_WSDL_URL=IWAB0378E Enter a valid WSDL URL.
-MSG_ERROR_OPEN_WSDL=IWAB0379E Unable to open %1.
-MSG_ERROR_XSD_VALIDATION=IWAB0380E Errors were encountered while validating XML schemas.
-MSG_INFO_OPEN_WSDL_SUCCESSFUL=IWAB0381I %1 was successfully opened.
-
-# WSDL Element details
-ALT_WSDL_DETAILS=WSDL Details
-FORM_LABEL_WSDL_DETAILS_DESC=Shown below are the details for this WSDL document. Click on a service or binding to see its details.
-
-# WSDL Service Element details
-ALT_WSDL_SERVICE_DETAILS=WSDL Service Details
-FORM_LABEL_SERVICE_DETAILS_DESC=Shown below are the details for this &lt;service&gt; element. Click on a binding to see its operations.
-
-# WSDL Binding Element details
-ALT_WSDL_BINDING_DETAILS=WSDL Binding Details
-FORM_LABEL_BINDING_DETAILS_DESC=Shown below are the details for this <strong>%1</strong>  &lt;binding&gt; element. Click on an operation to fill in its parameters and invoke it or specify additional endpoints.
-
-# InvokeWSDLOperationAction
-ALT_INVOKE_WSDL_OPERATION=Invoke a WSDL Operation
-MSG_ERROR_UNABLE_TO_CONNECT=IWAB0382E Unable to connect to %1
-MSG_ERROR_VALIDATING_PARAMETER=IWAB0383E Error validating %1
-
-# WSDLAddToFavoritesAction
-ALT_ADD_WSDL_TO_FAVORITES=Add WSDL To Favorites
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0384E %1 already exists in favorites.
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0385E Unable to add %1 to favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0386I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists.  Do you wish to overwrite?
-
-# RefreshWSDLAction
-MSG_INFO_REFRESH_WSDL_SUCCESSFUL=IWAB0387I %1 is refreshed.
-MSG_QUESTION_REMOVE_WSDL_NODE=%1 is no longer resolvable.  Do you wish to clear it?
-
-# UpdateWSDLBindingAction
-MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL=IWAB0388I Endpoints were successfully updated.
-
-# Form titles
-FORM_TITLE_OPEN_WSDL=Open WSDL Form
-FORM_TITLE_WSDL_DETAILS=WSDL Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSDL_BINDING_DETAILS=WSDL Binding Details Form
-FORM_TITLE_INVOKE_WSDL_OPERATION=WSDL Operation Form
-
-# Form Labels
-FORM_LABEL_OPEN_WSDL_DESC=Enter the URL of a WSDL document and click <strong>Go</strong> to explore.
-FORM_LABEL_SERVICES=Services
-FORM_LABEL_BINDINGS=Bindings
-FORM_LABEL_OPERATIONS=Operations
-FORM_LABEL_BINDING_TYPE=Type
-FORM_LABEL_BINDING_TYPE_UNSUPPORTED=Unsupported
-FORM_LABEL_BINDING_TYPE_SOAP=SOAP
-FORM_LABEL_BINDING_TYPE_HTTP_GET=HTTP GET
-FORM_LABEL_BINDING_TYPE_HTTP_POST=HTTP POST
-FORM_LABEL_NAME=Name
-FORM_LABEL_DOCUMENTATION=Documentation
-FORM_LABEL_ENDPOINT=Endpoint
-FORM_LABEL_INVOKE_WSDL_OPERATION_DESC=Enter the parameters of this WSDL operation and click <strong>Go</Strong> to invoke.
-FORM_LINK_ADD=Add
-FORM_LINK_REMOVE=Remove
-FORM_LABEL_VALUES=Values
-FORM_LABEL_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_LABEL_UNION_TYPE=Union types
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_XSD_APPLICATION_INFORMATION=Application Information
-FORM_LABEL_XSD_DOCUMENTATION=Documentation
-FORM_LABEL_SOAP_REQUEST_ENVELOPE=SOAP Request Envelope:
-FORM_LABEL_SOAP_RESPONSE_ENVELOPE=SOAP Response Envelope:
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_UP=Move element up
-FORM_LABEL_GROUP_ALL_ORDERING_MOVE_DOWN=Move element down
-FORM_LABEL_BASE_TYPE=Base type
-FORM_LABEL_UNBOUNDED=Unbounded
-FORM_LABEL_LENGTH=Length
-FORM_LABEL_LENGTH_VALUE=[%1..%2]
-FORM_LABEL_PATTERN=Pattern
-FORM_LABEL_WHITESPACE=Whitespace
-FORM_LABEL_RANGE_OF_VALUES=Range of values
-FORM_LABEL_MIN_EXCLUSIVE=(%1..
-FORM_LABEL_MIN_INCLUSIVE=[%1..
-FORM_LABEL_MAX_EXCLUSIVE=%1)
-FORM_LABEL_MAX_INCLUSIVE=%1]
-FORM_LABEL_TOTAL_DIGITS=Total digits
-FORM_LABEL_FRACTION_DIGITS=Fraction digits
-FORM_LABEL_OCCURANCE=Occurance of
-FORM_LABEL_UNION_MEMBERS=Union Members
-FORM_LABEL_LIST_ITEMS=List items
-FORM_LABEL_ELEMENTS=Elements
-FORM_LABEL_SOAP_ENC_ARRAYS=SOAP Arrays
-FORM_LABEL_CONTENT=Content
-FORM_LABEL_ATOMIC_NAME_TYPE=%1 (%2):
-FORM_LABEL_NULL=null
-FORM_LABEL_GROUP_NUMBER=Group %1
-FORM_LABEL_CHOICES=Choices
-FORM_LABEL_NOTHING_TO_DISPLAY_IN_FORM_VIEW=There is nothing to be displayed in the form view.  Please switch to the source view for the SOAP request and response.
-FORM_LABEL_SOAP_RESPONSE_FAILED_VALIDATION_IN_FORM_VIEW=The SOAP response failed schema validation.  Please switch to the source view for the SOAP response in XML format.
-FORM_LABEL_END_POINTS=Endpoints
-
-# Source/Form views
-FORM_LINK_FORM=Form
-ALT_SWITCH_TO_FORM_VIEW=Switch to form view
-FORM_LINK_SOURCE=Source
-ALT_SWITCH_TO_SOURCE_VIEW=Switch to source view
-FORM_LABEL_FRAGMENT_SOAP_VIEW_CONTENT=Soap Body:
-BUTTON_LABEL_LOAD=Load
-BUTTON_LABEL_SAVE_AS=Save As...
-MSG_QUESTION_SYNC_VIEWS=Format of the source content may be altered as a result of switching to the form view.  Do you wish to process?
-MSG_QUESTION_SYNC_VIEWS_DESPITE_INVALID_SOURCE_CONTENT=Content of the source view failed schema validation.  Synchronize anyways?  (Content of the source view may be modified)
-
-# Form control titles
-FORM_CONTROL_TITLE_ENABLE_DISABLE_GROUP=Enable/Disable group
-FORM_CONTROL_TITLE_SELECT_ELEMENT_IN_GROUP=Select element in group
-FORM_CONTROL_TITLE_SELECT_UNION_TYPE=Select union type
-FORM_CONTROL_TITLE_SOAP_FILE=SOAP data file
-
-# XSD Information Dialog
-TITLE_XSD_INFORMATION_DIALOG=XSD Information Dialog
-
-# Error messages
-MSG_ERROR_NOTHING_SELECTED=IWAB0389E Select at least one item.
-MSG_ERROR_MAX_OCCURS_VIOLATION=IWAB0390E Maximum occurance is reached.
-MSG_ERROR_MIN_OCCURS_VIOLATION=IWAB0391E Minimum occurance is reached.
-MSG_ERROR_CANNOT_MOVE_FIRST_ELEMENT_UP=IWAB0392E Selected element is already the first in the group.
-MSG_ERROR_CANNOT_MOVE_LAST_ELEMENT_DOWN=IWAB0393E Selected element is already the last in the group.
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
deleted file mode 100644
index b64c5b731..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-properties/wsil.properties
+++ /dev/null
@@ -1,163 +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
-###############################################################################
-
-title=WSIL
-
-# Navigator
-WSIL_MAIN_NODE=WSIL Main
-
-# Forms
-FORM_LABEL_URL=URL
-FORM_LABEL_ITEM_NUMBER=Item #
-FORM_LABEL_UDDI_BUSINESS_NAME=UDDI Business Name
-FORM_LABEL_UDDI_SERVICE_NAME=UDDI Service Name
-FORM_LABEL_LANGUAGE=Language
-FORM_LABEL_ABSTRACT=Abstract
-FORM_LABEL_NAME=Name
-FORM_LABEL_WSDL_BINDINGS=WSDL Bindings
-FORM_LABEL_NAMESPACE_URI=Namespace URI
-FORM_LABEL_LOCAL_NAME=Local Name
-FORM_LABEL_INQUIRY_API=Inquiry API
-FORM_LABEL_SERVICE_KEY=Service Key
-FORM_LABEL_BUSINESS_KEY=Business Key
-FORM_LABEL_DISCOVERY_URL=Discovery URL
-FORM_LABEL_WSIL=WSIL Details
-FORM_LABEL_WSIL_LINKS=WSIL Links
-FORM_LABEL_WSDL_SERVICE=WSDL Services
-FORM_LABEL_UDDI_SERVICE=UDDI Services
-FORM_LABEL_UDDI_BUSINESS=UDDI Businesses
-FORM_LABEL_ADD_TO_NAVIGATOR=Add To Navigator
-FORM_LABEL_ADD_TO_FAVORITES=Add To Favorites
-FORM_LABEL_ADD_TO_UDDI_PERSPECTIVE=Add To UDDI Page
-FORM_LABEL_ADD_TO_WSDL_PERSPECTIVE=Add To WSDL Page
-FORM_LABEL_REFRESH=Refresh
-FORM_LABEL_NA=N/A
-FORM_LABEL_UNAVAILABLE_UDDI_SERVICE=Service Unavailable:
-FORM_LABEL_UNAVAILABLE_UDDI_BUSINESS=Business Unavailable:
-FORM_LABEL_CHOOSE_WSIL_INSPECTION_TYPE=Choose the type of objects to inspect:
-MSG_ERROR_NOTHING_SELECTED=IWAB0328E Select at least one item.
-
-# OpenWSILAction
-ALT_OPEN_WSIL=Open WSIL
-FORM_LABEL_OPEN_WSIL_DESC=Enter the URL of a WSIL document or a HTML document and click <strong>Go</strong> to open inspect.
-WSIL_URL=URL to document:
-MSG_ERROR_INVALID_WSIL_URL=IWAB0394E %1 is not a valid WSIL URL or HTML URL.
-MSG_ERROR_WSIL_ALREADY_OPENED=IWAB0329E %1 is already opened in the navigator.
-MSG_INFO_OPEN_WSIL_SUCCESSFUL=IWAB0330I %1 was successfully opened.
-
-# OpenWSILLinkAction
-ALT_OPEN_WSIL_LINK=Open WSIL Link
-MSG_ERROR_WSIL_LINK_ALREADY_OPENED=IWAB0331E %1 is already opened in the navigator
-MSG_INFO_OPEN_WSIL_LINK_SUCCESSFUL=IWAB0332I %1 was successfully opened.
-
-# WsilDetailsAction
-ALT_WSIL_DETAILS=WSIL Details
-
-# WsilServiceDetailsAction
-ALT_WSIL_SERVICE_DETAILS=WSIL Service Details
-
-# UddiLinkDetailsAction
-ALT_UDDI_LINK_DETAILS=UDDI Business Details
-
-# WsilLinkDetailsAction
-ALT_WSIL_LINK_DETAILS=WSIL Link Details
-
-# ListWSDLServicesAction
-ALT_LIST_WSDL_SERVICES=List All WSDL Services
-FORM_LABEL_LIST_WSDL_SERVICES_DESC=Select a set of WSDL services and click <strong>Add to Favorites</strong> to add these to the list of favorites.
-
-# ListUDDIServicesAction
-ALT_LIST_UDDI_SERVICES=List All UDDI Services
-FORM_LABEL_LIST_UDDI_SERVICES_DESC=Select a set of UDDI services and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add the selections to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListUDDIBusinessesAction
-ALT_LIST_UDDI_LINKS=List All UDDI Businesses
-FORM_LABEL_LIST_UDDI_BUSINESSES_DESC=Select a set of UDDI businesses and click <strong>Add to Favorites</strong> to add these to the list of favorites. Click <strong>Add to UDDI Page</strong> to add these to the UDDI Page. Click <strong>Refresh</strong> to refresh the selections.
-
-# ListWSILLinksAction
-ALT_LIST_WSIL_LINKS=List All WSIL Links
-FORM_LABEL_LIST_WSIL_LINKS=Select a set of WSIL links and press <strong>Add to Navigator</strong> to open them in the navigator.
-
-# ClearWSILAction
-ALT_CLEAR_WSIL=Clear WSIL
-
-# RefreshAction
-ALT_REFRESH_WSIL=Refresh WSIL
-ALT_REFRESH_UDDI_BUSINESS=Refresh UDDI Business
-ALT_REFRESH_UDDI_SERVICE=Refresh UDDI Service
-MSG_ERROR_WSIL_NOT_FOUND=IWAB0333E WSIL %1 could not be loaded.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0334E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0335E Service %1 could not be found in the registry.
-MSG_INFO_REFRESH_SUCCESSFUL=IWAB0336I %1 is refreshed.
-MSG_CONFIRM_REMOVE_NODE=%1 is no longer resolvable.  Do you wish to clear it?
-
-# AddToUDDIPerspectiveAction
-ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE=Add Business To UDDI Page
-ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE=Add Service To UDDI Page
-MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL=IWAB0337I %1 is added to UDDI Page.
-MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE=IWAB0338E Unable to add %1 to UDDI Page.
-MSG_ERROR_BUSINESS_NOT_FOUND=IWAB0339E Business %1 could not be found in the registry.
-MSG_ERROR_SERVICE_NOT_FOUND=IWAB0340E Service %1 could not be found in the registry.
-
-# WsilAddToWSDLPerspectiveAction
-ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE=Add WSDL To WSDL Page
-MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL=IWAB0395I %1 is added to WSDL Page.
-MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE=IWAB0396E %1 could not be loaded.
-
-# AddWSILToFavoritesAction
-ALT_ADD_WSIL_TO_FAVORITES=Add WSIL To Favorites
-MSG_ERROR_ADD_TO_FAVORITES=IWAB0341E Unable to add %1 to favorites.
-MSG_ERROR_FAVORITES_ALREADY_EXISTS=IWAB0342E %1 already exists in favorites.
-MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL=IWAB0343I %1 is added to favorites.
-MSG_QUESTION_OVERWRITE_FAVORITES=Favorite already exists.  Do you wish to overwrite?
-
-# AddWSDLServiceToFavoritesAction
-ALT_ADD_WSDL_SERVICE_TO_FAVORITES=Add WSDL To Favorites
-
-# AddBusinessToFavoritesAction
-ALT_ADD_UDDI_BUSINESS_TO_FAVORITES=Add UDDI Business To Favorites
-
-# AddServiceToFavoritesAction
-ALT_ADD_SERVICE_TO_FAVORITES=Add UDDI Service To Favorites
-
-# WSILImportWSILToWorkbench
-ATL_IMPORT_WSIL_TO_WORKBENCH=Import WSIL To Workbench
-FORM_LABEL_IMPORT_WSIL_TO_WORKBENCH_DESC=Select a workbench project to save the WSIL file into. You may also change the name of the WSIL file.
-
-# ImportToFileSystemAction
-ALT_WSIL_IMPORT_TO_FS=Import WSIL To File System
-ALT_WSDL_IMPORT_TO_FS=Import WSDL To File System
-
-# Frame titles
-FRAME_TITLE_NAVIGATOR_CONTAINER=Navigator Container
-FRAME_TITLE_NAVIGATOR_TOOLBAR=Navigator Toolbar
-FRAME_TITLE_NAVIGATOR_CONTENT=Navigator Content
-FRAME_TITLE_ACTIONS_CONTAINER=Actions Container
-FRAME_TITLE_PROPERTIES_CONTAINER=Properties Container
-FRAME_TITLE_PROPERTIES_CONTENT=Properties Content
-FRAME_TITLE_PROPERTIES_TOOLBAR=Properties Toolbar
-FRAME_TITLE_STATUS_CONTAINER=Status Container
-FRAME_TITLE_STATUS_CONTENT=Status Content
-FRAME_TITLE_STATUS_TOOLBAR=Status Toolbar
-
-# Form titles
-FORM_TITLE_OPEN_WSIL=Open WSIL Form
-FORM_TITLE_UDDI_BUSINESS_DETAILS=UDDI Business Details Form
-FORM_TITLE_UDDI_SERVICE_DETAILS=UDDI Service Details Form
-FORM_TITLE_WSDL_SERVICE_DETAILS=WSDL Service Details Form
-FORM_TITLE_WSIL_DETAILS=WSIL Details Form
-FORM_TITLE_WSIL_LINK_DETAILS=WSIL Link Details Form
-
-# View titles
-VIEW_TITLE_UDDI_BUSINESSES=UDDI Businesses View
-VIEW_TITLE_UDDI_SERVICES=UDDI Services View
-VIEW_TITLE_WSDL_SERVICES=WSDL Services View
-VIEW_TITLE_WSIL_LINKS=WSIL Links View
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
deleted file mode 100644
index 76b2d0217..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/Action.java
+++ /dev/null
@@ -1,124 +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.wst.ws.internal.explorer.platform.actions;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class Action
-{
-  protected Controller controller_;
-  protected Hashtable propertyTable_;
-  protected Vector removedProperties_;
-
-  public Action()
-  {
-    this(null);
-  }
-
-  public Action(Controller controller)
-  {
-    controller_ = controller;
-    propertyTable_ = new Hashtable();
-    removedProperties_ = new Vector();
-  }
-
-  public final Controller getController()
-  {
-    return controller_;
-  }
-
-  /**
-  * Get the property table.
-  * @return Hashtable A hashtable containing the properties for this action.
-  */
-  public final Hashtable getPropertyTable()
-  {
-    return propertyTable_;
-  }
-  
-  /**
-   * Set the property table.
-   * @return void
-   */
-  public void setPropertyTable(Hashtable propertyTable)
-  {
-   propertyTable_ = propertyTable;
-  }
-  
-  /**
-   * Add a property to the property table.
-   * @param void
-   */
-  public final void addProperty(Object key, Object value)
-  {
-    propertyTable_.put(key, value);
-  }
-
-  /**
-  * Remove a property from the property table. Track the deletions.
-  * @param Object The key of the property being removed.
-  */
-  public final void removeProperty(Object key)
-  {
-    propertyTable_.remove(key);
-    removedProperties_.addElement(key);
-  }
-  
-  public final String[] getPropertyAsStringArray(Object key)
-  {
-    Object object = propertyTable_.get(key);
-    if (object instanceof String[])
-      return (String[])object;
-    else if (object != null)
-      return new String[] {object.toString()};
-    else
-      return new String[0];
-  }
-
-  public final boolean execute()
-  {
-    return execute(true);
-  }
-
-  public final boolean execute(boolean useActionEngine)
-  {
-    if (useActionEngine)
-      return controller_.getActionEngine().executeAction(this);
-    else
-      return run();
-  }
-
-  // Abstract method for running this action.
-  public abstract boolean run();
-  
-  /**
-  * Return the transformers used to normalize the input/output parameters for this action
-  * @return ITransformer[]
-  */
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
-  }
-  
-  protected void handleUnexpectedException(Perspective perspective,MessageQueue messageQueue,String exceptionName,Throwable t)
-  {
-    messageQueue.addMessage(perspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-    messageQueue.addMessage(exceptionName);
-    messageQueue.addMessage(t.getMessage());
-  }  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
deleted file mode 100644
index 0cfceec6d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/CheckWorkbenchFileReadOnlyAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.*;
-
-public class CheckWorkbenchFileReadOnlyAction extends Action
-{
-  public static final String getActionLink()
-  {
-    return "actions/CheckWorkbenchFileReadOnlyActionJSP.jsp";
-  }
-    
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
deleted file mode 100644
index 65d3db43b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearNodeAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public abstract class ClearNodeAction extends NodeAction
-{
-  public ClearNodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      Node node = nodeManager_.getNode(nodeId);
-      TreeElement element = node.getTreeElement();
-      element.disconnectAll();
-      // Do not add this to the history.
-      MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
-      messageQueue.addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED",node.getNodeName()));
-      return true;
-    }
-    return false;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  // Deleting a node from the tree results in changes to the treeview and status contents.
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract String getStatusContentVar();
-  public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
deleted file mode 100644
index 38d97214d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ClearViewElementAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-// Abstract action class used for both Link and Form actions.
-public abstract class ClearViewElementAction extends LinkAction
-{
-  private String listManagerRel_;
-  private NodeManager nodeManager_;
-  public ClearViewElementAction(Controller controller,NodeManager nodeManager,String listManagerRel)
-  {
-    super(controller);
-    nodeManager_  = nodeManager;
-    listManagerRel_ = listManagerRel;
-  }
-
-  // ...jsp?viewId=...
-  protected final boolean processLinkParameters(HttpServletRequest request)
-  {
-    String viewIdString = request.getParameter(ActionInputs.VIEWID);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(viewIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.VIEWID,viewIdString);
-    return true;
-  }
-
-  public final boolean run()
-  {
-    int viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getSelectedNode();
-    ViewTool viewTool = (ViewTool)selectedNode.getToolManager().getSelectedTool();
-    if (viewTool.getToolManager(viewId) == null)
-    {
-      // Stale view.
-      return false;
-    }
-    TreeElement element = selectedNode.getTreeElement();
-    ListManager listManager = (ListManager)element.getPropertyAsObject(listManagerRel_);
-    listManager.removeElementWithViewId(viewId);
-    viewTool.clearViewToolManager(viewId);
-    selectedNode.setViewId(ActionInputs.VIEWID_DEFAULT);
-    // Do not add this to the history.
-    return true;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract String getStatusContentVar();
-  public abstract String getStatusContentPage();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
deleted file mode 100644
index d87965205..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormAction.java
+++ /dev/null
@@ -1,70 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import javax.servlet.http.*;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-public abstract class FormAction extends Action
-{
-  public FormAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected abstract boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException;
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    try
-    {
-      MultipartFormDataParser parser = new MultipartFormDataParser();
-      parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
-      getSelectedFormTool().clearErrors();
-      boolean result = processParsedResults(parser);
-      removedProperties_.removeAllElements();
-      return result;
-    }
-    catch (MultipartFormDataException e)
-    {
-    }
-    return false;
-  }
-  
-  public void setPropertyTable(Hashtable propertyTable)
-  {
-    try
-    {
-      processParsedResults(new MultipartFormDataParser(propertyTable));
-    }
-    catch (MultipartFormDataException mfde)
-    {
-    }
-    for (Iterator it = propertyTable.keySet().iterator(); it.hasNext();)
-    {
-      Object key = it.next();
-      Hashtable thisPropertyTable = getPropertyTable();
-      if (!thisPropertyTable.containsKey(key))
-        addProperty(key, propertyTable.get(key));
-    }
-  }
-
-  protected final void addToHistory(int perspectiveId,String url)
-  {
-    controller_.addToHistory(perspectiveId,url);
-  }
-
-  public abstract FormTool getSelectedFormTool();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
deleted file mode 100644
index 0f94a9920..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/FormInputException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-// A class for reporting form input exceptions.
-public class FormInputException extends Exception
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257846601685938742L;
-
-public FormInputException(String msg)
-  {
-    super(msg);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
deleted file mode 100644
index cefc21128..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToFileSystemAction.java
+++ /dev/null
@@ -1,127 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import javax.wsdl.Definition;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import java.io.OutputStreamWriter;
-import java.io.OutputStream;
-import javax.servlet.http.*;
-import org.apache.wsil.WSILDocument;
-
-public abstract class ImportToFileSystemAction extends LinkAction
-{
-  public ImportToFileSystemAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  // os is the OutputStream of the file in the file system
-  public abstract boolean write(OutputStream os);
-
-  // the default name for the file
-  public abstract String getDefaultFileName();
-
-  public boolean writeWSDLDefinition(OutputStream os, Definition definition)
-  {
-    try
-    {
-      WSDLFactory wsdlFactory = new WSDLFactoryImpl();
-      WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
-      wsdlWriter.writeWSDL(definition, os);
-      return true;
-    }
-    catch (Throwable t)
-    {
-      return false;
-    }
-  }
-
-  public boolean writeWSILDocument(OutputStream os, WSILDocument wsilDoc)
-  {
-    OutputStreamWriter osw = null;
-    try
-    {
-      osw = new OutputStreamWriter(os);
-      wsilDoc.write(osw);
-      return true;
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-    finally
-    {
-      try
-      {
-        if (osw != null)
-          osw.close();
-      }
-      catch (Exception e)
-      {
-      }
-    }
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, String jspPage)
-  {
-    StringBuffer actionLink = new StringBuffer(jspPage);
-    actionLink.append('?');
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    String toolID = request.getParameter(ActionInputs.TOOLID);
-    String viewID = request.getParameter(ActionInputs.VIEWID);
-    String viewToolID = request.getParameter(ActionInputs.VIEWTOOLID);
-    try
-    {
-      Integer.parseInt(nodeID);
-      Integer.parseInt(toolID);
-      Integer.parseInt(viewID);
-      Integer.parseInt(viewToolID);
-      propertyTable_.put(ActionInputs.NODEID, nodeID);
-      propertyTable_.put(ActionInputs.TOOLID, toolID);
-      propertyTable_.put(ActionInputs.VIEWID, viewID);
-      propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolID);
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-    return true;
-  }
-
-  public abstract String getStatusContentVar();
-
-  public abstract String getStatusContentPage();
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
deleted file mode 100644
index ebe1c017c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ImportToWorkbenchAction.java
+++ /dev/null
@@ -1,218 +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.wst.ws.internal.explorer.platform.actions;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.common.environment.Environment;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-public abstract class ImportToWorkbenchAction extends FormAction {
-  private IWorkspaceRoot iWorkspaceRoot_;
-  private IProject iProject_;
-  private IResource targetFileResource_;
-
-    public ImportToWorkbenchAction(Controller controller) {
-        super(controller);
-        iWorkspaceRoot_ = ResourcesPlugin.getWorkspace().getRoot();
-    }
-
-    protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
-        getSelectedFormTool();
-        MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
-        boolean inputsValid = true;
-        String workbenchProjectName = parser.getParameter(ActionInputs.WORKBENCH_PROJECT_NAME);
-        if (workbenchProjectName == null || workbenchProjectName.length() <= 0) {
-            msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WORKBENCH_PROJECT"));
-            inputsValid = false;
-        }
-        else
-        {
-            iProject_ = iWorkspaceRoot_.getProject(workbenchProjectName);
-            propertyTable_.put(ActionInputs.WORKBENCH_PROJECT_NAME, workbenchProjectName);
-        }
-        String importFile = parser.getParameter(ActionInputs.IMPORT_FILE);
-        if (importFile != null)
-        {
-            propertyTable_.put(ActionInputs.IMPORT_FILE, ActionInputs.IMPORT_FILE);
-            String importedFileName = parser.getParameter(ActionInputs.IMPORTED_FILE_NAME);
-            if (importedFileName == null || importedFileName.length() <= 0)
-            {
-                msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_FILE_NAME"));
-                inputsValid = false;
-            }
-            else
-                propertyTable_.put(ActionInputs.IMPORTED_FILE_NAME, importedFileName);
-        }
-        String importToWSIL = parser.getParameter(ActionInputs.IMPORT_TO_WSIL);
-        if (importToWSIL != null)
-        {
-            propertyTable_.put(ActionInputs.IMPORT_TO_WSIL, ActionInputs.IMPORT_TO_WSIL);
-            propertyTable_.put(ActionInputs.IMPORTED_WSDL_URL, parser.getParameter(ActionInputs.IMPORTED_WSDL_URL));
-            String wsilFileName = parser.getParameter(ActionInputs.WSIL_FILE_NAME);
-            if (wsilFileName == null || wsilFileName.length() <= 0)
-            {
-                msgQueue.addMessage(controller_.getMessage("MSG_ERROR_INVALID_WSIL_FILE_NAME"));
-                inputsValid = false;
-            }
-            else
-                propertyTable_.put(ActionInputs.WSIL_FILE_NAME, wsilFileName);
-        }
-        if (importFile == null && importToWSIL == null)
-        {
-            msgQueue.addMessage(controller_.getMessage("MSG_ERROR_NO_IMPORT_OPTION_SELECTED"));
-            inputsValid = false;
-        }
-        return inputsValid;
-    }
-
-    private OutputStream getOutputStream(String defaultFileName) throws FileNotFoundException {
-        File file = new File(controller_.getServletEngineStateLocation() + defaultFileName);
-        FileOutputStream fos = new FileOutputStream(file);
-        return fos;
-    }
-
-    private boolean importTempFileToWebProject(String defaultFileName) throws FileNotFoundException, CoreException
-    {
-      if (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE)
-        targetFileResource_.delete(true,new NullProgressMonitor());
-
-      String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-      File file = new File(controller_.getServletEngineStateLocation()+defaultFileName);
-      BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
-
-      IFile iFile = iProject_.getFile("/"+importedFileName);
-      iFile.create(bis,true,new NullProgressMonitor());
-
-      // Remove the temporary file
-      file.delete();
-      return true;
-    }
-
-    public boolean fileExists()
-    {
-      String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-      if (importedFileName != null)
-      {
-        targetFileResource_ = iProject_.findMember(importedFileName);
-        return (targetFileResource_ != null && targetFileResource_.getType() == IResource.FILE);
-      }
-      else
-        return false;
-    }
-
-    public boolean isTargetFileResourceReadOnly()
-    {
-      return targetFileResource_.getResourceAttributes().isReadOnly();
-    }
-
-    // TODO: ResourceContext need to move to org.eclipse.wst.ws.
-    public boolean isCheckoutFilesEnabled()
-    {
-    	return true;
-//      return WebServicePlugin.getInstance().getResourceContext().isCheckoutFilesEnabled();
-    }
-
-    public String getWebServicePluginFileMessage(String messageId)
-    {
-      String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-      return controller_.getMessage(messageId,new String[]{iProject_.getFullPath().toString(),importedFileName});
-    }
-
-    // TODO: ResourceContext need to move to org.eclipse.wst.ws. 
-    public boolean isOverwriteFilesEnabled()
-    {
-    	return true;
-//      return WebServicePlugin.getInstance().getResourceContext().isOverwriteFilesEnabled();
-    }
-
-    public boolean validateEdit()
-    {
-      IFile[] files = new IFile[1];
-      files[0] = (IFile)targetFileResource_;
-      IStatus status = ResourcesPlugin.getWorkspace().validateEdit(files,null);
-      MessageQueue messageQueue = controller_.getCurrentPerspective().getMessageQueue();
-      messageQueue.addMessage(status.getMessage());
-      return status.isOK();
-    }
-
-    public boolean run() {
-        MessageQueue msgQueue = controller_.getCurrentPerspective().getMessageQueue();
-        if (propertyTable_.get(ActionInputs.IMPORT_FILE) != null)
-        {
-            try {
-                ImportToFileSystemAction action = newImportToFileSystemAction();
-                action.run();
-                String defaultFileName = action.getDefaultFileName();
-                if (!action.write(getOutputStream(defaultFileName))) {
-                    msgQueue.addMessage(controller_.getMessage("MSG_ERROR_WRITING_TEMP_FILE_TO_FS"));
-                    return false;
-                }
-                importTempFileToWebProject(defaultFileName);
-                String importedFileName = (String)propertyTable_.get(ActionInputs.IMPORTED_FILE_NAME);
-                msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_TO_WORKBENCH_SUCCESSFUL", importedFileName));
-            }
-            catch (FileNotFoundException fnfe) {
-                msgQueue.addMessage(fnfe.getMessage());
-                return false;
-            }
-            catch (CoreException ce) {
-                msgQueue.addMessage(ce.getMessage());
-                return false;
-            }
-        }
-        if (propertyTable_.get(ActionInputs.IMPORT_TO_WSIL) != null)
-        {
-            String projectName = (String)propertyTable_.get(ActionInputs.WORKBENCH_PROJECT_NAME);
-            String importedWSILFileName = (String)propertyTable_.get(ActionInputs.WSIL_FILE_NAME);
-            String wsdlURL = (String)propertyTable_.get(ActionInputs.IMPORTED_WSDL_URL);
-            StringBuffer wsilPlatformURL = new StringBuffer("platform:/resource/");
-            wsilPlatformURL.append(projectName);
-            wsilPlatformURL.append('/');
-            wsilPlatformURL.append(importedWSILFileName);
-            AddWSDLToWSILCommand command = new AddWSDLToWSILCommand();
-            String[] args = new String[5];
-            args[0] = AddWSDLToWSILCommand.ARG_WSIL;
-            args[1] = wsilPlatformURL.toString();
-            args[2] = AddWSDLToWSILCommand.ARG_WSDL;
-            args[3] = wsdlURL;
-            args[4] = AddWSDLToWSILCommand.ARG_RESOLVE_WSDL;
-            command.setArguments(args);
-            Environment env = new EclipseEnvironment(null, null, null);
-            command.setEnvironment( env );
-            command.execute( null, null );
-            msgQueue.addMessage(controller_.getMessage("MSG_INFO_IMPORT_SERVICE_REF_TO_WSIL_SUCCESSFUL", importedWSILFileName));
-        }
-        return true;
-    }
-
-    public abstract String getStatusContentVar();
-    public abstract String getStatusContentPage();
-    public abstract ImportToFileSystemAction newImportToFileSystemAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
deleted file mode 100644
index 1370dde4e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class LaunchWebServiceWizardAction extends FormAction
-{
-  public LaunchWebServiceWizardAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String wizardID = parser.getParameter(ActionInputs.WEB_SERVICE_WIZARD);
-    propertyTable_.put(ActionInputs.WEB_SERVICE_WIZARD, wizardID);
-    return true;
-  }
-
-  public boolean launchWizard(String wsdlURL)
-  {
-    LaunchWizardTask task = LaunchWizardTask.getInstance();
-    if (task.getIsExecuting())
-    {
-      controller_.getCurrentPerspective().getMessageQueue().addMessage(controller_.getMessage("MSG_ERROR_WIZARD_ALREADY_RUNNING"));
-      return false;
-    }
-    int wizardID = Integer.parseInt((String)propertyTable_.get(ActionInputs.WEB_SERVICE_WIZARD));
-    LaunchWizardRunnable runnable;
-    if (wizardID == ActionInputs.WEB_SERVICE_CLIENT_WIZARD)
-      runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard", wsdlURL);
-    else if (wizardID == ActionInputs.WEB_SERVICE_SKELETON_WIZARD)
-      runnable = new LaunchWizardRunnable("org.eclipse.jst.ws.creation.ui.wizard.serverwizard", wsdlURL);
-    else
-      return false;
-    task.checkAndAsyncExec(runnable);
-    return true;
-  }
-
-  public abstract String getStatusContentVar();
-
-  public abstract String getStatusContentPage();
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
deleted file mode 100644
index 223b155c3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/LinkAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import javax.servlet.http.*;
-
-// Abstract class representing the action of clicking a link. These actions
-// may change the history list.
-public abstract class LinkAction extends Action
-{
-  private boolean isAddedToHistory_;
-  private boolean isStaleBreadCrumb_;
-
-  public LinkAction(Controller controller)
-  {
-    super(controller);
-    isAddedToHistory_ = false;
-    isStaleBreadCrumb_ = false;
-  }
-
-  // Determine if the action was successfully added to this history list.
-  // This should be called after the run() method.
-  public final boolean isAddedToHistory()
-  {
-    return isAddedToHistory_;
-  }
-
-  protected abstract boolean processLinkParameters(HttpServletRequest request);
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    String isHistoryString = request.getParameter(ActionInputs.ISHISTORY);
-    if (isHistoryString != null)
-      propertyTable_.put(ActionInputs.ISHISTORY,isHistoryString);
-    return processLinkParameters(request);
-  }
-
-  // Add the action's URL to the controller's history list.
-  protected final void addToHistory(int perspectiveId,String url)
-  {
-    if (!isHistoryAction())
-      isAddedToHistory_ = controller_.addToHistory(perspectiveId,url);
-  }
-
-  public final boolean isHistoryAction()
-  {
-    return (propertyTable_.get(ActionInputs.ISHISTORY) != null);
-  }
-
-  public final void setStaleBreadCrumb()
-  {
-    if (isHistoryAction())
-    {
-      isStaleBreadCrumb_ = true;
-      controller_.processStaleBreadCrumb();
-    }
-  }
-
-  public final boolean isStaleBreadCrumb()
-  {
-    return isStaleBreadCrumb_;
-  }
-
-  // Call this when a stale breadcrumb is encountered while traversing history chain.
-  public final String getNextHistoryActionLink()
-  {
-    return RetrieveHistoryAction.getActionLink(controller_.getHistoryDirection());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
deleted file mode 100644
index 210e052ed..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/NodeAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class NodeAction extends LinkAction
-{
-  protected NodeManager nodeManager_;
-  private boolean requiresTreeViewRefresh_;
-  private boolean requiresNodeSelection_;
-  private boolean requiresViewSelection_;
-  private boolean requiresStatusUpdate_;
-
-  public NodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller);
-    nodeManager_ = nodeManager;
-    requiresTreeViewRefresh_ = false;
-    requiresNodeSelection_ = false;
-    requiresViewSelection_ = false;
-    requiresStatusUpdate_ = false;
-  }
-
-  // ...jsp?nodeId=...<&isHistory=1>
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String nodeIdString = request.getParameter(ActionInputs.NODEID);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(nodeIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.NODEID,nodeIdString);
-    return true;
-  }
-
-  protected final boolean isStaleNode(int nodeId)
-  {
-    return (nodeManager_.getNode(nodeId) == null);
-  }
-
-  /**
-  * Make a node visible. A node is visible when all of its ancestors are expanded.
-  * @param Node The node to be made visible.
-  * @return boolean Indicator for whether or not the tree structure was changed (i.e. expanded to show the node in question).
-  */
-  protected final boolean makeNodeVisible(Node node)
-  {
-    requiresTreeViewRefresh_ = node.getNodeManager().makeNodeVisible(node);
-    return requiresTreeViewRefresh_;
-  }
-
-  /**
-  * Select a node with id nodeId.
-  * @param int The id of the node to be selected.
-  */
-  protected final void setSelectedNodeId(int nodeId)
-  {
-    if (nodeManager_.getSelectedNodeId() != nodeId)
-    {
-      requiresNodeSelection_ = true;
-      nodeManager_.setSelectedNodeId(nodeId);
-    }
-  }
-
-  protected final void setSelectedViewId(int viewId)
-  {
-    Node selectedNode = nodeManager_.getSelectedNode();
-    if (selectedNode.getViewId() != viewId)
-    {
-      requiresViewSelection_ = true;
-      selectedNode.setViewId(viewId);
-    }
-  }
-
-  // Determine whether or not the treeview requires reloading as a result of this action.
-  // Reloading is required when branches are added/removed.
-  public boolean requiresTreeViewRefresh()
-  {
-    return requiresTreeViewRefresh_;
-  }
-
-  // Determine whether or not a new node has been selected as a result of the action.
-  public boolean requiresNodeSelection()
-  {
-    return requiresNodeSelection_;
-  }
-
-  // Determine if a new view element is selected.
-  public boolean requiresViewSelection()
-  {
-    return requiresViewSelection_;
-  }
-
-  // Determine if any status messages arose from this action.
-  public boolean requiresStatusUpdate()
-  {
-    return requiresStatusUpdate_;
-  }
-
-  protected abstract String getActionLinkForHistory();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
deleted file mode 100644
index f9136ec40..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenCalendarBrowserAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-import javax.servlet.http.*;
-
-public class OpenCalendarBrowserAction extends Action
-{
-  public OpenCalendarBrowserAction()
-  {
-  }
-
-  // calendar_browser.jsp?sessionId=...&calendarType=...
-  public static final String getActionLink(String sessionId,int calendarType)
-  {
-    StringBuffer actionLink = new StringBuffer("calendar_browser.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType);
-    return actionLink.toString();
-  }
-  
-  public static final String getActionLinkForDate(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATE);
-  }
-  
-  public static final String getActionLinkForDateTime(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_DATETIME);
-  }
-  
-  public static final String getActionLinkForGYearMonth(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GYEARMONTH);
-  }
-  
-  public static final String getActionLinkForGDay(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GDAY);
-  }
-  
-  public static final String getActionLinkForGMonthDay(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.CALENDAR_TYPE_GMONTHDAY);
-  }
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
deleted file mode 100644
index f29974991..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/OpenWSDLBrowserAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-import javax.servlet.http.*;
-
-public class OpenWSDLBrowserAction extends Action
-{
-  public OpenWSDLBrowserAction()
-  {
-  }
-
-  public static final String getActionLink(String sessionId,int wsdlType)
-  {
-    StringBuffer actionLink = new StringBuffer("wsdl_browser.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.WSDL_TYPE).append('=').append(wsdlType);
-    return actionLink.toString();
-  }
-
-  public static final String getActionLinkForService(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE);
-  }
-  
-  public static final String getActionLinkForServiceInterface(String sessionId)
-  {
-    return getActionLink(sessionId,ActionInputs.WSDL_TYPE_SERVICE_INTERFACE);
-  }
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
deleted file mode 100644
index 01a5e40b2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ProxyLoadPageAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-import javax.servlet.http.*;
-
-public class ProxyLoadPageAction extends Action
-{
-  // Get the action given a relative targetPage URL. e.g. "forms/LongLoadingForm.jsp"
-  public static final String getActionLink(String targetPage)
-  {
-    return getActionLink(null,targetPage);
-  }
-  
-  // Get the action given a sessionId and a relative targetPage URL.
-  public static final String getActionLink(String sessionId,String targetPage)
-  {
-    StringBuffer actionLink = new StringBuffer("forms/ProxyLoadPage.jsp?");
-    if (sessionId != null)
-      actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&');
-    actionLink.append(ActionInputs.TARGET_PAGE).append('=').append(targetPage);
-    return actionLink.toString();
-  }
-  
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
deleted file mode 100644
index 87d94cec9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ResizeFramesAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import javax.servlet.http.*;
-
-public abstract class ResizeFramesAction extends Action
-{
-  protected Controller controller_;
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String frameName = parser.getParameter(ActionInputs.FRAME_NAME);
-    if (frameName != null)
-      propertyTable_.put(ActionInputs.FRAME_NAME,frameName);
-    else
-      return false;
-    return processOthers(parser);
-  }
-  
-  protected abstract boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException;
-  
-  public ResizeFramesAction(Controller controller)
-  {
-    controller_ = controller;
-  }
-  
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    try
-    {
-      MultipartFormDataParser parser = new MultipartFormDataParser();
-      parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
-      boolean result = processParsedResults(parser);
-      return result;
-    }
-    catch (MultipartFormDataException e)
-    {
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
deleted file mode 100644
index d24ce285a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/RetrieveHistoryAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.BreadCrumb;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class RetrieveHistoryAction extends LinkAction
-{
-  private BreadCrumb breadCrumb_;
-
-  public RetrieveHistoryAction(Controller controller)
-  {
-    super(controller);
-    breadCrumb_ = null;
-  }
-
-  // actions/RetrieveHistoryAction.jsp?jump=1  - forward  (ActionInputs.JUMP_FORWARD)
-  // actions/RetrieveHistoryAction.jsp?jump=-1 - backward (ActionInputs.JUMP_BACK)
-  public final static String getActionLink(int jump)
-  {
-    StringBuffer actionLink = new StringBuffer("actions/RetrieveHistoryActionJSP.jsp?");
-    actionLink.append(ActionInputs.JUMP).append('=').append(jump);
-    return actionLink.toString();
-  }
-
-  protected final boolean processLinkParameters(HttpServletRequest request)
-  {
-    String jumpString = request.getParameter(ActionInputs.JUMP);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(jumpString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.JUMP,jumpString);
-    return true;
-  }
-
-  public final boolean run()
-  {
-    int jump = Integer.parseInt((String)propertyTable_.get(ActionInputs.JUMP));
-    switch (jump)
-    {
-      case ActionInputs.JUMP_FORWARD:
-        breadCrumb_ = controller_.forward();
-        return true;
-      case ActionInputs.JUMP_BACK:
-        breadCrumb_ = controller_.back();
-        return true;
-    }
-    return false;
-  }
-
-  public final BreadCrumb getBreadCrumb()
-  {
-    return breadCrumb_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
deleted file mode 100644
index 494444b6c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeAction.java
+++ /dev/null
@@ -1,65 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public abstract class SelectNodeAction extends NodeAction
-{
-  protected Node selectedNode_;
-
-  public SelectNodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-    selectedNode_ = null;
-  }
-
-  public final void performBaseAction(int nodeId)
-  {
-    setSelectedNodeId(nodeId);
-    selectedNode_ = nodeManager_.getSelectedNode();
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      // Ensure that the node is visible.
-      makeNodeVisible(nodeManager_.getNode(nodeId));
-      performBaseAction(nodeId);
-      addToHistory(getPerspectiveId(),getActionLinkForHistory());
-      return true;
-    }
-    setStaleBreadCrumb();
-    return false;
-  }
-
-  public final Node getSelectedNode()
-  {
-    return selectedNode_;
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new NodeSelectionTransformer(controller_)};
-  }
-
-  // Selecting a node changes the treeview content and the properties container.
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
deleted file mode 100644
index 9bdf7b575..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/SelectNodeToolAction.java
+++ /dev/null
@@ -1,163 +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.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.CurrentNodeSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-
-public abstract class SelectNodeToolAction extends SelectNodeAction
-{
-  protected NodeManager nodeManager_;
-  protected Tool selectedTool_;
-
-  public SelectNodeToolAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-    nodeManager_ = nodeManager;
-    selectedTool_ = null;
-  }
-
-  public final NodeManager getNodeManager()
-  {
-    return nodeManager_;
-  }
-
-  // ...jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = super.processLinkParameters(request);
-    String toolIdString = request.getParameter(ActionInputs.TOOLID);
-    String viewIdString = request.getParameter(ActionInputs.VIEWID);
-    String viewToolIdString = request.getParameter(ActionInputs.VIEWTOOLID);
-
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(toolIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed.
-      return false;
-    }
-    propertyTable_.put(ActionInputs.TOOLID,toolIdString);
-
-    // Optional properties
-    try
-    {
-      int viewId = Integer.parseInt(viewIdString);
-      propertyTable_.put(ActionInputs.VIEWID,viewIdString);
-      if (viewId != ActionInputs.VIEWID_DEFAULT)
-      {
-        Integer.parseInt(viewToolIdString);
-        propertyTable_.put(ActionInputs.VIEWTOOLID,viewToolIdString);
-      }
-    }
-    catch (NumberFormatException e)
-    {
-    }
-    return result;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      // Ensure that the node is visible.
-      makeNodeVisible(nodeManager_.getNode(nodeId));
-      setSelectedNodeId(nodeId);
-      selectedNode_ = nodeManager_.getSelectedNode();
-      int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
-      ToolManager toolManager = selectedNode_.getToolManager();
-      toolManager.setSelectedToolId(toolId);
-      selectedTool_ = toolManager.getSelectedTool();
-      String viewIdString = ((String)propertyTable_.get(ActionInputs.VIEWID));
-      if (viewIdString != null)
-      {
-        int viewId = Integer.parseInt(viewIdString);
-        setSelectedViewId(viewId);
-        if (viewId != ActionInputs.VIEWID_DEFAULT)
-        {
-          String viewToolIdString = ((String)propertyTable_.get(ActionInputs.VIEWTOOLID));
-          ViewTool viewTool = (ViewTool)selectedTool_;
-          if (viewToolIdString != null)
-          {
-            int viewToolId = Integer.parseInt(viewToolIdString);
-            ToolManager viewToolManager = selectedNode_.getViewToolManager();
-            if (viewToolManager == null)
-            {
-              if (!isHistoryAction())
-              {
-                viewToolManager = viewTool.createToolManager(viewId);
-                viewToolId = viewToolManager.getSelectedToolId();
-              }
-              else
-              {
-                setStaleBreadCrumb();
-                return false;
-              }
-            }
-            viewToolManager.setSelectedToolId(viewToolId);
-          }
-        }
-      }
-      else
-        setSelectedViewId(ActionInputs.VIEWID_DEFAULT);
-      addToHistory(getPerspectiveId(),getActionLinkForHistory());
-      return true;
-    }
-    setStaleBreadCrumb();
-    return false;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new CurrentNodeSelectionTransformer(controller_)};
-  }
-
-  public final Tool getSelectedViewTool()
-  {
-    if (propertyTable_.get(ActionInputs.VIEWID) != null)
-      return selectedNode_.getViewToolManager().getSelectedTool();
-    return null;
-  }
-
-  public final Tool getSelectedTool()
-  {
-    return selectedTool_;
-  }
-
-  // Selecting a node tool updates the properties content. Also, in the event
-  // of a history switch, nodes may need to be selected resulting in changes to
-  // both the treeview content and the properties container. These requirements are
-  // covered through the base class.
-  public abstract String getPropertiesContentVar();
-  public abstract String getPropertiesContentPage();
-  public String getStatusContentVar()
-  {
-    return null;
-  }
-
-  public String getStatusContentPage()
-  {
-    return null;
-  }
-  
-  public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
deleted file mode 100644
index be72f50bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ShowPerspectiveAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.HttpServletRequest;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class ShowPerspectiveAction extends LinkAction
-{
-  public ShowPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  // actions/show_perspective.jsp?perspective=0<&isHistory=1> - UDDI (ActionInputs.PERSPECTIVE_UDDI)
-  // actions/show_perspective.jsp?perspective=1<&isHistory=1> - WSIL (ActionInputs.PERSPECTIVE_WSIL)
-  // actions/show_perspective.jsp?perspective=2<&isHistory=1> - WSDL (ActionInputs.PERSPECTIVE_WSDL)
-  // actions/show_perspective.jsp?perspective=3<&isHistory=1> - Favorites (ActionInputs.PERSPECTIVE_FAVORITES)
-  public final static String getActionLink(int newPerspective,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("actions/ShowPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.PERSPECTIVE).append('=').append(newPerspective);
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    return true;
-  }
-  
-  protected final boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = false;
-    String perspectiveString = request.getParameter(ActionInputs.PERSPECTIVE);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(perspectiveString);
-      propertyTable_.put(ActionInputs.PERSPECTIVE,perspectiveString);
-      MultipartFormDataParser parser = new MultipartFormDataParser();
-      parser.parseRequest(request,HTMLUtils.UTF8_ENCODING);
-      result = processParsedResults(parser);
-      removedProperties_.removeAllElements();
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed! - This should not happen.
-    }
-    catch (MultipartFormDataException e)
-    {
-    }
-    return result;
-  }
-
-  public boolean run()
-  {
-    int perspective = Integer.parseInt((String)propertyTable_.get(ActionInputs.PERSPECTIVE));
-    controller_.setCurrentPerspective(perspective);
-    addToHistory(perspective,getActionLink(perspective,true));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java
deleted file mode 100644
index bd35d8ec4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ToggleNodeAction.java
+++ /dev/null
@@ -1,86 +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.wst.ws.internal.explorer.platform.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.NodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public abstract class ToggleNodeAction extends NodeAction
-{
-  protected Node toggledNode_;
-  public ToggleNodeAction(Controller controller,NodeManager nodeManager)
-  {
-    super(controller,nodeManager);
-    toggledNode_ = null;
-  }
-
-  // Toggle the current node and update the selection iff the currently selected
-  // is a related descendant of a collapsed node.
-  /**
-  * Toggle the current node and update the selection iff the currently selected
-  * node is a related descendant of the current node and the current node is
-  * now collapsed as a result of this action.
-  *
-  * @param int The node ID of the node for which this action applies to.
-  * @return boolean Indicator of whether or not a selection change was necessary.
-  */
-  public final boolean performBaseAction(int nodeId)
-  {
-    toggledNode_ = nodeManager_.getNode(nodeId);
-    nodeManager_.setFocusedNodeId(nodeId);
-    toggledNode_.setVisibilityOfChildren(!toggledNode_.isOpen());
-    Node selectedNode = nodeManager_.getSelectedNode();
-    if (selectedNode != null)
-    {
-      if (!selectedNode.isVisible())
-      {
-        setSelectedNodeId(nodeId);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      if (performBaseAction(nodeId))
-      {
-        // Save the selection of the toggle link in the history.
-        addToHistory(getPerspectiveId(),getActionLinkForHistory());
-      }
-      // Do not save the toggle in history.
-      return true;
-    }
-    setStaleBreadCrumb();
-    return false;
-  }
-
-  public final Node getToggledNode()
-  {
-    return toggledNode_;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new NodeIdTransformer(controller_)};
-  }
-
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract int getPerspectiveId();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
deleted file mode 100644
index ea7184d63..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/ValidateEditAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.*;
-
-public class ValidateEditAction extends Action
-{
-  public static final String getActionLink()
-  {
-    return "actions/ValidateEditActionJSP.jsp";
-  }
-    
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
deleted file mode 100644
index 2471ea164..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WSDLFileNameHelper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-public class WSDLFileNameHelper
-{
-  private static final String default_ = "temp.wsdl";
-  
-  /**
-  * Given a wsdl path (file, URL etc.), guess at the file name by looking for the .wsdl extension at the end of the
-  * path and the file that it belongs to. If this is not possible, return the default defined in this class.
-  * @param String The path (file, URL etc.) of this WSDL file.
-  * @return String The WSDL file name determined by this routine.
-  */
-  public static final String getWSDLFileName(String wsdlPathname)
-  {
-    if (wsdlPathname != null)
-    {
-      if (wsdlPathname.endsWith(".wsdl"))
-      {
-        int lastSeparatorPos = Math.max(wsdlPathname.lastIndexOf("/"),wsdlPathname.lastIndexOf("\\"));
-        if (lastSeparatorPos > 0)
-          return wsdlPathname.substring(lastSeparatorPos+1,wsdlPathname.length());
-      }
-    }
-    return default_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
deleted file mode 100644
index dfcf6a356..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/actions/WriteWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.actions;
-
-import javax.servlet.http.*;
-
-public class WriteWSDLToWorkbenchAction extends Action
-{
-  public static final String getActionLink()
-  {
-    return "actions/WriteWSDLToWorkbenchActionJSP.jsp";
-  }
-    
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-  
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
deleted file mode 100644
index 0bfeac353..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ActionInputs.java
+++ /dev/null
@@ -1,104 +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.wst.ws.internal.explorer.platform.constants;
-
-public class ActionInputs
-{
-  // URL parm for all actions which are in the history list.
-  public static final String ISHISTORY = "isHistory";
-
-  // Utility constant for tree node identification.
-  public static final String NODEID = "nodeId";
-
-  // Utility constant for tool identification.
-  public static final String TOOLID = "toolId";
-
-  // Utility constant for view identification.
-  public static final String VIEWID = "viewId";
-  public static final int VIEWID_DEFAULT = -1;
-
-  // Utility constant for view tool identification.
-  public static final String VIEWTOOLID = "viewToolId";
-  public static final int VIEWTOOLID_DEFAULT = -1;
-
-  // Utility constants for transport classes
-  public static final String TRANSPORT_CLASS_NAME = "org.uddi4j.TransportClassName";
-  public static final String TRASPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
-  //public static final String AXIS_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheAxisTransport";
-  //public static final String SOAP_TRANSPORT_CLASS = "org.uddi4j.transport.ApacheSOAPTransport";
-
-  // ToggleNodeAction and its derivatives.
-  public static final String OPEN = "open";
-  public static final int OPEN_NODE = 1;
-  public static final int CLOSE_NODE = 0;
-
-  // ShowPerspectiveAction
-  public static final String PERSPECTIVE = "perspective";
-  public static final int PERSPECTIVE_UDDI = 0;
-  public static final int PERSPECTIVE_WSIL = 1;
-  public static final int PERSPECTIVE_WSDL = 2;
-  public static final int PERSPECTIVE_FAVORITES = 3;
-
-  // RetrieveHistoryAction
-  public static final String JUMP = "jump";
-  public static final int JUMP_FORWARD = 1;
-  public static final int JUMP_BACK = -1;
-
-  // LaunchWebServiceWizardAction
-  public final static String WEB_SERVICE_WIZARD = "webServiceWizard";
-  public final static int WEB_SERVICE_CLIENT_WIZARD = 0;
-  public final static int WEB_SERVICE_SKELETON_WIZARD = 1;
-
-  // ImportToWorkbenchAction
-  public final static String WORKBENCH_PROJECT_NAME = "workbenchProjectName";
-  public final static String IMPORT_FILE = "importWSDL";
-  public final static String IMPORTED_FILE_NAME = "importedFileName";
-  public final static String IMPORT_TO_WSIL = "importToWSIL";
-  public final static String WSIL_FILE_NAME = "WSILFileName";
-  public final static String IMPORTED_WSDL_URL = "importedWsdlUrl";
-  public final static String IMPORT_ACTION = "importAction";
-
-  // ProxyLoadAction
-  public final static String TARGET_PAGE = "targetPage";
-
-  // Session ID for pop ups whose browsers choose to ignore the session.
-  public final static String SESSIONID = "sId";
-
-  // WSDL Browser
-  public static final String PROJECT = "project";
-  public static final String WSDL_TYPE = "wsdlType";
-  public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
-  public static final int WSDL_TYPE_SERVICE = 1;
-  public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
-  public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
-  public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
-
-  // Calendar Browser
-  public static final String CALENDAR_TYPE = "calendarType";
-  public static final int CALENDAR_TYPE_DATE = 0;
-  public static final int CALENDAR_TYPE_DATETIME = 1;
-  public static final int CALENDAR_TYPE_GYEARMONTH = 2;
-  public static final int CALENDAR_TYPE_GDAY = 3;
-  public static final int CALENDAR_TYPE_GMONTHDAY = 4;
-
-  // ResizeFrameAction
-  public static final String FRAME_NAME = "frameName";
-
-  // Other Actions
-  public static final String CURRENT_TOOL_MANAGER = "currentToolManager";
-  
-  // Action Engine
-  public static final String ACTION_ENGINE_SCENARIO = "actionEngineScenario";
-  public static final String ACTION_ENGINE_MODE = "actionEngineMode";
-
-  // MultipartFormDataParser
-  public static final String MULTIPART_FORM_DATA_PARSER = "multipartFormDataParser";
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
deleted file mode 100644
index eb71f5fd1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/FrameNames.java
+++ /dev/null
@@ -1,28 +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.wst.ws.internal.explorer.platform.constants;
-
-public class FrameNames
-{
-  // wsexplorer.jsp
-  public final static String WINDOW_NAME_WSEXPLORER_JSP = "wsexplorer.jsp";
-  public final static String PERSPECTIVE_WORKAREA = "perspective_workarea";
-  public final static String PERSPECTIVE_TOOLBAR = "perspective_toolbar";
-  public final static String PERSPECTIVE_CONTENT = "perspective_content";
-  
-  // WSDL Browser
-  public final static String WSDL_TOOLBAR = "wsdl_toolbar";
-  public final static String WSDL_CONTENT = "wsdl_content";
-  
-  // Calendar Browser
-  public final static String CALENDAR_TOOLBAR = "calendar_toolbar";
-  public final static String CALENDAR_CONTENT = "calendar_content";  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
deleted file mode 100644
index dd55527ba..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ModelConstants.java
+++ /dev/null
@@ -1,19 +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.wst.ws.internal.explorer.platform.constants;
-
-public class ModelConstants
-{
-  public static final String REL_ID = "relationshipId";
-  public static final String REL_LOCALNAME_SEPARATOR = "#";
-  public static final String REL_OWNER = "owner";
-  public static final String REL_CHILDREN = "children";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
deleted file mode 100644
index b27134cd1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/constants/ToolTypes.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.constants;
-
-public class ToolTypes
-{
-  public static final byte FORM = 0;
-  public static final byte ACTION = 1;
-  public static final byte VIEW = 2;
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
deleted file mode 100644
index 8829f7df9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListElement.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-public class ListElement
-{
-  private int viewId_;
-  private Object object_;
-  // For search parameters: info on the Node and ViewTool holding this element.
-  private int targetNodeId_;
-  private int targetToolId_;
-  private int targetViewId_;
-
-  public ListElement(Object object)
-  {
-    object_ = object;
-    viewId_ = ActionInputs.VIEWID_DEFAULT;
-    targetNodeId_ = -1;
-    targetToolId_ = -1;
-    targetViewId_ = ActionInputs.VIEWID_DEFAULT;
-  }
-
-  public final Object getObject()
-  {
-    return object_;
-  }
-
-  public final void setViewId(int viewId)
-  {
-    viewId_ = viewId;
-  }
-
-  public final int getViewId()
-  {
-    return viewId_;
-  }
-
-  public final void setTargetViewToolInfo(int nodeId,int toolId,int viewId)
-  {
-    targetNodeId_ = nodeId;
-    targetToolId_ = toolId;
-    targetViewId_ = viewId;
-  }
-
-  public final int getTargetNodeId()
-  {
-    return targetNodeId_;
-  }
-
-  public final int getTargetToolId()
-  {
-    return targetToolId_;
-  }
-
-  public final int getTargetViewId()
-  {
-    return targetViewId_;
-  }
-
-  public final String toString() {
-    return getObject().toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
deleted file mode 100644
index 79c44b18e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/ListManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.datamodel;
-
-import java.util.*;
-
-public class ListManager
-{
-  private int nextViewId_;
-  private Vector itemsList_;
-  private Hashtable itemsTable_;
-
-  public ListManager()
-  {
-    nextViewId_ = 0;
-    itemsList_ = new Vector();
-    itemsTable_ = new Hashtable();
-  }
-
-  private final void updateManager(ListElement element)
-  {
-    itemsTable_.put(String.valueOf(nextViewId_),element);
-    element.setViewId(nextViewId_);
-    nextViewId_++;
-  }
-
-  public final void add(ListElement element)
-  {
-    itemsList_.addElement(element);
-    updateManager(element);
-  }
-
-  public final void addWithCurrentViewId(ListElement element)
-  {
-    itemsList_.addElement(element);
-    itemsTable_.put(String.valueOf(element.getViewId()),element);
-  }
-
-  public final ListElement elementAt(int index)
-  {
-    return (ListElement)itemsList_.elementAt(index);
-  }
-
-  public final ListElement getElementWithViewId(int viewId)
-  {
-    return (ListElement)itemsTable_.get(String.valueOf(viewId));
-  }
-
-  public final void removeElementWithViewId(int viewId)
-  {
-    itemsTable_.remove(String.valueOf(viewId));
-    for (int i=0;i<itemsList_.size();i++)
-    {
-      ListElement listElement = elementAt(i);
-      if (listElement.getViewId() == viewId)
-      {
-        itemsList_.removeElementAt(i);
-        break;
-      }
-    }
-  }
-
-  public final void removeElementAt(int index)
-  {
-    ListElement listElement = (ListElement)elementAt(index);
-    itemsList_.removeElementAt(index);
-    itemsTable_.remove(String.valueOf(listElement.getViewId()));
-  }
-
-  public final void insertElementAt(ListElement element,int index)
-  {
-    itemsList_.insertElementAt(element,index);
-    updateManager(element);
-  }
-
-  public final Enumeration getListElements()
-  {
-    return itemsList_.elements();
-  }
-
-  public final void clear()
-  {
-    itemsList_.removeAllElements();
-    itemsTable_.clear();
-  }
-
-  public final ListManager copy(ListManager newListManager)
-  {
-    newListManager.clear();
-    for (int i=0;i<itemsList_.size();i++)
-    {
-      ListElement listElement = (ListElement)elementAt(i);
-      ListElement newListElement = new ListElement(listElement.getObject());
-      newListElement.setViewId(listElement.getViewId());
-      newListElement.setTargetViewToolInfo(listElement.getTargetNodeId(),listElement.getTargetToolId(),listElement.getTargetViewId());
-      newListManager.addWithCurrentViewId(newListElement);
-    }
-    newListManager.setNextViewId(nextViewId_);
-    return newListManager;
-  }
-
-  public final void setNextViewId(int nextViewId)
-  {
-    nextViewId_ = nextViewId;
-  }
-
-  public final int getNextViewId()
-  {
-    return nextViewId_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
deleted file mode 100644
index 2d2da7445..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/datamodel/TreeElement.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-
-public class TreeElement extends BasicElement
-{
-  private String key_;
-
-  public TreeElement(String name,Model model)
-  {
-    super(name,model);
-    key_ = name;
-  }
-
-  public void setKey(String key)
-  {
-    key_ = key;
-  }
-
-  public String getKey()
-  {
-    return key_;
-  }
-
-  public boolean equals(TreeElement element)
-  {
-    if (key_ == null)
-      return false;
-    return key_.equals(element.getKey());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
deleted file mode 100644
index 13fce578b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionDataParser.java
+++ /dev/null
@@ -1,231 +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.wst.ws.internal.explorer.platform.engine;
-
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-public class ActionDataParser
-{
-  private Document doc;
-
-  public ScenarioDescriptor parseScenario(Element e)
-  {
-    ScenarioDescriptor scenarioDescriptor = new ScenarioDescriptor();
-    NodeList transactions = e.getElementsByTagName(ActionDataConstants.ELEMENT_TRANSACTION);
-    TransactionDescriptor[] transactionDescriptors = new TransactionDescriptor[transactions.getLength()];
-    for (int i = 0; i < transactionDescriptors.length; i++)
-      transactionDescriptors[i] = parseTransaction((Element) transactions.item(i));
-    scenarioDescriptor.setTransactionDescriptors(transactionDescriptors);
-    return scenarioDescriptor;
-  }
-
-  public TransactionDescriptor parseTransaction(Element e)
-  {
-    TransactionDescriptor transactionDescriptor = new TransactionDescriptor();
-    NodeList actions = e.getElementsByTagName(ActionDataConstants.ELEMENT_ACTION);
-    ActionDescriptor[] actionDescriptors = new ActionDescriptor[actions.getLength()];
-    for (int i = 0; i < actionDescriptors.length; i++)
-      actionDescriptors[i] = parseAction((Element) actions.item(i));
-    transactionDescriptor.setActionDescriptors(actionDescriptors);
-    return transactionDescriptor;
-  }
-
-  public ActionDescriptor parseAction(Element e)
-  {
-    ActionDescriptor actionDescriptor = new ActionDescriptor();
-    actionDescriptor.setId(e.getAttribute(ActionDataConstants.ATTR_ID));
-    try
-    {
-      actionDescriptor.setAttempts(Integer.parseInt(e.getAttribute(ActionDataConstants.ATTR_ATTEMPTS)));
-    }
-    catch (Throwable t)
-    {
-      actionDescriptor.setAttempts(1);
-    }
-    actionDescriptor.setStatusId(e.getAttribute(ActionDataConstants.ATTR_STATUS_ID));
-    Hashtable propertiesTable = new Hashtable();
-    NodeList properties = e.getElementsByTagName(ActionDataConstants.ELEMENT_PROPERTY);
-    for (int i = 0; i < properties.getLength(); i++)
-    {
-      Element property = (Element) properties.item(i);
-      String name = property.getAttribute(ActionDataConstants.ATTR_NAME);
-      NodeList valueList = property.getElementsByTagName(ActionDataConstants.ELEMENT_VALUE);
-      if (valueList.getLength() > 1)
-      {
-        String[] values = new String[valueList.getLength()];
-        for (int j = 0; j < values.length; j++)
-        {
-          Element value = (Element) valueList.item(j);
-          Node textNode = value.getFirstChild();
-          values[j] = (textNode != null) ? textNode.getNodeValue().trim() : "";
-        }
-        propertiesTable.put(name, values);
-      }
-      else
-      {
-        Node textNode = ((Element) valueList.item(0)).getFirstChild();
-        propertiesTable.put(name, (textNode != null) ? textNode.getNodeValue().trim() : "");
-      }
-    }
-    actionDescriptor.setProperties(propertiesTable);
-    NodeList statusList = e.getElementsByTagName(ActionDataConstants.ELEMENT_STATUS);
-    for (int i = 0; i < statusList.getLength(); i++)
-    {
-      Element status = (Element)statusList.item(i);
-      CDATASection cData = (CDATASection)status.getFirstChild();
-      actionDescriptor.addStatus(cData.getData());
-    }
-    return actionDescriptor;
-  }
-
-  public Element toElement(ScenarioDescriptor scenarioDescriptor)
-  {
-    try
-    {
-      Document document = getDocument();
-      Element scenarioElement = document.createElement(ActionDataConstants.ELEMENT_SCENARIO);
-      TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
-      for (int i = 0; i < transactionDescriptors.length; i++)
-      {
-        Element transactionElement = toElement(transactionDescriptors[i]);
-        if (transactionElement != null)
-          scenarioElement.appendChild(transactionElement);
-      }
-      return scenarioElement;
-    }
-    catch (DOMException dome)
-    {
-      return null;
-    }
-  }
-
-  public Element toElement(TransactionDescriptor transactionDescriptor)
-  {
-    try
-    {
-      Document document = getDocument();
-      Element transactionElement = document.createElement(ActionDataConstants.ELEMENT_TRANSACTION);
-      ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
-      for (int i = 0; i < actionDescriptors.length; i++)
-      {
-        Element actionElement = toElement(actionDescriptors[i]);
-        if (actionElement != null)
-          transactionElement.appendChild(actionElement);
-      }
-      return transactionElement;
-    }
-    catch (DOMException dome)
-    {
-      return null;
-    }
-  }
-
-  public Element toElement(ActionDescriptor actionDescriptor)
-  {
-    try
-    {
-      Document document = getDocument();
-      Element actionElement = document.createElement(ActionDataConstants.ELEMENT_ACTION);
-      actionElement.setAttribute(ActionDataConstants.ATTR_ID, actionDescriptor.getId());
-      actionElement.setAttribute(ActionDataConstants.ATTR_ATTEMPTS, String.valueOf(actionDescriptor.getAttempts()));
-      String statusId = actionDescriptor.getStatusId();
-      if (statusId != null)
-        actionElement.setAttribute(ActionDataConstants.ATTR_STATUS_ID, statusId);
-      Hashtable properties = actionDescriptor.getProperties();
-      if (properties != null)
-      {
-        for (Iterator it = properties.keySet().iterator(); it.hasNext();)
-        {
-          Object key = it.next();
-          Object value = properties.get(key);
-          Object[] values;
-          if (value.getClass().isArray())
-            values = (Object[])value;
-          else if (value instanceof List)
-            values = ((List)value).toArray();
-          else
-            values = new Object[] {value};
-          boolean isAdded = false;
-          Element propertyElement = document.createElement(ActionDataConstants.ELEMENT_PROPERTY);
-          propertyElement.setAttribute(ActionDataConstants.ATTR_NAME, key.toString());
-          for (int i = 0; i < values.length; i++)
-          {
-            if (values[i] instanceof String)
-            {
-              Element valueElement = document.createElement(ActionDataConstants.ELEMENT_VALUE);
-              valueElement.appendChild(document.createTextNode(values[i].toString()));
-              propertyElement.appendChild(valueElement);
-              isAdded = true;
-            }
-          }
-          if (isAdded)
-            actionElement.appendChild(propertyElement);
-        }
-      }
-      List status = actionDescriptor.getStatus();
-      if (status != null)
-      {
-        for (Iterator it = status.iterator(); it.hasNext();)
-        {
-          Element statusElement = document.createElement(ActionDataConstants.ELEMENT_STATUS);
-          CDATASection cData = document.createCDATASection(it.next().toString());
-          statusElement.appendChild(cData);
-          actionElement.appendChild(statusElement);
-        }
-      }
-      return actionElement;
-    }
-    catch (DOMException dome)
-    {
-      return null;
-    }
-  }
-
-  private Document getDocument()
-  {
-    try
-    {
-      if (doc == null)
-      {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder builder = factory.newDocumentBuilder();
-        doc = builder.newDocument();
-      }
-      return doc;
-    }
-    catch (FactoryConfigurationError fce)
-    {
-      return null;
-    }
-    catch (ParserConfigurationException pce)
-    {
-      return null;
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
deleted file mode 100644
index e33e3284b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/ActionEngine.java
+++ /dev/null
@@ -1,234 +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.wst.ws.internal.explorer.platform.engine;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ShowPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.constants.ActionDataConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class ActionEngine
-{
-  public static final byte MODE_DISABLED = 0x0;
-  public static final byte MODE_STOP = 0x1;
-  public static final byte MODE_RECORD = 0x2;
-  public static final byte MODE_PLAY = 0x3;
-
-  private Controller controller;
-  private byte mode;
-  private Vector actionDescriptors;
-
-  public ActionEngine(Controller controller)
-  {
-    this.controller = controller;
-    mode = MODE_DISABLED;
-    actionDescriptors = new Vector();
-  }
-
-  public void executeScenario(ScenarioDescriptor scenarioDescriptor)
-  {
-    TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
-    for (int i = 0; i < transactionDescriptors.length; i++)
-      executeTransaction(transactionDescriptors[i]);
-  }
-
-  public boolean executeTransaction(TransactionDescriptor transactionDescriptor)
-  {
-    boolean result = true;
-    ActionDescriptor[] actionDescriptors = transactionDescriptor.getActionDescriptors();
-    for (int i = 0; i < actionDescriptors.length; i++)
-    {
-      if (result)
-      {
-        if (!executeAction(actionDescriptors[i]))
-          result = false;
-      }
-      else
-        actionDescriptors[i].setStatusId(ActionDataConstants.VALUE_STATUS_ID_UNATTEMPTED);
-    }
-    return result;
-  }
-
-  public boolean executeAction(ActionDescriptor actionDescriptor)
-  {
-    int attempts = actionDescriptor.getAttempts();
-    for (int i = 0; i < attempts; i++)
-    {
-      try
-      {
-        Class classAction = Class.forName(actionDescriptor.getId());
-        if (Action.class.isAssignableFrom(classAction))
-        {
-          Action action = (Action) newInstance(classAction);
-          if (action != null)
-          {
-            Hashtable properties = actionDescriptor.getProperties();
-            ITransformer[] transformers = action.getTransformers();
-            for (int j = 0; j < transformers.length; j++)
-              properties = transformers[j].deNormalize(properties);
-            action.setPropertyTable(properties);
-            boolean actionResult = action.run();
-            // TODO actionDescriptor.addStatus(action.getStatus());
-            if (actionResult)
-            {
-              actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_PASSED);
-              return true;
-            }
-          }
-          else
-            throw new ClassNotFoundException(actionDescriptor.getId());
-        }
-      }
-      catch (ClassNotFoundException cnfe)
-      {
-        cnfe.printStackTrace();
-        StringWriter sw = new StringWriter();
-        cnfe.printStackTrace(new PrintWriter(sw));
-        actionDescriptor.addStatus(sw.getBuffer().toString());
-      }
-      catch (Throwable t)
-      {
-        t.printStackTrace();
-        StringWriter sw = new StringWriter();
-        t.printStackTrace(new PrintWriter(sw));
-        actionDescriptor.addStatus(sw.getBuffer().toString());
-      }
-    }
-    actionDescriptor.setStatusId(ActionDataConstants.VALUE_STATUS_ID_FAILED);
-    return false;
-  }
-
-  private ScenarioDescriptor newScenarioDescriptor()
-  {
-    return new ScenarioDescriptor();
-  }
-
-  private TransactionDescriptor newTransactionDescriptor()
-  {
-    return new TransactionDescriptor();
-  }
-
-  private ActionDescriptor newActionDescriptor(Action action)
-  {
-    ActionDescriptor actionDescriptor = new ActionDescriptor();
-    actionDescriptor.setId(action.getClass().getName());
-    Hashtable properties = new Hashtable(action.getPropertyTable());
-    ITransformer[] transformers = action.getTransformers();
-    for (int i = 0; i < transformers.length; i++)
-      properties = transformers[i].normalize(properties);
-    actionDescriptor.setProperties(properties);
-    return actionDescriptor;
-  }
-
-  private Object newInstance(Class c)
-  {
-    try
-    {
-      // instantiates the action using the constructor that takes in a
-      // controller object
-      Constructor constructor = c.getConstructor(new Class[]{Controller.class});
-      return constructor.newInstance(new Object[]{controller});
-    }
-    catch (NoSuchMethodException nsme)
-    {
-    }
-    catch (InstantiationException ie)
-    {
-    }
-    catch (IllegalAccessException iae)
-    {
-    }
-    catch (InvocationTargetException ite)
-    {
-    }
-    catch (Throwable t)
-    {
-    }
-    Object instance = null;
-    try
-    {
-      // instantiates the action using the default constructor
-      Constructor constructor = c.getConstructor(new Class[0]);
-      instance = constructor.newInstance(new Object[0]);
-      Method method = c.getMethod("setController", new Class[]{Controller.class});
-      method.invoke(instance, new Object[]{controller});
-    }
-    catch (NoSuchMethodException nsme)
-    {
-    }
-    catch (InstantiationException ie)
-    {
-    }
-    catch (IllegalAccessException iae)
-    {
-    }
-    catch (IllegalArgumentException iae)
-    {
-    }
-    catch (InvocationTargetException ite)
-    {
-    }
-    catch (Throwable t)
-    {
-    }
-    return instance;
-  }
-  
-  public byte getMode()
-  {
-    return mode;
-  }
-  
-  public void setMode(byte mode)
-  {
-    this.mode = mode;
-    if (mode == MODE_RECORD)
-    {
-      actionDescriptors = new Vector();
-      ShowPerspectiveAction showPerspectiveAction = new ShowPerspectiveAction(controller);
-      showPerspectiveAction.addProperty(ActionInputs.PERSPECTIVE, String.valueOf(controller.getCurrentPerspective().getPerspectiveId()));
-      actionDescriptors.add(newActionDescriptor(showPerspectiveAction));
-    }
-  }
-  
-  public boolean executeAction(Action action)
-  {
-    if (mode == MODE_RECORD)
-    {
-      ActionDescriptor actionDescriptor = newActionDescriptor(action);
-      actionDescriptors.add(actionDescriptor);
-    }
-    return action.run();
-  }
-  
-  public ScenarioDescriptor getScenario()
-  {
-    ScenarioDescriptor scenarioDescriptor = newScenarioDescriptor();
-    TransactionDescriptor transactionDescriptor = newTransactionDescriptor();
-    ActionDescriptor[] actionDescriptorArray = (ActionDescriptor[])actionDescriptors.toArray(new ActionDescriptor[0]);
-    transactionDescriptor.setActionDescriptors(actionDescriptorArray);
-    scenarioDescriptor.setTransactionDescriptors(new TransactionDescriptor[] {transactionDescriptor});
-    return scenarioDescriptor;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java
deleted file mode 100644
index 7d53ee26b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/constants/ActionDataConstants.java
+++ /dev/null
@@ -1,30 +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.wst.ws.internal.explorer.platform.engine.constants;
-
-public class ActionDataConstants
-{
-  public static final String ATTR_ID = "id";
-  public static final String ATTR_NAME = "name";
-  public static final String ATTR_ATTEMPTS = "attempts";
-  public static final String ATTR_STATUS_ID = "statusId";
-  
-  public static final String ELEMENT_SCENARIO = "scenario";
-  public static final String ELEMENT_TRANSACTION = "transaction";
-  public static final String ELEMENT_ACTION = "action";
-  public static final String ELEMENT_PROPERTY = "property";
-  public static final String ELEMENT_VALUE = "value";
-  public static final String ELEMENT_STATUS = "status";
-  
-  public static final String VALUE_STATUS_ID_UNATTEMPTED = "unattempted";
-  public static final String VALUE_STATUS_ID_PASSED = "passed";
-  public static final String VALUE_STATUS_ID_FAILED = "failed";
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java
deleted file mode 100644
index 85bb5b7da..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ActionDescriptor.java
+++ /dev/null
@@ -1,92 +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.wst.ws.internal.explorer.platform.engine.data;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-public class ActionDescriptor
-{
-  private String id;
-  private Hashtable properties;
-  private int attempts;
-  private String statusId;
-  private List statusList;
-  
-  public ActionDescriptor()
-  {
-    attempts = 1;
-  }
-
-  public String getId()
-  {
-    return id;
-  }
-  
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  public Hashtable getProperties()
-  {
-    return properties;
-  }
-  
-  public void setProperties(Hashtable properties)
-  {
-    this.properties = properties;
-  }
-  
-  public int getAttempts()
-  {
-  	return attempts;
-  }
-  
-  public void setAttempts(int attempts)
-  {
-  	this.attempts = attempts;
-  }
-  
-  public String getStatusId()
-  {
-    return statusId;
-  }
-  
-  public void setStatusId(String statusId)
-  {
-    this.statusId = statusId;
-  }
-  
-  public void addStatus(Object status)
-  {
-    if (status != null)
-    {
-      if (statusList == null)
-        statusList = new Vector();
-      statusList.add(status);
-    }
-  }
-  
-  public boolean removeStatus(Object status)
-  {
-    if (status != null && statusList != null)
-      return statusList.remove(status);
-    else
-      return false;
-  }
-  
-  public List getStatus()
-  {
-    return statusList;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
deleted file mode 100644
index 41a3f90fe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/ScenarioDescriptor.java
+++ /dev/null
@@ -1,26 +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.wst.ws.internal.explorer.platform.engine.data;
-
-public class ScenarioDescriptor
-{
-  private TransactionDescriptor[] transactionDescriptors;
-
-  public TransactionDescriptor[] getTransactionDescriptors()
-  {
-    return transactionDescriptors;
-  }
-  
-  public void setTransactionDescriptors(TransactionDescriptor[] transactionDescriptors)
-  {
-    this.transactionDescriptors = transactionDescriptors;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
deleted file mode 100644
index 3ef67b972..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/data/TransactionDescriptor.java
+++ /dev/null
@@ -1,26 +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.wst.ws.internal.explorer.platform.engine.data;
-
-public class TransactionDescriptor
-{
-  private ActionDescriptor[] actionDescriptors;
-
-  public ActionDescriptor[] getActionDescriptors()
-  {
-    return actionDescriptors;
-  }
-  
-  public void setActionDescriptors(ActionDescriptor[] actionDescriptors)
-  {
-    this.actionDescriptors = actionDescriptors;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
deleted file mode 100644
index 5bf3299f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/CurrentNodeSelectionTransformer.java
+++ /dev/null
@@ -1,47 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-
-public class CurrentNodeSelectionTransformer implements ITransformer
-{
-  protected Controller controller;
-  protected String key;
-
-  public CurrentNodeSelectionTransformer(Controller controller)
-  {
-    this(controller, ActionInputs.NODEID);
-  }
-
-  public CurrentNodeSelectionTransformer(Controller controller, String key)
-  {
-    this.controller = controller;
-    this.key = key;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    return properties;
-  }
-  
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-    if (currNode != null)
-      properties.put(key, String.valueOf(currNode.getNodeId()));
-    return properties;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
deleted file mode 100644
index 4755ffe85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ITransformer.java
+++ /dev/null
@@ -1,19 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-
-public interface ITransformer
-{
-  public Hashtable normalize(Hashtable properties);
-  public Hashtable deNormalize(Hashtable properties);
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
deleted file mode 100644
index 81ac34fb9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MassNodeIdTransformer.java
+++ /dev/null
@@ -1,105 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-
-public class MassNodeIdTransformer extends NodeIdTransformer
-{
-  protected String massNodeIdKey;
-
-  public MassNodeIdTransformer(Controller controller, String massNodeIdKey)
-  {
-    super(controller);
-    this.massNodeIdKey = massNodeIdKey;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    if (!properties.containsKey(massNodeIdKey))
-      return super.normalize(properties);
-    Object origNodeId = properties.get(ActionInputs.NODEID);
-    String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
-    for (int i = 0; i < massNodeIds.length; i++)
-    {
-      properties.put(ActionInputs.NODEID, massNodeIds[i]);
-      properties = super.normalize(properties);
-      String[] rels = getValueAsStringArray(properties, ModelConstants.REL_ID);
-      if (rels.length > 0)
-      {
-        StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
-        sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        sb.append(massNodeIds[i]);
-        properties.put(sb.toString(), rels);
-      }
-      properties.remove(ActionInputs.NODEID);
-      properties.remove(ModelConstants.REL_ID);
-    }
-    if (origNodeId != null)
-      properties.put(ActionInputs.NODEID, origNodeId);
-    return properties;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    if (!properties.containsKey(massNodeIdKey))
-      return super.deNormalize(properties);
-    Vector massNodeIdVector = new Vector();
-    Object origNodeId = properties.get(ActionInputs.NODEID);
-    properties.remove(ActionInputs.NODEID);
-    String[] massNodeIds = getValueAsStringArray(properties, massNodeIdKey);
-    for (int i = 0; i < massNodeIds.length; i++)
-    {
-      StringBuffer sb = new StringBuffer(ModelConstants.REL_ID);
-      sb.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-      sb.append(massNodeIds[i]);
-      Object rels = properties.get(sb.toString());
-      if (rels != null)
-      {
-        properties.put(ModelConstants.REL_ID, rels);
-        properties = super.deNormalize(properties);
-        Object nodeId = properties.get(ActionInputs.NODEID);
-        if (nodeId != null)
-        {
-          massNodeIdVector.add(nodeId);
-          properties.remove(ActionInputs.NODEID);
-        }
-        properties.remove(ModelConstants.REL_ID);
-      }
-    }
-    if (origNodeId != null)
-      properties.put(ActionInputs.NODEID, origNodeId);
-    int size = massNodeIdVector.size();
-    if (size == 1)
-      properties.put(massNodeIdKey, massNodeIdVector.get(0));
-    else if (size > 1)
-      properties.put(massNodeIdKey, massNodeIdVector.toArray(new String[0]));
-    else
-      properties.remove(massNodeIdKey);
-    return properties;
-  }
-
-  private String[] getValueAsStringArray(Hashtable properties, String key)
-  {
-    Object values = properties.get(key);
-    if (values == null)
-      return new String[0];
-    else if (values instanceof String[])
-      return (String[])values;
-    else
-      return new String[] {values.toString()};
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.java
deleted file mode 100644
index b4f0a2c68..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/MultipartFormDataParserTransformer.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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public class MultipartFormDataParserTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public MultipartFormDataParserTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    MultipartFormDataParser parser = (MultipartFormDataParser)properties.get(ActionInputs.MULTIPART_FORM_DATA_PARSER);
-    String[] keys;
-    try
-    {
-      keys = parser.getParameterNames();
-    }
-    catch (Throwable t)
-    {
-      keys = new String[0];
-    }
-    for (int i = 0; i < keys.length; i++)
-    {
-      StringBuffer newKey = new StringBuffer(ActionInputs.MULTIPART_FORM_DATA_PARSER);
-      newKey.append(keys[i]);
-      try
-      {
-        properties.put(newKey.toString(), parser.getParameterValues(keys[i]));
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return properties;
-  }
-  
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Enumeration e = properties.keys();
-    while (e.hasMoreElements())
-    {
-      Object key = e.nextElement();
-      if (key instanceof String)
-      {
-        if (((String)key).startsWith(ActionInputs.MULTIPART_FORM_DATA_PARSER))
-        {
-          String realKey = ((String)key).substring(ActionInputs.MULTIPART_FORM_DATA_PARSER.length());
-          if (!properties.containsKey(realKey))
-          {
-            Object value = properties.remove(key);
-            properties.put(realKey, value);
-          }
-        }
-      }
-    }
-    return properties;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
deleted file mode 100644
index d2af98b5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeIdTransformer.java
+++ /dev/null
@@ -1,134 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.Enumeration;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeIdTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public NodeIdTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    Vector rels = new Vector();
-    try
-    {
-      int nodeId = Integer.parseInt((String)properties.get(ActionInputs.NODEID));
-      NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-      Node rootNode = nodeManager.getRootNode();
-      Node node = nodeManager.getNode(nodeId);
-      int depth = 0;
-      if (node != null)
-        depth = node.getNodeDepth();
-      while (rels.size() < depth && node != null && node != rootNode)
-      {
-        Node parentNode = node.getParent();
-        Element element = node.getTreeElement();
-        Rel rel = getRel(parentNode.getTreeElement(), element);
-        StringBuffer relValue = new StringBuffer(rel.getName());
-        relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        relValue.append(element.getName());
-        rels.insertElementAt(relValue.toString(), 0);
-        node = parentNode;
-      }
-    }
-    catch (NumberFormatException nfe)
-    {
-    }
-    int numRelationships = rels.size();
-    if (numRelationships == 1)
-      properties.put(ModelConstants.REL_ID, rels.get(0).toString());
-    else if (numRelationships > 1)
-      properties.put(ModelConstants.REL_ID, (String[])rels.toArray(new String[0]));
-    return properties;
-  }
-
-  private Rel getRel(Element sourceElement, Element targetElement)
-  {
-    Enumeration rels = sourceElement.getRels();
-    while (rels.hasMoreElements())
-    {
-      Rel rel = (Rel)rels.nextElement();
-      Enumeration targetElements = rel.getTargetElements();
-      while (targetElements.hasMoreElements())
-      {
-        if (targetElements.nextElement() == targetElement)
-          return rel;
-      }
-    }
-    return null;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-    Node node = nodeManager.getRootNode();
-    Object value = properties.get(ModelConstants.REL_ID);
-    String[] relationships = null;
-    if (value instanceof String[])
-      relationships = (String[])value;
-    else if (value != null)
-      relationships = new String[] {value.toString()};
-    if (relationships != null)
-    {
-      for (int i = 0; i < relationships.length; i++)
-      {
-        int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        if (index == -1)
-          return deNormalizeAsSelectedNode(properties);
-        String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
-        String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
-        if (localname == null)
-          return deNormalizeAsSelectedNode(properties);
-        node = getNode(node, rel, localname);
-        if (node == null)
-          return deNormalizeAsSelectedNode(properties);
-      }
-      properties.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
-      return properties;
-    }
-    else
-      return deNormalizeAsSelectedNode(properties);
-  }
-  
-  private Hashtable deNormalizeAsSelectedNode(Hashtable properties)
-  {
-    return (new CurrentNodeSelectionTransformer(controller)).deNormalize(properties);
-  }
-
-  private Node getNode(Node parent, String rel, String localname)
-  {
-    Element parentElement = parent.getTreeElement();
-    Enumeration e = parentElement.getElements(rel);
-    while (e.hasMoreElements())
-    {
-      Element element = (Element)e.nextElement();
-      if (localname.equals(element.getName()))
-        return parent.getChildNode((TreeElement)element);
-    }
-    return null;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
deleted file mode 100644
index 175dc03d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/NodeSelectionTransformer.java
+++ /dev/null
@@ -1,163 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class NodeSelectionTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public NodeSelectionTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    try
-    {
-      NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-      Node nextNode = nodeManager.getNode(Integer.parseInt((String) properties.get(ActionInputs.NODEID)));
-      Node currNode = nodeManager.getSelectedNode();
-      if (currNode == null)
-        currNode = nodeManager.getRootNode();
-      Vector nextRels = new Vector();
-      Vector currRels = new Vector();
-      while (nextNode != null && currNode != null && (!isRootElement(nextNode.getTreeElement()) || !isRootElement(currNode.getTreeElement())) && nextNode != currNode)
-      {
-        if (nextNode.getNodeDepth() >= currNode.getNodeDepth())
-        {
-          Node parentNode = nextNode.getParent();
-          Element nextElement = nextNode.getTreeElement();
-          Rel rel = getRel(parentNode.getTreeElement(), nextElement);
-          StringBuffer relValue = new StringBuffer(rel.getName());
-          relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-          relValue.append(nextElement.getName());
-          nextRels.insertElementAt(relValue.toString(), 0);
-          nextNode = parentNode;
-        }
-        else
-        {
-          Node parentNode = currNode.getParent();
-          Element parentElement = parentNode.getTreeElement();
-          Rel rel = getRel(currNode.getTreeElement(), parentElement);
-          StringBuffer relValue = new StringBuffer(rel.getName());
-          relValue.append(ModelConstants.REL_LOCALNAME_SEPARATOR);
-          relValue.append(parentElement.getName());
-          currRels.add(relValue.toString());
-          currNode = parentNode;
-        }
-      }
-      currRels.addAll(nextRels);
-      int numRelationships = currRels.size();
-      if (numRelationships == 1)
-        properties.put(ModelConstants.REL_ID, currRels.get(0).toString());
-      else if (numRelationships > 1)
-        properties.put(ModelConstants.REL_ID, (String[]) currRels.toArray(new String[0]));
-    }
-    catch (NumberFormatException nfe)
-    {
-    }
-    return properties;
-  }
-
-  private boolean isRootElement(Element e)
-  {
-    return e.getModel().getRootElement() == e;
-  }
-
-  private Rel getRel(Element sourceElement, Element targetElement)
-  {
-    Enumeration rels = sourceElement.getRels();
-    while (rels.hasMoreElements())
-    {
-      Rel rel = (Rel) rels.nextElement();
-      Enumeration targetElements = rel.getTargetElements();
-      while (targetElements.hasMoreElements())
-      {
-        if (targetElements.nextElement() == targetElement)
-          return rel;
-      }
-    }
-    return null;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    Node currNode = nodeManager.getSelectedNode();
-    if (currNode == null)
-      currNode = rootNode;
-    Object value = properties.get(ModelConstants.REL_ID);
-    String[] relationships = null;
-    if (value instanceof String[])
-      relationships = (String[]) value;
-    else if (value != null)
-      relationships = new String[]{value.toString()};
-    if (relationships != null)
-    {
-      Element currElement = currNode.getTreeElement();
-      for (int i = 0; i < relationships.length; i++)
-      {
-        int index = relationships[i].indexOf(ModelConstants.REL_LOCALNAME_SEPARATOR);
-        String rel = (index != -1) ? relationships[i].substring(0, index) : relationships[i];
-        String localname = (index != -1) ? relationships[i].substring(index + 1, relationships[i].length()) : null;
-        Enumeration e = currElement.getElements(rel);
-        Element targetElement = null;
-        if (localname != null)
-        {
-          Element firstElement = null;
-          while (e.hasMoreElements())
-          {
-            Element nextElement = (Element) e.nextElement();
-            if (firstElement == null)
-              firstElement = nextElement;
-            if (localname.equals(nextElement.getName()))
-            {
-              targetElement = nextElement;
-              break;
-            }
-          }
-          if (targetElement == null)
-            targetElement = firstElement;
-        }
-        else
-        {
-          if (e.hasMoreElements())
-            targetElement = (Element) e.nextElement();
-        }
-        if (targetElement != null)
-        {
-          currElement = (Element) targetElement;
-          Node parentNode = currNode.getParent();
-          if (parentNode != null && parentNode.getTreeElement() == currElement)
-            currNode = parentNode;
-          else
-            currNode = currNode.getChildNode((TreeElement) currElement);
-        }
-      }
-    }
-    properties.put(ActionInputs.NODEID, String.valueOf(currNode.getNodeId()));
-    return properties;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
deleted file mode 100644
index d6bd1359a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/engine/transformer/ViewSelectionTransformer.java
+++ /dev/null
@@ -1,121 +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.wst.ws.internal.explorer.platform.engine.transformer;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListManager;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class ViewSelectionTransformer implements ITransformer
-{
-  protected Controller controller;
-  protected String listManagerKey;
-  protected String viewKey;
-
-  public ViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey)
-  {
-    this.controller = controller;
-    this.listManagerKey = listManagerKey;
-    this.viewKey = viewKey;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    Vector normalizedViewIds = new Vector();
-    NodeManager nodeManager = controller.getCurrentPerspective().getNodeManager();
-    Node currNode = nodeManager.getSelectedNode();
-    TreeElement currElement = currNode.getTreeElement();
-    Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
-    if (listManagerObj instanceof ListManager)
-    {
-      ListManager listManager = (ListManager) listManagerObj;
-      String[] viewIds = getViewValues(properties);
-      for (int i = 0; i < viewIds.length; i++)
-      {
-        ListElement listElement = null;
-        try
-        {
-          listElement = listManager.getElementWithViewId(Integer.parseInt(viewIds[i]));
-        }
-        catch (NumberFormatException nfe)
-        {
-        }
-        if (listElement != null)
-        {
-          Object object = listElement.getObject();
-          if (object != null && object instanceof Element)
-          {
-            Element element = (Element) object;
-            normalizedViewIds.add(element.getName());
-          }
-        }
-      }
-    }
-    properties.put(viewKey, normalizedViewIds.toArray(new String[0]));
-    return properties;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Vector viewIds = new Vector();
-    Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-    if (currNode != null)
-    {
-      TreeElement currElement = currNode.getTreeElement();
-      Object listManagerObj = currElement.getPropertyAsObject(listManagerKey);
-      if (listManagerObj instanceof ListManager)
-      {
-        ListManager listManager = (ListManager) listManagerObj;
-        String[] normalizedViewIds = getViewValues(properties);
-        for (int i = 0; i < normalizedViewIds.length; i++)
-        {
-          Enumeration e = listManager.getListElements();
-          while (e.hasMoreElements())
-          {
-            ListElement listElement = (ListElement) e.nextElement();
-            Element element = (Element) listElement.getObject();
-            if (element != null && normalizedViewIds[i].equals(element.getName()))
-            {
-              viewIds.add(String.valueOf(listElement.getViewId()));
-              break;
-            }
-          }
-        }
-      }
-    }
-    int size = viewIds.size();
-    if (size == 1)
-      properties.put(viewKey, viewIds.get(0));
-    else if (size > 1)
-      properties.put(viewKey, viewIds.toArray(new String[0]));
-    return properties;
-  }
-
-  private String[] getViewValues(Hashtable properties)
-  {
-    Object viewValueObj = properties.get(viewKey);
-    String[] viewValues;
-    if (viewValueObj == null)
-      viewValues = new String[0];
-    else if (viewValueObj.getClass().isArray())
-      viewValues = (String[]) viewValueObj;
-    else
-      viewValues = new String[]{(String) viewValueObj};
-    return viewValues;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 32312a53c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,59 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-import java.util.Hashtable;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddBusinessToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement) selectedElement;
-    String businessName = busElement.getName();
-    String inquiryAPI = busElement.getInquiryURL();
-    String businessKey = busElement.getBusinessKey();
-    // create the registry in the UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
-      return false;
-    RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
-    if (!action.run())
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
-      return false;
-    }
-    uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
deleted file mode 100644
index 174df859d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddRegistryToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,43 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class AddRegistryToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddRegistryToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement) selectedElement;
-    String registryName = regElement.getName();
-    String inquiryAPI = regElement.getInquiryURL();
-    String publishAPI = regElement.getPublishURL();
-    String registrationURL = regElement.getRegistrationURL();
-    if (!createRegistryInUDDIPerspective(inquiryAPI, publishAPI, registryName, registrationURL, false))
-      return false;
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", registryName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
deleted file mode 100644
index b3921bda3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceInterfaceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,59 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceInterfaceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-import java.util.Hashtable;
-
-public class AddServiceInterfaceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddServiceInterfaceToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement) selectedElement;
-    String serIntName = serIntElement.getName();
-    String inquiryAPI = serIntElement.getInquiryURL();
-    String serIntKey = serIntElement.getServiceInterfaceKey();
-    // create the registry in the UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
-      return false;
-    RegFindServiceInterfaceUUIDAction action = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY, serIntKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, serIntName);
-    if (!action.run())
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serIntName));
-      return false;
-    }
-    uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serIntName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index 26969d2a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,59 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-
-import java.util.Hashtable;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddServiceToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement) selectedElement;
-    String serviceName = serElement.getName();
-    String inquiryAPI = serElement.getInquiryURL();
-    String serviceKey = serElement.getServiceKey();
-    // create the registry in the UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryAPI, null, inquiryAPI, null, true))
-      return false;
-    RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
-    if (!action.run())
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
-      return false;
-    }
-    uddiPerspective.getNavigatorManager().getSelectedNode().setVisibilityOfChildren(true);
-    favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index 2756e69c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIBusinessFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIServiceInterfaceFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction {
-    public AddToUDDIPerspectiveAction(Controller controller) {
-        super(controller);
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWID);
-        actionLink.append('=');
-        actionLink.append(viewID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWTOOLID);
-        actionLink.append('=');
-        actionLink.append(viewToolID);
-        return actionLink.toString();
-    }
-
-    public static String getBaseActionLink() {
-        return "favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp";
-    }
-
-    protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName, String registrationURL,boolean useExisting) {
-        Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
-        if (registryNodes != null)
-        {
-          if (useExisting)
-          {
-            Node registryNode = (Node)registryNodes.elementAt(0);
-            NodeManager nodeManager = registryNode.getNodeManager();
-            nodeManager.setSelectedNodeId(registryNode.getNodeId());
-            return true;
-          }
-        }
-        
-        // open the registry if it is not already opened in the UDDI perspective
-        OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-
-        // populate the property table
-        Hashtable propertyTable = openRegAction.getPropertyTable();
-        if (Validator.validateString(registryName))
-            propertyTable.put(UDDIActionInputs.REGISTRY_NAME,registryName);
-        else
-            return false;
-
-        if (Validator.validateURL(inquiryAPI))
-            propertyTable.put(UDDIActionInputs.INQUIRY_URL,inquiryAPI);
-        else
-            return false;
-
-        if (Validator.validateURL(publishAPI))
-            propertyTable.put(UDDIActionInputs.PUBLISH_URL,publishAPI);
-
-        if (Validator.validateURL(registrationURL))
-            propertyTable.put(UDDIActionInputs.REGISTRATION_URL,registrationURL);
-            
-        // If user-defined category metadata exists, search and make the associations.
-        StringBuffer directoryBuffer = new StringBuffer();
-        FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
-        File categoriesDirectory = new File(directoryBuffer.toString());
-        File[] categoryFiles = null;
-        if (categoriesDirectory.exists())
-        {
-          categoryFiles = categoriesDirectory.listFiles();
-          if (categoryFiles.length > 0)
-            propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
-        }
-
-        // run the action
-        if (!openRegAction.run())
-            return false;
-        
-        if (categoryFiles != null && categoryFiles.length > 0)
-        {
-          RegistryElement regElement = (RegistryElement)(controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode().getTreeElement());
-          regElement.setCheckForUserDefinedCategories(true);
-          regElement.getUserDefinedCategories();
-          linkCategoryModelsWithSavedData(registryName,regElement.getUserDefinedCategories());
-        }
-        return true;
-    }
-    
-    public final void linkCategoryModelsWithSavedData(String registryName,Enumeration userDefinedCategories)
-    {
-      StringBuffer directoryBuffer = new StringBuffer();
-      FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),registryName);
-      linkCategoryModelsWithSavedData(userDefinedCategories,directoryBuffer.toString());
-    }
-    
-    public final void linkCategoryModelsWithSavedData(Enumeration userDefinedCategories,String categoriesDirectory)
-    {
-      File categoriesDirectoryFile = new File(categoriesDirectory);
-      File[] categoryFiles = null;
-      if (categoriesDirectoryFile.exists())
-      {
-        categoryFiles = categoriesDirectoryFile.listFiles(); 
-        if (userDefinedCategories != null)
-        {
-          while (userDefinedCategories.hasMoreElements())
-          {
-            CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();
-            String categoryKey = categoryModel.getCategoryKey();
-            for (int i=0;i<categoryFiles.length;i++)
-            {
-              String categoryPropertiesFileName = categoryFiles[i].getName();
-              int lastDotPos = categoryPropertiesFileName.lastIndexOf(".");
-              String decodedCategoryPropertiesFileNameBase = URLUtils.decode(categoryPropertiesFileName.substring(0,lastDotPos));
-              if (lastDotPos > 0 && categoryPropertiesFileName.endsWith(".properties") && categoryKey.equals(decodedCategoryPropertiesFileNameBase))
-              {
-                categoryModel.setDefaultDataFile(categoryFiles[i].getAbsolutePath());
-                categoryModel.loadFromDelimiterFile();
-                break;
-              }
-            }            
-          }
-        }
-      }
-    }
-
-    protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
-    {
-      Vector registryNodes = null;
-      NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
-      UDDIMainNode uddiMainNode = (UDDIMainNode)(navigatorManager.getRootNode());
-      Vector childNodes = uddiMainNode.getChildNodes();
-      for (int i=0;i<childNodes.size();i++)
-      {
-        Node childNode = (Node)childNodes.elementAt(i);
-        if (childNode instanceof RegistryNode)
-        {
-          RegistryElement regElement = (RegistryElement)childNode.getTreeElement();
-          String currInquiryURL = regElement.getInquiryURL();
-          if (currInquiryURL != null && currInquiryURL.equals(inquiryURL))
-          {
-            if (registryNodes == null)
-              registryNodes = new Vector();
-            registryNodes.addElement(childNode);
-          }
-        }        
-      }
-      return registryNodes;
-    }
-    
-    public static AddToUDDIPerspectiveAction newAction(Controller controller) {
-        TreeElement selectedElement = controller.getFavoritesPerspective().getNodeManager().getSelectedNode().getTreeElement();
-        FavoritesFolderElement favoritesFolderElement = null;
-
-        if (selectedElement instanceof FavoritesFolderElement) {
-            favoritesFolderElement = (FavoritesFolderElement)selectedElement;
-        }
-        else if (selectedElement instanceof FavoritesElement) {
-            favoritesFolderElement = ((FavoritesElement)selectedElement).getParentFolderElement();
-        }
-        else {
-            return null;
-        }
-
-        // return an instance of AddToUDDIPerspectiveAction depending on the type of
-        // favorites folder element being selected.
-        if (favoritesFolderElement instanceof FavoritesUDDIRegistryFolderElement)
-            return new AddRegistryToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUDDIBusinessFolderElement)
-            return new AddBusinessToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUDDIServiceFolderElement)
-            return new AddServiceToUDDIPerspectiveAction(controller);
-        else if (favoritesFolderElement instanceof FavoritesUDDIServiceInterfaceFolderElement)
-            return new AddServiceInterfaceToUDDIPerspectiveAction(controller);
-        else
-            return null;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
deleted file mode 100644
index 80a10308b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/AddWSILToWSILPerspectiveAction.java
+++ /dev/null
@@ -1,76 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilActionInputs;
-
-import java.util.Hashtable;
-
-public class AddWSILToWSILPerspectiveAction extends MultipleLinkAction
-{
-  public AddWSILToWSILPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp";
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesWSILElement wsilElement = (FavoritesWSILElement) selectedElement;
-    String wsilURL = wsilElement.getWsilUrl();
-    OpenWSILAction openWSILAction = new OpenWSILAction(controller_);
-    Hashtable propertyTable = openWSILAction.getPropertyTable();
-    propertyTable.put(WsilActionInputs.WSIL_URL, wsilURL);
-    propertyTable.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
-    boolean actionResult = openWSILAction.run();
-    if (actionResult)
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSIL_TO_WSIL_PERSPECTIVE_SUCCESSFUL", wsilURL));
-    else
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSIL_TO_WSIL_PERSPECTIVE", wsilURL));
-    return actionResult;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
deleted file mode 100644
index 233e22e39..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesWSDLServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-
-import java.util.Hashtable;
-
-public class FavoritesAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
-  public FavoritesAddToWSDLPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp";
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement) selectedNode.getTreeElement();
-    String wsdlUrl = wsdlElement.getWsdlUrl();
-    OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-    Hashtable propertyTable = openWSDLAction.getPropertyTable();
-    propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
-    boolean actionResult = openWSDLAction.run();
-    if (actionResult)
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
-    else
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
-    return actionResult;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
deleted file mode 100644
index bad13a92a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToFileSystemAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-
-public class FavoritesImportToFileSystemAction extends ImportToFileSystemAction {
-
-    private Definition def_;
-    private String wsdlFileName_;
-
-    public FavoritesImportToFileSystemAction(Controller controller) {
-        super(controller);
-    }
-
-    public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-    {
-      return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"favorites/actions/FavortiesImportToFileSystemActionJSP.jsp");
-    }
-
-    public boolean write(OutputStream os) {
-        if (def_ != null) {
-            return writeWSDLDefinition(os, def_);
-        }
-        else {
-            return false;
-        }
-    }
-
-    public String getDefaultFileName() {
-        return wsdlFileName_;
-    }
-
-    public boolean run() {
-        int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
-        // return false if nodeID == 0, that is the main node
-        if (nodeID == 0)
-            return false;
-
-        FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-        NodeManager nodeManager = favPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getNode(nodeID);
-        TreeElement selectedElement = selectedNode.getTreeElement();
-
-        String wsdlURL = ((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl();
-        wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
-        try {
-          def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
-        }
-        catch (Throwable t) {
-            favPerspective.getMessageQueue().addMessage(t.getMessage());
-            return false;
-        }
-        return true;
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentVar();
-    }
-
-    public final String getStatusContentPage()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
deleted file mode 100644
index b26d560dc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesImportToWorkbenchAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Hashtable;
-
-public class FavoritesImportToWorkbenchAction extends ImportToWorkbenchAction {
-    public FavoritesImportToWorkbenchAction(Controller controller) {
-        super(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public ImportToFileSystemAction newImportToFileSystemAction() {
-        FavoritesImportToFileSystemAction action = new FavoritesImportToFileSystemAction(controller_);
-        Hashtable table = action.getPropertyTable();
-
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        NodeManager nodeManager = favoritesPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-
-        table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-        table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
-        return action;
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentVar();
-    }
-
-    public final String getStatusContentPage()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
deleted file mode 100644
index 58aae22b1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
-    public FavoritesLaunchWebServiceWizardAction(Controller controller) {
-        super(controller);
-    }
-
-    public static LaunchWebServiceWizardAction newAction(Controller controller) {
-        return new FavoritesLaunchWebServiceWizardAction(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        return (FormTool)favoritesPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public boolean run() {
-        FavoritesPerspective favoritesPerspective = controller_.getFavoritesPerspective();
-        NodeManager nodeManager = favoritesPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-        if (selectedElement instanceof FavoritesWSDLServiceElement)
-            return launchWizard(((FavoritesWSDLServiceElement)selectedElement).getWsdlUrl());
-        else
-            return false;
-    }
-    
-    public final String getStatusContentVar()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentVar();
-    }
-    
-    public final String getStatusContentPage()
-    {
-      return controller_.getFavoritesPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
deleted file mode 100644
index 9cd0e35b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesRestoreDefaultFavoritesAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Vector;
-import javax.servlet.http.*;
-
-public class FavoritesRestoreDefaultFavoritesAction extends LinkAction
-{
-  public FavoritesRestoreDefaultFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp");
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public boolean run()
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    Node mainNode = nodeManager.getRootNode();
-    FavoritesMainElement mainElement = (FavoritesMainElement)mainNode.getTreeElement();
-    boolean actionResult = mainElement.restoreFavoritesDefault();
-    if (actionResult)
-    {
-      Vector folderNodes = mainNode.getChildNodes();
-      for (int i = 0; i < folderNodes.size(); i++)
-      {
-        Node folderNode = (Node)folderNodes.elementAt(i);
-        TreeElement treeElement = folderNode.getTreeElement();
-        if (treeElement instanceof FavoritesFolderElement)
-        {
-          FavoritesFolderElement folderElement = (FavoritesFolderElement)treeElement;
-          folderElement.removeAllFavorites(controller_.getServletEngineStateLocation());
-          folderElement.init(mainElement);
-        }
-      }
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_INFO_FAVORITES_RESTORED_TO_DEFAULT"));
-      return true;
-    }
-    else
-    {
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_OPEN_FAVORITES_BACKUP"));
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
deleted file mode 100644
index d5d337a90..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/FavoritesToggleNodeAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesToggleNodeAction extends ToggleNodeAction {
-    public FavoritesToggleNodeAction(Controller controller) {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeId, boolean open) {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/FavoritesToggleNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeId);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.OPEN);
-        actionLink.append('=');
-        if (open)
-            actionLink.append(ActionInputs.OPEN_NODE);
-        else
-            actionLink.append(ActionInputs.CLOSE_NODE);
-        return actionLink.toString();
-    }
-
-    public final String getActionLinkForHistory() {
-        ToolManager toolManager = toggledNode_.getToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        int nodeId = toggledNode_.getNodeId();
-        int toolId = selectedTool.getToolId();
-        int viewId = toggledNode_.getViewId();
-        int viewToolId = toggledNode_.getViewToolId();
-        if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectFavoritesToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
-        else
-            return SelectFavoritesNodeAction.getActionLink(nodeId, true);
-    }
-
-  public final String getTreeContentVar()
-  {
-    return controller_.getFavoritesPerspective().getTreeContentVar();
-  }
-
-  public final String getTreeContentPage()
-  {
-    return controller_.getFavoritesPerspective().getTreeContentPage();
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return controller_.getFavoritesPerspective().getPropertiesContainerVar();
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return controller_.getFavoritesPerspective().getPropertiesContainerPage();
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_FAVORITES;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
deleted file mode 100644
index 7edb7f883..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,110 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MassNodeIdTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import javax.servlet.http.*;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
-  public MultipleLinkAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String isMultipleLinkAction = request.getParameter(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
-    if (isMultipleLinkAction != null)
-    {
-      propertyTable_.put(FavoritesActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
-      return processMultipleLinkActionParameters(request);
-    }
-    else
-    {
-      propertyTable_.remove(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
-      String nodeIDString = request.getParameter(ActionInputs.NODEID);
-      String toolIDString = request.getParameter(ActionInputs.TOOLID);
-      String viewIDString = request.getParameter(ActionInputs.VIEWID);
-      String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
-      if (nodeIDString != null)
-        propertyTable_.put(ActionInputs.NODEID, nodeIDString);
-      if (toolIDString != null)
-        propertyTable_.put(ActionInputs.TOOLID, toolIDString);
-      if (viewIDString != null)
-        propertyTable_.put(ActionInputs.VIEWID, viewIDString);
-      if (viewToolIDString != null)
-        propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
-      return true;
-    }
-  }
-
-  protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
-  {
-    String[] massActionNodeIDs = request.getParameterValues(FavoritesActionInputs.MASS_ACTION_NODE_ID);
-    propertyTable_.put(FavoritesActionInputs.MASS_ACTION_NODE_ID, massActionNodeIDs);
-    if (massActionNodeIDs.length == 0)
-      return false;
-    else
-      return true;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    return new ITransformer[] {new MassNodeIdTransformer(controller_, FavoritesActionInputs.MASS_ACTION_NODE_ID)};
-  }
-
-  protected boolean isMultipleLinkAction()
-  {
-    return propertyTable_.containsKey(FavoritesActionInputs.MULTIPLE_LINK_ACTION);
-  }
-
-  protected String[] getMassActionNodeIds()
-  {
-    Object object = propertyTable_.get(FavoritesActionInputs.MASS_ACTION_NODE_ID);
-    if (object == null)
-      return new String[0];
-    else if (object.getClass().isArray())
-      return (String[])object;
-    else
-      return new String[] {(String)object};
-  }
-
-  public boolean run()
-  {
-    return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    boolean result = false;
-    String[] massActionNodeIDs = getMassActionNodeIds();
-    if (massActionNodeIDs != null)
-    {
-      for (int i = 0; i < massActionNodeIDs.length; i++)
-      {
-        propertyTable_.put(ActionInputs.NODEID, massActionNodeIDs[i]);
-        if (executeSingleLinkAction())
-          result = true;
-      }
-      propertyTable_.remove(ActionInputs.NODEID);
-    }
-    return result;
-  }
-
-  protected abstract boolean executeSingleLinkAction();
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java
deleted file mode 100644
index 7c07c5bcb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/RemoveFavoritesAction.java
+++ /dev/null
@@ -1,132 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Enumeration;
-
-public class RemoveFavoritesAction extends MultipleLinkAction
-{
-  public RemoveFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("favorites/actions/RemoveFavoritesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "favorites/actions/RemoveFavoritesActionJSP.jsp";
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager nodeManager = favPerspective.getNodeManager();
-    String nodeIDString = (String) propertyTable_.get(ActionInputs.NODEID);
-    int nodeID;
-    try
-    {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe)
-    {
-      nodeID = nodeManager.getSelectedNodeId();
-    }
-    Node selectedNode = nodeManager.getNode(nodeID);
-    if (selectedNode == null)
-      return false;
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String pluginMetadataDirectory = controller_.getServletEngineStateLocation();
-    boolean actionResult;
-    if (selectedElement instanceof FavoritesElement)
-      actionResult = ((FavoritesElement) selectedElement).getParentFolderElement().removeFavoriteByNodeID(nodeID, pluginMetadataDirectory);
-    else if (selectedElement instanceof FavoritesFolderElement)
-      actionResult = ((FavoritesFolderElement) selectedElement).removeAllFavorites(pluginMetadataDirectory);
-    else if (selectedElement instanceof FavoritesMainElement)
-    {
-      Enumeration e;
-      FavoritesMainElement mainElement = (FavoritesMainElement) selectedElement;
-      e = mainElement.getElements(FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
-      actionResult = ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-      e = mainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
-      actionResult = actionResult && ((FavoritesFolderElement) e.nextElement()).removeAllFavorites(pluginMetadataDirectory);
-    }
-    else
-      actionResult = false;
-    if (actionResult)
-      favPerspective.getMessageQueue().addMessage(controller_.getMessage("MSG_INFO_NODE_CLEARED", selectedNode.getNodeName()));
-    return actionResult;
-  }
-
-  public String getTreeContentVar()
-  {
-    return "favNavigatorContent";
-  }
-
-  public String getTreeContentPage()
-  {
-    return "favorites/fav_navigator_content.jsp";
-  }
-
-  public String getPropertiesContainerVar()
-  {
-    return "favPropertiesContainer";
-  }
-
-  public String getPropertiesContainerPage()
-  {
-    return "favorites/fav_properties_container.jsp";
-  }
-
-  public String getStatusContentVar()
-  {
-    return "favStatusContent";
-  }
-
-  public String getStatusContentPage()
-  {
-    return "favorites/fav_status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
deleted file mode 100644
index a101bb44b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/ResizeFavoritesFramesAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-public class ResizeFavoritesFramesAction extends ResizeFramesAction
-{
-  public ResizeFavoritesFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(FavoritesFrameNames.NAVIGATOR_CONTAINER))
-    {
-      favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        favPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(FavoritesFrameNames.PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
-          favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        favPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(FavoritesFrameNames.STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          favPerspective.setPerspectiveContentFramesetCols(favPerspective.getSavedPerspectiveContentFramesetCols());
-          favPerspective.setActionsContainerFramesetRows(favPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        favPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        favPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          favPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          favPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
deleted file mode 100644
index 32f0e372e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesNodeAction.java
+++ /dev/null
@@ -1,70 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectFavoritesNodeAction extends SelectNodeAction
-{
-    public SelectFavoritesNodeAction(Controller controller)
-    {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        Node selectedNode = getSelectedNode();
-        Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-        if (selectedTool == null)
-            return null;
-        else if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-        else
-            return getActionLink(selectedNode.getNodeId(), true);
-    }
-
-    public final String getTreeContentVar() {
-        return controller_.getFavoritesPerspective().getTreeContentVar();
-    }
-
-    public final String getTreeContentPage() {
-        return controller_.getFavoritesPerspective().getTreeContentPage();
-    }
-
-    public final String getPropertiesContainerVar() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerVar();
-    }
-
-    public final String getPropertiesContainerPage() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerPage();
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_FAVORITES;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java
deleted file mode 100644
index 9706b1924..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SelectFavoritesToolAction.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectFavoritesToolAction extends SelectNodeToolAction
-{
-    public SelectFavoritesToolAction(Controller controller)
-    {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("favorites/actions/SelectFavoritesToolActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        if (viewID != ActionInputs.VIEWID_DEFAULT) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWID);
-            actionLink.append('=');
-            actionLink.append(viewID);
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWTOOLID);
-            actionLink.append('=');
-            actionLink.append(viewToolID);
-        }
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        if (getSelectedTool().getToolType() != ToolTypes.ACTION) {
-            Node selectedNode = getSelectedNode();
-            return getActionLink(selectedNode.getNodeId(), getSelectedTool().getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-        }
-        else
-            return null;
-    }
-
-    public final String getTreeContentVar() {
-        return controller_.getFavoritesPerspective().getTreeContentVar();
-    }
-
-    public final String getTreeContentPage() {
-        return controller_.getFavoritesPerspective().getTreeContentPage();
-    }
-
-    public final String getPropertiesContainerVar() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerVar();
-    }
-
-    public final String getPropertiesContainerPage() {
-        return controller_.getFavoritesPerspective().getPropertiesContainerPage();
-    }
-
-    public final String getPropertiesContentVar() {
-        return controller_.getFavoritesPerspective().getPropertiesContentVar();
-    }
-
-    public final String getPropertiesContentPage() {
-        return controller_.getFavoritesPerspective().getPropertiesContentPage();
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_FAVORITES;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
deleted file mode 100644
index 4470c6ba4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/actions/SwitchPerspectiveFromFavoritesAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-public final class SwitchPerspectiveFromFavoritesAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(FavoritesActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      favPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      favPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");    
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
deleted file mode 100644
index c4ca64187..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesActionInputs.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesActionInputs
-{
-    // mass actions
-    public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
-    public final static String MASS_ACTION_NODE_ID = "massActionNodeID";
-
-    // resize favorites frames action
-    public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-    public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
deleted file mode 100644
index 5a2622049..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesFrameNames.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesFrameNames
-{
-  public final static String NAVIGATOR_CONTAINER = "fav_navigator_container";
-  public final static String NAVIGATOR_TOOLBAR = "fav_navigator_toolbar";
-  public final static String NAVIGATOR_CONTENT = "fav_navigator_content";
-  public final static String ACTIONS_CONTAINER = "fav_actions_container";
-  public final static String PROPERTIES_CONTAINER = "fav_properties_container";
-  public final static String PROPERTIES_TOOLBAR = "fav_properties_toolbar";
-  public final static String PROPERTIES_CONTENT = "fav_properties_content";
-  public final static String STATUS_CONTAINER = "fav_status_container";
-  public final static String STATUS_TOOLBAR = "fav_status_toolbar";
-  public final static String STATUS_CONTENT = "fav_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
deleted file mode 100644
index 9b935e8f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/constants/FavoritesModelConstants.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.constants;
-
-public class FavoritesModelConstants {
-    // Relations
-    public final static String REL_WSIL_FOLDER_NODE = "relWSILFolderNode";
-    public final static String REL_WSDL_SERVICE_FOLDER_NODE = "relWSDLServiceFolderNode";
-    public final static String REL_UDDI_SERVICE_FOLDER_NODE = "relUDDIServiceFolderNode";
-    public final static String REL_UDDI_BUSINESS_FOLDER_NODE = "relUDDIBusinessFolderNode";
-    public final static String REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE = "relUDDIServiceInterfaceFolderNode";
-    public final static String REL_UDDI_REGISTRY_FOLDER_NODE = "relUDDIRegistryFolerNode";
-    public final static String REL_WSIL_NODE = "relWSILNode";
-    public final static String REL_WSDL_SERVICE_NODE = "relWSDLServiceNode";
-    public final static String REL_UDDI_SERVICE_NODE = "relUDDIServiceNode";
-    public final static String REL_UDDI_BUSINESS_NODE = "relUDDIBusinessNode";
-    public final static String REL_UDDI_SERVICE_INTERFACE_NODE = "relUDDIServiceInterfaceNode";
-    public final static String REL_UDDI_REGISTRY_NODE = "relUDDIRegistryNode";
-
-    // Properties
-    public final static String PROP_PLUGIN_METADATA_DIRECTORY = "pluginMetadataDirectory";
-    public final static String PROP_WSIL_URL = "wsilURL";
-    public final static String PROP_WSDL_URL = "wsdlURL";
-    public final static String PROP_UDDI_SERVICE_NAME = "UDDIServiceName";
-    public final static String PROP_UDDI_SERVICE_INQUIRY_API = "UDDIServiceInquiryAPI";
-    public final static String PROP_UDDI_SERVICE_KEY = "UDDIServiceKey";
-    public final static String PROP_UDDI_BUSINESS_NAME = "UDDIBusinessName";
-    public final static String PROP_UDDI_BUSINESS_INQUIRY_API = "UDDIBusinessInquiryAPI";
-    public final static String PROP_UDDI_BUSINESS_KEY = "UDDIBusinessKey";
-    public final static String PROP_UDDI_SERVICE_INTERFACE_NAME = "UDDIServiceInterfaceName";
-    public final static String PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API = "UDDIServiceInterfaceInquiryAPI";
-    public final static String PROP_UDDI_SERVICE_INTERFACE_KEY = "UDDIServiceInterfaceKey";
-    public final static String PROP_UDDI_REGISTRY_NAME = "UDDIRegistryName";
-    public final static String PROP_UDDI_REGISTRY_INQUIRY_API = "UDDIRegistryInquiryAPI";
-    public final static String PROP_UDDI_REGISTRY_PUBLISH_API = "UDDIRegistryPublishAPI";
-    public final static String PROP_UDDI_REGISTRY_REGISTRATION_URL = "UDDIRegistryRegistrationURL";
-    public final static String PROP_UDDI_REGISTRY_CATEGORIES_ENUM = "UDDIRegistryCategoriesEnum";
-
-    // List Managers for Favorites
-    public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
-    public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
-    public final static String LIST_MANAGER_UDDI_BUSINESS = "uddiBusiness";
-    public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
-    public final static String LIST_MANAGER_UDDI_REGISTRY = "uddiRegistry";
-    public final static String LIST_MANAGER_UDDI_SERVICE_INTERFACE = "uddiServiceInterface";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
deleted file mode 100644
index b0833e785..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesElement.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-
-import java.util.Enumeration;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesElement extends TreeElement {
-
-  public FavoritesElement(String name, Model model) {
-    super(name, model);
-  }
-
-  public FavoritesFolderElement getParentFolderElement() {
-    Enumeration e = getElements(ModelConstants.REL_OWNER);
-    if (!e.hasMoreElements())
-      return null;
-    else
-      return (FavoritesFolderElement)e.nextElement();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
deleted file mode 100644
index 567dcc73d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesFolderElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public abstract class FavoritesFolderElement extends TreeElement
-{
-    protected NodeManager nodeManager_;
-    
-    public FavoritesFolderElement(String name, Model model, NodeManager nodeManager) {
-        super(name, model);
-        nodeManager_ = nodeManager;
-    }
-
-    protected FavoritesMainElement getFavoritesMainElement() {
-        return (FavoritesMainElement)nodeManager_.getRootNode().getTreeElement();
-    }
-
-    public abstract void init(FavoritesMainElement favMainElement);
-
-    public abstract boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory);
-
-    public abstract boolean removeAllFavorites(String pluginMetadataDirectory);
-
-    public abstract boolean addFavorite(Hashtable table);
-
-    public abstract boolean favoriteExists(Hashtable table);
-
-    public abstract Enumeration getAllFavorites();
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
deleted file mode 100644
index 2ce48a25d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesMainElement.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.favorites.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesMainElement extends TreeElement
-{
-  private Controller controller_;
-  private FavoritesRegistryTypeWSE favRegistry_;
-
-  public FavoritesMainElement(String name, Model model, Controller controller)
-  {
-    super(name, model);
-    controller_ = controller;
-    favRegistry_ = new FavoritesRegistryTypeWSE(
-			controller.getDefaultFavoritesLocation(),
-			controller.getServletEngineStateLocation()
-	);
-  }
-
-  public boolean restoreFavoritesDefault()
-  {
-    favRegistry_.restoreFavoritesDefault();
-    return saveFavorites();
-  }
-
-  public boolean saveFavorites()
-  {
-    try
-    {
-      favRegistry_.save();
-      return true;
-    }
-    catch (Throwable t)
-    {
-      FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-      favPerspective.getMessageQueue().addMessage(favPerspective.getMessage("MSG_ERROR_SAVE_FAVORITES_WSIL", favRegistry_.getWriteLocation()));
-      return false;
-    }
-  }
-
-  public Link addUDDIRegistry(String registryName, String inquiryAPI, String publishAPI, String registrationURL)
-  {
-    return favRegistry_.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
-  }
-
-  public Link addUDDIBusiness(String businessName, String inquiryAPI, String businessKey)
-  {
-    return favRegistry_.addUDDIBusiness(businessName, inquiryAPI, businessKey);
-  }
-
-  public Service addUDDIService(String serviceName, String inquiryAPI, String serviceKey)
-  {
-    return favRegistry_.addUDDIService(serviceName, inquiryAPI, serviceKey);
-  }
-
-  public Service addUDDIServiceInterface(String serIntName, String inquiryAPI, String serIntKey)
-  {
-    return favRegistry_.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
-  }
-
-  public Service addWSDLService(String url)
-  {
-    return favRegistry_.addWSDLService(url);
-  }
-
-  public Link addWSILLink(String url)
-  {
-    return favRegistry_.addWSILLink(url);
-  }
-
-  public boolean removeService(Service service) {
-    favRegistry_.removeService(service);
-    return true;
-  }
-
-  public boolean removeLink(Link link) {
-    favRegistry_.removeLink(link);
-    return true;
-  }
-
-  public Link[] loadUDDIRegistries()
-  {
-    return favRegistry_.loadUDDIRegistries();
-  }
-    
-  public Link[] loadUDDIBusinesses()
-  {
-    return favRegistry_.loadUDDIBusinesses();
-  }
-
-  public Service[] loadUDDIServices()
-  {
-    return favRegistry_.loadUDDIServices();
-  }
-
-  public Service[] loadUDDIServiceInterfaces()
-  {
-    return favRegistry_.loadUDDIServiceInterfaces();
-  }
-
-  public Service[] loadWSDLServices()
-  {
-    return favRegistry_.loadWSDLServices();
-  }
-
-  public Link[] loadWSILs()
-  {
-    return favRegistry_.loadWSILs();
-  }
-  
-  public final FavoritesUDDIRegistryFolderElement getFavoritesUDDIRegistryFolderElement()
-  {
-    return (FavoritesUDDIRegistryFolderElement)(getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
deleted file mode 100644
index fa91fb18d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIBusiness;
-import org.apache.wsil.*;
-
-public class FavoritesUDDIBusinessElement extends FavoritesElement {
-
-  private FavoritesUDDIBusiness uddiBusiness_;
-
-  public FavoritesUDDIBusinessElement(String name, Model model, Link link) {
-    super(name, model);
-    uddiBusiness_ = new FavoritesUDDIBusiness();
-    uddiBusiness_.setLink(link);
-  }
-
-  public Link getLink() {
-    return uddiBusiness_.getLink();
-  }
-
-  public String getName() {
-    return uddiBusiness_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiBusiness_.getInquiryURL();
-  }
-
-  public String getBusinessKey() {
-    return uddiBusiness_.getBusinessKey();
-  }
-
-  public String toString() {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
deleted file mode 100644
index 6fe50a018..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIBusinessFolderElement.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIBusinessFolderElement extends FavoritesFolderElement
-{
-  public FavoritesUDDIBusinessFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Link[] links = favMainElement.loadUDDIBusinesses();
-    for (int i = 0; i < links.length; i++) {
-      Link link = links[i];
-      FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement((link.getAbstracts())[0].getText(), getModel(), link);
-      connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String businessName = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
-    String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
-    if (businessName == null || inquiryAPI == null || businessKey == null)
-      return false;
-    FavoritesUDDIBusinessElement e = getFavorite(inquiryAPI, businessKey);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Link link = favMainElement.addUDDIBusiness(businessName, inquiryAPI, businessKey);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIBusinessElement favUDDIBusinessElement = new FavoritesUDDIBusinessElement(businessName, getModel(), link);
-      connect(favUDDIBusinessElement, FavoritesModelConstants.REL_UDDI_BUSINESS_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API);
-    String businessKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY);
-    if (inquiryAPI == null || businessKey == null)
-      return false;
-    return (getFavorite(inquiryAPI, businessKey) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIBusinessElement)
-      return (removeFavorite((FavoritesUDDIBusinessElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIBusinessElement element) {
-    Link link = element.getLink();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeLink(link)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIBusinessElement favUDDIBusinessElement = (FavoritesUDDIBusinessElement)e.nextElement();
-      Link link = favUDDIBusinessElement.getLink();
-      favMainElement.removeLink(link);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE);
-  }
-
-  private FavoritesUDDIBusinessElement getFavorite(String inquiryAPI, String businessKey) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIBusinessElement busElement = (FavoritesUDDIBusinessElement)e.nextElement();
-      if (inquiryAPI.equals(busElement.getInquiryURL()) &&
-          businessKey.equals(busElement.getBusinessKey()))
-        return busElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
deleted file mode 100644
index d9d49d511..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryElement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIRegistry;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-import org.apache.wsil.*;
-
-public class FavoritesUDDIRegistryElement extends FavoritesElement {
-
-  private FavoritesUDDIRegistry uddiReg_;
-
-  public FavoritesUDDIRegistryElement(String name, Model model, Link link) {
-    super(name, model);
-    uddiReg_ = new FavoritesUDDIRegistry();
-    uddiReg_.setLink(link);
-  }
-
-  public Link getLink() {
-    return uddiReg_.getLink();
-  }
-
-  public String getName() {
-    return uddiReg_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiReg_.getInquiryURL();
-  }
-
-  public String getPublishURL() {
-    return uddiReg_.getPublishURL();
-  }
-
-  public String getRegistrationURL() {
-    return uddiReg_.getRegistrationURL();
-  }
-
-  public String toString() {
-    return getName();
-  }
-  
-  public IFavoritesUDDIRegistry getIFavoritesUDDIRegistryInterface()
-  {
-    return uddiReg_;
-  }
-}
-  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
deleted file mode 100644
index bae3db071..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIRegistryFolderElement.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import java.io.File;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.apache.wsil.Link;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIRegistryFolderElement extends FavoritesFolderElement
-{
-  public FavoritesUDDIRegistryFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Link[] links = favMainElement.loadUDDIRegistries();
-    for (int i = 0; i < links.length; i++) {
-      Link link = links[i];
-      FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement((link.getAbstracts())[0].getText(), getModel(), link);
-      connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-  
-  public boolean addFavorite(Hashtable table) {
-    String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API);
-    String publishAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API);
-    String registrationURL = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_REGISTRATION_URL);
-    Enumeration userDefinedCategories = (Enumeration)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM);
-    // Save the category data first and undo if necessary.
-    if (userDefinedCategories != null)
-    {
-      String pluginMetadataDirectory = (String)table.get(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY);
-      StringBuffer directoryBuffer = new StringBuffer();
-      formCategoriesDirectory(directoryBuffer,pluginMetadataDirectory,registryName);
-      File categoriesDirectoryFile = new File(directoryBuffer.toString());
-      categoriesDirectoryFile.mkdirs();
-      StringBuffer categoryFileName = new StringBuffer();
-      while (userDefinedCategories.hasMoreElements())
-      {
-        CategoryModel categoryModel = (CategoryModel)userDefinedCategories.nextElement();        
-        categoryFileName.setLength(0);
-        String encodedCategoryKey = URLUtils.encode(categoryModel.getCategoryKey());
-        categoryFileName.append(categoriesDirectoryFile.getAbsolutePath()).append(File.separatorChar).append(encodedCategoryKey).append(".txt");
-        byte rc = categoryModel.saveData(categoryFileName.toString());
-        if (rc != CategoryModel.OPERATION_SUCCESSFUL)
-        {
-          // Delete the category file if it exists.
-          File categoryFile = new File(categoryFileName.toString());
-          if (categoryFile.exists())
-            categoryFile.delete();
-        }
-      }
-      cleanupCategoryDirectories(categoriesDirectoryFile);
-    }
-    if (registryName == null || inquiryAPI == null || publishAPI == null)
-      return false;
-    FavoritesUDDIRegistryElement e = getFavorite(registryName);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Link link = favMainElement.addUDDIRegistry(registryName, inquiryAPI, publishAPI, registrationURL);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIRegistryElement favUDDIRegsitryElement = new FavoritesUDDIRegistryElement(registryName, getModel(), link);
-      connect(favUDDIRegsitryElement, FavoritesModelConstants.REL_UDDI_REGISTRY_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-  
-  public static final void formCategoriesDirectory(StringBuffer categoriesDirectory,String pluginMetadataDirectory,String registryName)
-  {
-    // <metadata>/uddi/<registryId>/categories
-	String encodedRegistryName = URLUtils.encode(registryName);
-    categoriesDirectory.append(pluginMetadataDirectory).append("uddi").append(File.separatorChar).append(encodedRegistryName).append(File.separatorChar).append("categories");    
-  }
-  
-  private final void clearRegistryMetadata(String pluginMetadataDirectory,String registryName)
-  {
-    StringBuffer categoriesDirectory = new StringBuffer();
-    formCategoriesDirectory(categoriesDirectory,pluginMetadataDirectory,registryName);
-    File categoriesDirectoryFile = new File(categoriesDirectory.toString());
-    File[] categoryFiles = categoriesDirectoryFile.listFiles();
-    if (categoryFiles != null)
-    {
-      for (int i=0;i<categoryFiles.length;i++)
-        categoryFiles[i].delete();
-    }
-    cleanupCategoryDirectories(categoriesDirectoryFile);
-  }
-  
-  private final void cleanupCategoryDirectories(File categoriesDirectoryFile)
-  {
-    // Delete the categories subdirectory if it is empty.
-    String[] fileList;
-    fileList = categoriesDirectoryFile.list();
-    if (fileList == null || fileList.length == 0)
-      categoriesDirectoryFile.delete();
-    // Delete the <registryId> subdirectory if it is empty.
-    File registryIdDirectoryFile = categoriesDirectoryFile.getParentFile();
-    fileList = registryIdDirectoryFile.list();
-    if (fileList == null || fileList.length == 0)
-      registryIdDirectoryFile.delete();
-    // Delete the uddi subdirectory if it is empty.
-    File uddiDirectoryFile = registryIdDirectoryFile.getParentFile();
-    fileList = uddiDirectoryFile.list();
-    if (fileList == null || fileList.length == 0)
-      uddiDirectoryFile.delete();
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String registryName = (String)table.get(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME);
-    if (registryName == null)
-      return false;
-    return (getFavorite(registryName) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIRegistryElement)
-    {
-      clearRegistryMetadata(pluginMetadataDirectory,selectedElement.getName());
-      boolean rc = removeFavorite((FavoritesUDDIRegistryElement)selectedElement);
-      rc = rc && favMainElement.saveFavorites();
-      return rc;
-    }
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIRegistryElement element) {
-    Link link = ((FavoritesUDDIRegistryElement)element).getLink();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeLink(link)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIRegistryElement favUDDIRegistryElement = (FavoritesUDDIRegistryElement)e.nextElement();
-      clearRegistryMetadata(pluginMetadataDirectory,favUDDIRegistryElement.getName());
-      Link link = favUDDIRegistryElement.getLink();
-      favMainElement.removeLink(link);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
-  }
-
-  private FavoritesUDDIRegistryElement getFavorite(String registryName) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIRegistryElement regElement = (FavoritesUDDIRegistryElement)e.nextElement();
-      if (registryName.equals(regElement.getName()))
-        return regElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
deleted file mode 100644
index ee4ce93d3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIService;
-import org.apache.wsil.*;
-
-public class FavoritesUDDIServiceElement extends FavoritesElement {
-
-  private FavoritesUDDIService uddiService_;
-
-  public FavoritesUDDIServiceElement(String name, Model model, Service service) {
-    super(name, model);
-    uddiService_ = new FavoritesUDDIService();
-    uddiService_.setService(service);
-  }
-
-  public Service getService() {
-    return uddiService_.getService();
-  }
-
-  public String getName() {
-    return uddiService_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiService_.getInquiryURL();
-  }
-
-  public String getServiceKey() {
-    return uddiService_.getServiceKey();
-  }
-
-  public String toString() {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
deleted file mode 100644
index 384851598..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIServiceFolderElement extends FavoritesFolderElement
-{
-
-  public FavoritesUDDIServiceFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Service[] services = favMainElement.loadUDDIServices();
-    for (int i = 0; i < services.length; i++) {
-      Service service = services[i];
-      FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement((service.getServiceNames())[0].getText(), getModel(), service);
-      connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String serviceName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
-    String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
-    if (serviceName == null || inquiryAPI == null || serviceKey == null)
-      return false;
-    FavoritesUDDIServiceElement e = getFavorite(inquiryAPI, serviceKey);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Service service = favMainElement.addUDDIService(serviceName, inquiryAPI, serviceKey);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIServiceElement favUDDIServiceElement = new FavoritesUDDIServiceElement(serviceName, getModel(), service);
-      connect(favUDDIServiceElement, FavoritesModelConstants.REL_UDDI_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API);
-    String serviceKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY);
-    if (inquiryAPI == null || serviceKey == null)
-      return false;
-    return (getFavorite(inquiryAPI, serviceKey) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIServiceElement)
-      return (removeFavorite((FavoritesUDDIServiceElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIServiceElement element) {
-    Service service = ((FavoritesUDDIServiceElement)element).getService();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeService(service)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIServiceElement favUDDIServiceElement = (FavoritesUDDIServiceElement)e.nextElement();
-      Service service = favUDDIServiceElement.getService();
-      favMainElement.removeService(service);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_NODE);
-  }
-
-  private FavoritesUDDIServiceElement getFavorite(String inquiryAPI, String serviceKey) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIServiceElement serElement = (FavoritesUDDIServiceElement)e.nextElement();
-      if (inquiryAPI.equals(serElement.getInquiryURL()) &&
-          serviceKey.equals(serElement.getServiceKey()))
-        return serElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
deleted file mode 100644
index d3f892242..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceElement.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesUDDIServiceInterface;
-import org.apache.wsil.*;
-
-public class FavoritesUDDIServiceInterfaceElement extends FavoritesElement {
-
-  private FavoritesUDDIServiceInterface uddiSerInt_;
-
-  public FavoritesUDDIServiceInterfaceElement(String name, Model model, Service service) {
-    super(name, model);
-    uddiSerInt_ = new FavoritesUDDIServiceInterface();
-    uddiSerInt_.setService(service);
-  }
-
-  public Service getService() {
-    return uddiSerInt_.getService();
-  }
-
-  public String getName() {
-    return uddiSerInt_.getName();
-  }
-
-  public String getInquiryURL() {
-    return uddiSerInt_.getInquiryURL();
-  }
-
-  public String getServiceInterfaceKey() {
-    return uddiSerInt_.getServiceInterfaceKey();
-  }
-
-  public String toString() {
-    return getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
deleted file mode 100644
index bbdc90d31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesUDDIServiceInterfaceFolderElement.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL document
-*/
-public class FavoritesUDDIServiceInterfaceFolderElement extends FavoritesFolderElement
-{
-
-  public FavoritesUDDIServiceInterfaceFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Service[] services = favMainElement.loadUDDIServiceInterfaces();
-    for (int i = 0; i < services.length; i++) {
-      Service service = services[i];
-      FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement((service.getServiceNames())[0].getText(), getModel(), service);
-      connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String serIntName = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME);
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
-    String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
-    if (serIntName == null || inquiryAPI == null || serIntKey == null)
-      return false;
-    FavoritesUDDIServiceInterfaceElement e = getFavorite(inquiryAPI, serIntKey);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Service service = favMainElement.addUDDIServiceInterface(serIntName, inquiryAPI, serIntKey);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = new FavoritesUDDIServiceInterfaceElement(serIntName, getModel(), service);
-      connect(favUDDISerIntElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String inquiryAPI = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API);
-    String serIntKey = (String)table.get(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY);
-    if (inquiryAPI == null || serIntKey == null)
-      return false;
-    return (getFavorite(inquiryAPI, serIntKey) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesUDDIServiceInterfaceElement)
-      return (removeFavorite((FavoritesUDDIServiceInterfaceElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesUDDIServiceInterfaceElement element) {
-    Service service = ((FavoritesUDDIServiceInterfaceElement)element).getService();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeService(service)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesUDDIServiceInterfaceElement favUDDISerIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
-      Service service = favUDDISerIntElement.getService();
-      favMainElement.removeService(service);
-    }
-    disconnectRel(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE);
-  }
-
-  private FavoritesUDDIServiceInterfaceElement getFavorite(String inquiryAPI, String serIntKey) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesUDDIServiceInterfaceElement serIntElement = (FavoritesUDDIServiceInterfaceElement)e.nextElement();
-      if (inquiryAPI.equals(serIntElement.getInquiryURL()) &&
-           serIntKey.equals(serIntElement.getServiceInterfaceKey()))
-        return serIntElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
deleted file mode 100644
index ec9993d12..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSDL;
-import org.apache.wsil.*;
-
-public class FavoritesWSDLServiceElement extends FavoritesElement {
-
-  private FavoritesWSDL wsdl_;
-
-  public FavoritesWSDLServiceElement(String name, Model model, Service service) {
-    super(name, model);
-    wsdl_ = new FavoritesWSDL();
-    wsdl_.setService(service);
-  }
-
-  public Service getService() {
-    return wsdl_.getService();
-  }
-
-  public String getWsdlUrl() {
-    return wsdl_.getWsdlUrl();
-  }
-
-  public String toString() {
-    return getWsdlUrl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
deleted file mode 100644
index 7b26004a4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSDLServiceFolderElement.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.Hashtable;
-import java.util.Enumeration;
-import org.apache.wsil.*;
-
-public class FavoritesWSDLServiceFolderElement extends FavoritesFolderElement
-{
-
-  public FavoritesWSDLServiceFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Service[] services = favMainElement.loadWSDLServices();
-    for (int i = 0; i < services.length; i++) {
-      Service service = services[i];
-      FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement((service.getDescriptions())[0].getLocation(), getModel(), service);
-      connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
-    if (wsdlURL == null)
-      return false;
-    FavoritesWSDLServiceElement e = getFavorite(wsdlURL);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Service service = favMainElement.addWSDLService(wsdlURL);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesWSDLServiceElement favWSDLServiceElement = new FavoritesWSDLServiceElement(wsdlURL, getModel(), service);
-      connect(favWSDLServiceElement, FavoritesModelConstants.REL_WSDL_SERVICE_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String wsdlURL = (String)table.get(FavoritesModelConstants.PROP_WSDL_URL);
-    if (wsdlURL == null)
-      return false;
-    return (getFavorite(wsdlURL) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesWSDLServiceElement)
-      return (removeFavorite((FavoritesWSDLServiceElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-    }
-
-  private boolean removeFavorite(FavoritesWSDLServiceElement element) {
-    Service service = ((FavoritesWSDLServiceElement)element).getService();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeService(service)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesWSDLServiceElement favWSDLServiceElement = (FavoritesWSDLServiceElement)e.nextElement();
-      Service service = favWSDLServiceElement.getService();
-      favMainElement.removeService(service);
-    }
-    disconnectRel(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_WSDL_SERVICE_NODE);
-  }
-
-  private FavoritesWSDLServiceElement getFavorite(String wsdlUrl) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesWSDLServiceElement wsdlElement = (FavoritesWSDLServiceElement)e.nextElement();
-      if (wsdlUrl.equals(wsdlElement.getWsdlUrl()))
-        return wsdlElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
deleted file mode 100644
index 764b6d61b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILElement.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.parser.favorites.FavoritesWSIL;
-import org.apache.wsil.*;
-
-public class FavoritesWSILElement extends FavoritesElement {
-
-  private FavoritesWSIL wsil_;
-
-  public FavoritesWSILElement(String name, Model model, Link link) {
-    super(name, model);
-    wsil_ = new FavoritesWSIL();
-    wsil_.setLink(link);
-  }
-
-  public Link getLink() {
-    return wsil_.getLink();
-  }
-
-  public String getWsilUrl() {
-    return wsil_.getWsilUrl();
-  }
-
-  public String toString() {
-    return getWsilUrl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
deleted file mode 100644
index d7d10c3f3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/datamodel/FavoritesWSILFolderElement.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.apache.wsil.*;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-public class FavoritesWSILFolderElement extends FavoritesFolderElement {
-
-  public FavoritesWSILFolderElement(String name, Model model, NodeManager nodeManager) {
-    super(name, model, nodeManager);
-  }
-
-  public void init(FavoritesMainElement favMainElement) {
-    Link[] links = favMainElement.loadWSILs();
-    for (int i = 0; i < links.length; i++) {
-      Link link = links[i];
-      FavoritesWSILElement favWSILElement = new FavoritesWSILElement(link.getLocation(), getModel(), link);
-      connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
-    }
-  }
-
-  public boolean addFavorite(Hashtable table) {
-    String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
-    if (wsilURL == null)
-      return false;
-    FavoritesWSILElement e = getFavorite(wsilURL);
-    if (e != null)
-      removeFavorite(e);
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Link link = favMainElement.addWSILLink(wsilURL);
-    boolean saved = favMainElement.saveFavorites();
-    if (saved) {
-      FavoritesWSILElement favWSILElement = new FavoritesWSILElement(wsilURL, getModel(), link);
-      connect(favWSILElement, FavoritesModelConstants.REL_WSIL_NODE, ModelConstants.REL_OWNER);
-    }
-    return saved;
-  }
-
-  public boolean favoriteExists(Hashtable table) {
-    String wsilURL = (String)table.get(FavoritesModelConstants.PROP_WSIL_URL);
-    if (wsilURL == null)
-      return false;
-    return (getFavorite(wsilURL) != null);
-  }
-
-  public boolean removeFavoriteByNodeID(int nodeID,String pluginMetadataDirectory) {
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (selectedElement instanceof FavoritesWSILElement)
-      return (removeFavorite((FavoritesWSILElement)selectedElement) && favMainElement.saveFavorites());
-    else
-      return false;
-  }
-
-  private boolean removeFavorite(FavoritesWSILElement element) {
-    Link link = element.getLink();
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    if (favMainElement.removeLink(link)) {
-      element.disconnectAll();
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean removeAllFavorites(String pluginMetadataDirectory) {
-    FavoritesMainElement favMainElement = getFavoritesMainElement();
-    Enumeration e = getAllFavorites();
-    while(e.hasMoreElements()) {
-      FavoritesWSILElement favWSILElement = (FavoritesWSILElement)e.nextElement();
-      Link link = favWSILElement.getLink();
-      favMainElement.removeLink(link);
-    }
-    disconnectRel(FavoritesModelConstants.REL_WSIL_NODE);
-    return favMainElement.saveFavorites();
-  }
-
-  public Enumeration getAllFavorites() {
-    return getElements(FavoritesModelConstants.REL_WSIL_NODE);
-  }
-
-  private FavoritesWSILElement getFavorite(String wsilUrl) {
-    Enumeration e = getAllFavorites();
-    while (e.hasMoreElements()) {
-      FavoritesWSILElement wsilElement = (FavoritesWSILElement)e.nextElement();
-      if (wsilUrl.equals(wsilElement.getWsilUrl()))
-        return wsilElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
deleted file mode 100644
index a12366d7f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddToUDDIPerspectiveTool extends ActionTool {
-
-    public AddToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/add_to_uddi_perspective_enabled.gif", "favorites/images/add_to_uddi_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
deleted file mode 100644
index dbb35d5ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/AddWSILToWSILPerspectiveTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddWSILToWSILPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class AddWSILToWSILPerspectiveTool extends ActionTool {
-
-    public AddWSILToWSILPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/add_to_wsil_perspective_enabled.gif", "favorites/images/add_to_wsil_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddWSILToWSILPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
deleted file mode 100644
index c67c2b277..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
-  public FavoritesAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return FavoritesAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
deleted file mode 100644
index 311099907..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToFileSystemTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToFileSystemTool extends ImportToFileSystemTool {
-
-    public FavoritesImportToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return ImportToFileSystemAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(),"favorites/actions/FavoritesImportToFileSystemActionJSP.jsp");
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
deleted file mode 100644
index 035334da6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesImportToWorkbenchTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesImportToWorkbenchTool extends ImportToWorkbenchTool {
-
-    public FavoritesImportToWorkbenchTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesImportToWorkbenchForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
deleted file mode 100644
index 915467d88..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-
-    public FavoritesLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
deleted file mode 100644
index debb25816..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesMainNode.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesMainNode extends FavoritesNavigatorNode {
-    public FavoritesMainNode(TreeElement treeElement, NodeManager nodeManager) {
-        super(treeElement, nodeManager, 1, "images/root_main.gif");
-
-        // Create UDDI Registry Folder Node
-        FavoritesUDDIRegistryFolderElement favUDDIRegistryFolderElement = new FavoritesUDDIRegistryFolderElement(getMessage("FAVORITES_UDDI_REGISTRIES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIRegistryFolderElement, FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIRegistryFolderNode favUDDIRegistryFolderNode = new FavoritesUDDIRegistryFolderNode(favUDDIRegistryFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIRegistryFolderNode);
-        favUDDIRegistryFolderNode.setVisibilityOfChildren(false);
-        favUDDIRegistryFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create UDDI Business Folder Node
-        FavoritesUDDIBusinessFolderElement favUDDIBusinessFolderElement = new FavoritesUDDIBusinessFolderElement(getMessage("FAVORITES_UDDI_BUSINESSES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIBusinessFolderElement, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIBusinessFolderNode favUDDIBusinessFolderNode = new FavoritesUDDIBusinessFolderNode(favUDDIBusinessFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIBusinessFolderNode);
-        favUDDIBusinessFolderNode.setVisibilityOfChildren(false);
-        favUDDIBusinessFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create UDDI Service Folder Node
-        FavoritesUDDIServiceFolderElement favUDDIServiceFolderElement = new FavoritesUDDIServiceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIServiceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIServiceFolderNode favUDDIServiceFolderNode = new FavoritesUDDIServiceFolderNode(favUDDIServiceFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIServiceFolderNode);
-        favUDDIServiceFolderNode.setVisibilityOfChildren(false);
-        favUDDIServiceFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create UDDI Service Interface Folder Node
-        FavoritesUDDIServiceInterfaceFolderElement favUDDIServiceInterfaceFolderElement = new FavoritesUDDIServiceInterfaceFolderElement(getMessage("FAVORITES_UDDI_SERVICE_INTERFACES_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favUDDIServiceInterfaceFolderElement, FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesUDDIServiceInterfaceFolderNode favUDDIServiceInterfaceFolderNode = new FavoritesUDDIServiceInterfaceFolderNode(favUDDIServiceInterfaceFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favUDDIServiceInterfaceFolderNode);
-        favUDDIServiceInterfaceFolderNode.setVisibilityOfChildren(false);
-        favUDDIServiceInterfaceFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create WSIL Folder Node
-        FavoritesWSILFolderElement favWSILFolderElement = new FavoritesWSILFolderElement(getMessage("FAVORITES_WSIL_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favWSILFolderElement, FavoritesModelConstants.REL_WSIL_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesWSILFolderNode favWSILFolderNode = new FavoritesWSILFolderNode(favWSILFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favWSILFolderNode);
-        favWSILFolderNode.setVisibilityOfChildren(false);
-        favWSILFolderElement.init((FavoritesMainElement)treeElement);
-
-        // Create WSDL Service Folder Node
-        FavoritesWSDLServiceFolderElement favWSDLServiceFolderElement = new FavoritesWSDLServiceFolderElement(getMessage("FAVORITES_WSDL_SERVICE_FOLDER_NODE"), treeElement.getModel(), nodeManager);
-        treeElement.connect(favWSDLServiceFolderElement, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE, ModelConstants.REL_OWNER);
-        FavoritesWSDLServiceFolderNode favWSDLServiceFolderNode = new FavoritesWSDLServiceFolderNode(favWSDLServiceFolderElement, nodeManager, nodeDepth_ + 1);
-        addChild(favWSDLServiceFolderNode);
-        favWSDLServiceFolderNode.setVisibilityOfChildren(false);
-        favWSDLServiceFolderElement.init((FavoritesMainElement)treeElement);
-
-    }
-
-    protected void initTools() {
-    }
-
-    private String getMessage(String msg) {
-        Controller controller = nodeManager_.getController();
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        return favPerspective.getMessage(msg);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
deleted file mode 100644
index 6af9d73aa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorFolderNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FolderNode;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorFolderNode extends FolderNode {
-
-    public FavoritesNavigatorFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-    }
-
-    protected String getToggleNodeActionHref() {
-        return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
-    }
-
-    protected String getLinkActionHref() {
-        return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
deleted file mode 100644
index 1a3368405..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesToggleNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public abstract class FavoritesNavigatorNode extends Node {
-
-    public FavoritesNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
-        super(treeElement, nodeManager, nodeDepth, imagePath);
-    }
-
-    protected String getToggleNodeActionHref() {
-        return FavoritesToggleNodeAction.getActionLink(nodeId_,isOpen_);
-    }
-
-    protected String getLinkActionHref() {
-        return SelectFavoritesNodeAction.getActionLink(nodeId_, false);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
deleted file mode 100644
index dfce85fbd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesPerspective.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-
-import javax.servlet.*;
-
-public class FavoritesPerspective extends Perspective
-{
-    private BasicModel model_;
-    private NodeManager nodeManager_;
-    private String perspectiveContentFramesetCols_;
-    private String savedPerspectiveContentFramesetCols_;
-    private String actionsContainerFramesetRows_;
-    private String savedActionsContainerFramesetRows_;
-
-    public FavoritesPerspective(Controller controller)
-    {
-        super("favorites",controller);
-    }
-
-    public final void initPerspective(ServletContext application)
-    {
-        model_ = new BasicModel("FavoritesModel");
-        FavoritesMainElement favoritesMainElement = new FavoritesMainElement(getMessage("FAVORITES_MAIN_NODE"), model_, controller_);
-        model_.setRootElement(favoritesMainElement);
-        nodeManager_ = new NodeManager(controller_);
-        FavoritesMainNode favMainNode = new FavoritesMainNode(favoritesMainElement, nodeManager_);
-        nodeManager_.setRootNode(favMainNode);
-        
-        // Starting frameset sizes.
-        if (!DirUtils.isRTL())
-          perspectiveContentFramesetCols_ = "30%,*";
-        else
-          perspectiveContentFramesetCols_ = "*,30%";
-        savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-        actionsContainerFramesetRows_ = "75%,*";
-        savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;        
-    }
-
-    public NodeManager getNodeManager() {
-        return nodeManager_;
-    }
-
-    public String getPerspectiveContentPage()
-    {
-        return "favorites/fav_perspective_content.jsp";
-    }
-
-    public int getPerspectiveId()
-    {
-        return ActionInputs.PERSPECTIVE_FAVORITES;
-    }
-
-    public String getPanesFile() {
-        return "favorites/scripts/favoritesPanes.jsp";
-    }
-    
-    public String getProcessFramesetsForm()
-    {
-      return "favorites/forms/ProcessFavoritesFramesetsForm.jsp";
-    }
-    
-    public String getFramesetsFile()
-    {
-      return "favorites/scripts/favoritesframesets.jsp";
-    }
-
-    public String getTreeContentVar() {
-        return "favNavigatorContent";
-    }
-
-    public String getTreeContentPage() {
-        return "favorites/fav_navigator_content.jsp";
-    }
-
-    public String getPropertiesContainerVar() {
-        return "favPropertiesContainer";
-    }
-
-    public String getPropertiesContainerPage() {
-        return "favorites/fav_properties_container.jsp";
-    }
-
-    public String getStatusContentVar() {
-        return "favStatusContent";
-    }
-
-    public String getStatusContentPage() {
-        return "favorites/fav_status_content.jsp";
-    }
-
-    public String getPropertiesContentVar() {
-        return "favPropertiesContent";
-    }
-
-    public String getPropertiesContentPage() {
-        return "favorites/fav_properties_content.jsp";
-    }
-
-    public final String getPerspectiveContentFramesetCols()
-    {
-      return perspectiveContentFramesetCols_;
-    }
-    
-    public final void setPerspectiveContentFramesetCols(String cols)
-    {
-      perspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getSavedPerspectiveContentFramesetCols()
-    {
-      return savedPerspectiveContentFramesetCols_;
-    }
-    
-    public final void setSavedPerspectiveContentFramesetCols(String cols)
-    {
-      savedPerspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getActionsContainerFramesetRows()
-    {
-      return actionsContainerFramesetRows_;
-    }
-    
-    public final void setActionsContainerFramesetRows(String rows)
-    {
-      actionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSavedActionsContainerFramesetRows()
-    {
-      return savedActionsContainerFramesetRows_;
-    }
-    
-    public final void setSavedActionsContainerFramesetRows(String rows)
-    {
-      savedActionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-    {
-      return SwitchPerspectiveFromFavoritesAction.getFormActionLink(targetPerspectiveId,forHistory);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
deleted file mode 100644
index d5040863b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesRestoreDefaultFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.FavoritesRestoreDefaultFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesRestoreDefaultFavoritesTool extends ActionTool {
-    public FavoritesRestoreDefaultFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return FavoritesRestoreDefaultFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
deleted file mode 100644
index c5fd41b59..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesSetDefaultViewTool extends SetDefaultViewTool {
-    public FavoritesSetDefaultViewTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
deleted file mode 100644
index ad9a2f043..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIBusinessDetailsTool extends FormTool {
-
-    public FavoritesUDDIBusinessDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
deleted file mode 100644
index d354eb4d9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessFolderNode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIBusinessFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIBusinessFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
-                                                           FavoritesUDDIBusinessNode favoritesUDDIBusinessNode = new FavoritesUDDIBusinessNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesUDDIBusinessNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_BUSINESS_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIBusinessTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_BUSINESS"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
deleted file mode 100644
index cc6f6b263..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIBusinessNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesUDDIBusinessNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIBusinessNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_business_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIBusinessDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_BUSINESS_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
deleted file mode 100644
index b979945fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIRegistryDetailsTool extends FormTool {
-
-    public FavoritesUDDIRegistryDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
deleted file mode 100644
index 88fc7bd59..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryFolderNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-import java.io.*;
-
-public class FavoritesUDDIRegistryFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIRegistryFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
-                                                           TreeElement regElement = (TreeElement)event.getParentElement();
-                                                           String imagePath;
-                                                           StringBuffer categoriesDirectory = new StringBuffer();
-                                                           FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(categoriesDirectory,nodeManager_.getController().getServletEngineStateLocation(),regElement.getName());
-                                                           File categoryDirectoryFile = new File(categoriesDirectory.toString());
-                                                           String[] categoryFiles = categoryDirectoryFile.list();
-                                                           if (categoryFiles != null && categoryFiles.length > 0)
-                                                             imagePath = "favorites/images/uddi_registry_cat_node.gif";
-                                                           else
-                                                             imagePath = "favorites/images/uddi_registry_node.gif";
-                                                           FavoritesUDDIRegistryNode favoritesUDDIRegistryNode = new FavoritesUDDIRegistryNode(regElement, nodeManager_, nodeDepth_ + 1, imagePath);
-                                                           addChild(favoritesUDDIRegistryNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIRegistryTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_REGISTRY"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
deleted file mode 100644
index 85fdd7acc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIRegistryNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesUDDIRegistryNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIRegistryNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth,String imagePath) {
-        super(treeElement, nodeManager, nodeDepth, imagePath);
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIRegistryDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_REGISTRY_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
deleted file mode 100644
index 8e8bf4367..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceDetailsTool extends FormTool {
-
-    public FavoritesUDDIServiceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIServiceDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
deleted file mode 100644
index 37b722fff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceFolderNode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
-                                                           FavoritesUDDIServiceNode favoritesUDDIServiceNode = new FavoritesUDDIServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesUDDIServiceNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
deleted file mode 100644
index 8e18df13a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesUDDIServiceInterfaceDetailsTool extends FormTool {
-
-    public FavoritesUDDIServiceInterfaceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
deleted file mode 100644
index 953000a94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceFolderNode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesUDDIServiceInterfaceFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesUDDIServiceInterfaceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
-                                                           FavoritesUDDIServiceInterfaceNode favoritesUDDIServiceInterfaceNode = new FavoritesUDDIServiceInterfaceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesUDDIServiceInterfaceNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteUDDIServiceInterfaceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_UDDI_SERVICE_INTERFACE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
deleted file mode 100644
index 787993936..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceInterfaceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesUDDIServiceInterfaceNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIServiceInterfaceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_interface_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIServiceInterfaceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_INTERFACE_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
deleted file mode 100644
index 1c4024708..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesUDDIServiceNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesUDDIServiceNode extends FavoritesNavigatorNode {
-    public FavoritesUDDIServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/uddi_service_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesUDDIServiceDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_UDDI_SERVICE_DETAILS"));
-        new AddToUDDIPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_TO_UDDI_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
deleted file mode 100644
index d809f42de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSDLDetailsTool extends FormTool {
-
-    public FavoritesWSDLDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesWSDLDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
deleted file mode 100644
index b82b64487..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceFolderNode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSDLServiceFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesWSDLServiceFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
-                                                           FavoritesWSDLServiceNode favoritesWSDLServiceNode = new FavoritesWSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesWSDLServiceNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSDL_SERVICE_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteWSDLServiceTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSDL_SERVICE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
deleted file mode 100644
index 81c3c1bd0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSDLServiceNode.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesWSDLServiceNode extends FavoritesNavigatorNode {
-    public FavoritesWSDLServiceNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/wsdl_service_node.gif");
-    }
-
-    protected void initTools() {
-        Controller controller = nodeManager_.getController();
-        FavoritesPerspective favPerspective = controller.getFavoritesPerspective();
-        new FavoritesWSDLDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSDL_DETAILS"));
-        new FavoritesImportToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-        new FavoritesImportToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-        new FavoritesLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-        new FavoritesAddToWSDLPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
deleted file mode 100644
index e995aa5c4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILDetailsTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class FavoritesWSILDetailsTool extends FormTool {
-
-    public FavoritesWSILDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "favorites/forms/FavoritesWSILDetailsPage.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
deleted file mode 100644
index d938c4927..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILFolderNode.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class FavoritesWSILFolderNode extends FavoritesNavigatorFolderNode {
-    public FavoritesWSILFolderNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth);
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(FavoritesModelConstants.REL_WSIL_NODE)) {
-                                                           FavoritesWSILNode favoritesWSILNode = new FavoritesWSILNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(favoritesWSILNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(FavoritesModelConstants.REL_WSIL_NODE)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new ListFavoriteWSILTool(toolManager_, favPerspective.getMessage("ALT_LIST_FAVORITE_WSIL"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
deleted file mode 100644
index 1ae32dd86..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/FavoritesWSILNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class FavoritesWSILNode extends FavoritesNavigatorNode {
-    public FavoritesWSILNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "favorites/images/wsil_node.gif");
-    }
-
-    protected void initTools() {
-        FavoritesPerspective favPerspective = nodeManager_.getController().getFavoritesPerspective();
-        new FavoritesWSILDetailsTool(toolManager_, favPerspective.getMessage("ALT_FAVORITES_WSIL_DETAILS"));
-        new AddWSILToWSILPerspectiveTool(toolManager_, favPerspective.getMessage("ALT_ADD_WSIL_TO_WSIL_PERSPECTIVE"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
deleted file mode 100644
index 281fce8c6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIBusinessTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIBusinessTool extends FormTool {
-    public ListFavoriteUDDIBusinessTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_business_enabled.gif", "favorites/images/list_business_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIBusinessView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
deleted file mode 100644
index 1b016dd08..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIRegistryTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIRegistryTool extends FormTool {
-    public ListFavoriteUDDIRegistryTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_registry_enabled.gif", "favorites/images/list_registry_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIRegistryView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
deleted file mode 100644
index d4233f560..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceInterfaceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceInterfaceTool extends FormTool {
-    public ListFavoriteUDDIServiceInterfaceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_service_interface_enabled.gif", "favorites/images/list_service_interface_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
deleted file mode 100644
index f432bf8f2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteUDDIServiceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteUDDIServiceTool extends FormTool {
-    public ListFavoriteUDDIServiceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_service_enabled.gif", "favorites/images/list_service_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteUDDIServiceView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
deleted file mode 100644
index 4e5e2c171..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSDLServiceTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSDLServiceTool extends FormTool {
-    public ListFavoriteWSDLServiceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_wsdl_enabled.gif", "favorites/images/list_wsdl_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteWSDLServiceView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
deleted file mode 100644
index ede83f1d6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/ListFavoriteWSILTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class ListFavoriteWSILTool extends FormTool {
-    public ListFavoriteWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "favorites/images/list_WSIL_enabled.gif", "favorites/images/list_WSIL_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "favorites/views/ListFavoriteWSILView.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
deleted file mode 100644
index 424a6e0a6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/favorites/perspective/RemoveFavoritesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.RemoveFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.SelectFavoritesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class RemoveFavoritesTool extends ActionTool {
-
-    public RemoveFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectFavoritesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return RemoveFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
deleted file mode 100644
index 53123381b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ActionTool.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-public abstract class ActionTool extends Tool
-{
-  public ActionTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
-  {
-    super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.ACTION);
-  }
-
-  public String getFormLink()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
deleted file mode 100644
index 1282a97e1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/AddToWSDLPerspectiveTool.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class AddToWSDLPerspectiveTool extends ActionTool
-{
-  public AddToWSDLPerspectiveTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"images/add_to_wsdl_perspective_enabled.gif","images/add_to_wsdl_perspective_highlighted.gif",alt);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
deleted file mode 100644
index 2d211dc0b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/BreadCrumb.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-// A class used to represent a brower breadcrumb. Each breadcrumb encapsulates
-// a navigated URL.
-public class BreadCrumb
-{
-  private int perspectiveId_;
-  private String url_;
-
-  public BreadCrumb(int perspectiveId,String url)
-  {
-    perspectiveId_ = perspectiveId;
-    url_ = url;
-  }
-
-  /**
-  * Get the URL associated with this breadcrumb.
-  * @return String The URL.
-  */
-  public String getURL()
-  {
-    return url_;
-  }
-
-  /**
-  * Get the ID of the perspective where this breadcrumb belongs.
-  * @return int The perspectiveID as defined in ActionInputs.
-  */
-  public int getPerspectiveId()
-  {
-    return perspectiveId_;
-  }
-
-  /**
-  * Test equality between this breadcrumb and another. Both the URLs and perspective
-  * IDs must be equal for two breadcrumbs to be equal.
-  * @param BreadCrumb A breadcrumb.
-  * @return boolean The result of the equality test.
-  */
-  public boolean equals(BreadCrumb b)
-  {
-    return ((url_.equals(b.getURL())) && (perspectiveId_ == b.getPerspectiveId()));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
deleted file mode 100644
index 355bce7ad..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Controller.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-import javax.servlet.*;
-
-public class Controller extends MessageProvider
-{
-  private String sessionId_;
-  private String stateLocation_;
-  private String defaultFavoritesLocation_;
-  private String contextPath_;
-  private int historyDirection_;
-  private History history_;
-  private UDDIPerspective uddiPerspective_;
-  private WSILPerspective wsilPerspective_;
-  private WSDLPerspective wsdlPerspective_;
-  private FavoritesPerspective favoritesPerspective_;
-  private Perspective currentPerspective_;
-  private boolean isPerspectiveContentBlank_;
-  private ActionEngine actionEngine;
-  
-  // WSDL Browser
-  private int wsdlType_;
-
-  public Controller()
-  {
-    super("explorer");
-    contextPath_ = null;
-	stateLocation_ = null;
-    history_ = new History();
-    uddiPerspective_ = new UDDIPerspective(this);
-    wsilPerspective_ = new WSILPerspective(this);
-    wsdlPerspective_ = new WSDLPerspective(this);
-    favoritesPerspective_ = new FavoritesPerspective(this);
-    // Set the default perspective to UDDI.
-    currentPerspective_ = uddiPerspective_;
-    historyDirection_ = ActionInputs.JUMP_BACK;
-    wsdlType_ = ActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
-    isPerspectiveContentBlank_ = true;
-    actionEngine = new ActionEngine(this);
-  }
-  
-  public final void setStateLocation(String stateLocation)
-  {
-	stateLocation_ = stateLocation;
-  }
-
-  public final void setDefaultFavoritesLocation(String defaultFavoritesLocation)
-  {
-	  defaultFavoritesLocation_ = defaultFavoritesLocation;
-  }
-  
-  // This method should be called immediately after the Controller bean is instantiated.
-  private final void setContextPath(String contextPath)
-  {
-    if (contextPath_ == null)
-      contextPath_ = contextPath;
-  }
-  
-  public final String getPathWithContext(String relativePath)
-  {
-    if (relativePath == null)
-      return relativePath;
-    StringBuffer path = new StringBuffer(relativePath);
-    if (contextPath_ != null)
-      path.insert(0,'/').insert(0,contextPath_);
-    return path.toString();
-  }
-
-  public final String getSessionId()
-  {
-    return sessionId_;
-  }
-  
-  public final String getContextPath()
-  {
-    return contextPath_;
-  }
-  
-  public final String getServletEngineStateLocation() {
-	return stateLocation_;
-  }
-  
-  public final String getDefaultFavoritesLocation () {
-	return defaultFavoritesLocation_;
-  }
-  
-  public final void init(String sessionId,ServletContext application,String contextPath)
-  {
-    sessionId_ = sessionId;
-    setContextPath(contextPath);
-    uddiPerspective_.initPerspective(application);
-    wsilPerspective_.initPerspective(application);
-    wsdlPerspective_.initPerspective(application);
-    favoritesPerspective_.initPerspective(application);
-  }
-
-  // Setter for the current perspective.
-  public final void setCurrentPerspective(int perspective)
-  {
-    switch (perspective)
-    {
-      case ActionInputs.PERSPECTIVE_UDDI:
-        currentPerspective_ = uddiPerspective_;
-        break;
-      case ActionInputs.PERSPECTIVE_WSIL:
-        currentPerspective_ = wsilPerspective_;
-        break;
-      case ActionInputs.PERSPECTIVE_WSDL:
-        currentPerspective_ = wsdlPerspective_;
-        break;
-      case ActionInputs.PERSPECTIVE_FAVORITES:
-        currentPerspective_ = favoritesPerspective_;
-        break;
-    }
-  }
-
-  // Getter for the current perspective.
-  public final Perspective getCurrentPerspective()
-  {
-    return currentPerspective_;
-  }
-
-  // Getter for the UDDI perspective.
-  public final UDDIPerspective getUDDIPerspective()
-  {
-    return uddiPerspective_;
-  }
-
-  // Getter for the WSIL perspective.
-  public final WSILPerspective getWSILPerspective()
-  {
-    return wsilPerspective_;
-  }
-  
-  // Getter for the WSDL perspective.
-  public final WSDLPerspective getWSDLPerspective()
-  {
-    return wsdlPerspective_;
-  }
-
-  // Getter for the Favorites perspective.
-  public final FavoritesPerspective getFavoritesPerspective() {
-    return favoritesPerspective_;
-  }
-  
-  // Getter for the action engine
-  public final ActionEngine getActionEngine() {
-    return actionEngine;
-  }
-
-  public final boolean addToHistory(int perspectiveId,String url)
-  {
-    if (url != null)
-      return history_.addBreadCrumb(new BreadCrumb(perspectiveId,url));
-    return false;
-  }
-
-  // Wrapper for moving forward in the history list and obtaining the breadcrumb.
-  public final BreadCrumb forward()
-  {
-    historyDirection_ = ActionInputs.JUMP_FORWARD;
-    return history_.forward();
-  }
-
-  // Wrapper for moving back in the history list and obtaining the breadcrumb.
-  public final BreadCrumb back()
-  {
-    historyDirection_ = ActionInputs.JUMP_BACK;
-    return history_.back();
-  }
-
-  public final int getHistoryDirection()
-  {
-    return historyDirection_;
-  }
-
-  public final void processStaleBreadCrumb()
-  {
-    history_.removeCurrentBreadCrumb();
-  }
-  
-  // WSDL Browser
-  public final void setWSDLType(int wsdlType)
-  {
-    wsdlType_ = wsdlType;
-  }
-
-  public final int getWSDLType()
-  {
-    return wsdlType_;
-  }
-  
-  public final boolean isPerspectiveContentBlank()
-  {
-    return isPerspectiveContentBlank_;
-  }
-  
-  public final void enablePerspectiveContentBlank(boolean isPerspectiveContentBlank)
-  {
-    isPerspectiveContentBlank_ = isPerspectiveContentBlank;
-  }
-  
-  public final void dumpHistory()
-  {
-    history_.dump();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
deleted file mode 100644
index f95d0af8f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FolderNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-
-public abstract class FolderNode extends Node
-{
-  public FolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"images/folder_closed.gif");
-  }
-
-  public String getOpenImagePath()
-  {
-    return "images/folder_open.gif";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
deleted file mode 100644
index 8765319bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormTool.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-import java.util.*;
-
-public abstract class FormTool extends Tool implements FormToolPropertiesInterface
-{
-  protected FormToolProperties formToolProperties_;
-
-  public FormTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
-  {
-    super(toolManager,enabledImageLink,highlightedImageLink,alt,ToolTypes.FORM);
-    formToolProperties_ = new FormToolProperties();
-    initDefaultProperties();
-  }
-
-  protected void initDefaultProperties()
-  {
-  }
-
-  public final Object getProperty(Object key)
-  {
-    return formToolProperties_.getProperty(key);
-  }
-
-  public final void setProperty(Object key,Object value)
-  {
-    formToolProperties_.setProperty(key,value);
-  }
-
-  public final void removeProperty(Object key)
-  {
-    formToolProperties_.removeProperty(key);
-  }
-
-  public final void clearPropertyTable()
-  {
-    formToolProperties_.clearPropertyTable();
-  }
-
-  public final void updatePropertyTable(Hashtable newPropertyTable)
-  {
-    formToolProperties_.updatePropertyTable(newPropertyTable);
-  }
-
-  public final void setPropertyTable(Hashtable newPropertyTable)
-  {
-    formToolProperties_.setPropertyTable(newPropertyTable);
-  }
-
-  public final void flagError(Object inputKey)
-  {
-    formToolProperties_.flagError(inputKey);
-  }
-
-  public final void flagRowError(Object inputKey,int rowNumber)
-  {
-    formToolProperties_.flagRowError(inputKey,rowNumber);
-  }
-  
-  public final void flagRowError(Object inputKey,Object rowId)
-  {
-    formToolProperties_.flagRowError(inputKey,rowId);
-  }
-
-  public final void clearErrors()
-  {
-    formToolProperties_.clearErrors();
-  }
-
-  public final boolean isInputValid(Object inputKey)
-  {
-    return formToolProperties_.isInputValid(inputKey);
-  }
-
-  public final boolean isRowInputValid(Object inputKey,int rowNumber)
-  {
-    return formToolProperties_.isRowInputValid(inputKey,String.valueOf(rowNumber));
-  }
-  
-  // The row number may also be represented by a unique object (e.g. UUID)
-  public final boolean isRowInputValid(Object inputKey,Object rowId)
-  {
-    return formToolProperties_.isRowInputValid(inputKey,rowId);
-  }
-
-  public final String getActionLink()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
deleted file mode 100644
index 09a4436ca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolProperties.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.*;
-
-public class FormToolProperties implements FormToolPropertiesInterface
-{
-  private Hashtable propertyTable_;
-  private Hashtable errantValues_;
-
-  public FormToolProperties()
-  {
-    propertyTable_ = new Hashtable();
-    errantValues_ = new Hashtable();
-  }
-
-  public final Object getProperty(Object key)
-  {
-    return propertyTable_.get(key);
-  }
-
-  public final void setProperty(Object key,Object value)
-  {
-    propertyTable_.put(key,value);
-  }
-
-  public final void removeProperty(Object key)
-  {
-    propertyTable_.remove(key);
-  }
-
-  public final void clearPropertyTable()
-  {
-    propertyTable_.clear();
-  }
-
-  public final void updatePropertyTable(Hashtable newPropertyTable)
-  {
-    Enumeration e = newPropertyTable.keys();
-    while (e.hasMoreElements())
-    {
-      String key = (String)e.nextElement();
-      propertyTable_.put(key,newPropertyTable.get(key));
-    }
-  }
-
-  public final void setPropertyTable(Hashtable newPropertyTable)
-  {
-    clearPropertyTable();
-    updatePropertyTable(newPropertyTable);
-  }
-
-  public final void flagError(Object inputKey)
-  {
-    if (isInputValid(inputKey))
-      errantValues_.put(inputKey,Boolean.TRUE);
-  }
-
-  public final void flagRowError(Object inputKey,int rowNumber)
-  {
-    flagRowError(inputKey,String.valueOf(rowNumber));
-  }
-  
-  public final void flagRowError(Object inputKey,Object rowId)
-  {
-    Object errorObject = errantValues_.get(inputKey);
-    Hashtable rowHash;
-    if (errorObject instanceof Hashtable)
-      rowHash = (Hashtable)errorObject;
-    else
-      rowHash = new Hashtable();
-    rowHash.put(rowId,Boolean.TRUE);
-    errantValues_.put(inputKey,rowHash);
-  }
-  
-  public final void clearErrors()
-  {
-    errantValues_.clear();
-  }
-
-  public final boolean isInputValid(Object inputKey)
-  {
-    return (errantValues_.get(inputKey) == null);
-  }
-
-  public final boolean isRowInputValid(Object inputKey,int rowNumber)
-  {
-    return isRowInputValid(inputKey,String.valueOf(rowNumber));
-  }
-  
-  public final boolean isRowInputValid(Object inputKey,Object rowId)
-  {
-    Hashtable rowHash = (Hashtable)errantValues_.get(inputKey);
-    if (rowHash == null)
-      return true;
-    return (rowHash.get(rowId) == null);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
deleted file mode 100644
index a5926cfb5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/FormToolPropertiesInterface.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.*;
-
-public abstract interface FormToolPropertiesInterface
-{
-  // Getter and Setter for a property.
-  public abstract Object getProperty(Object key);
-  public abstract void setProperty(Object key,Object value);
-  public abstract void removeProperty(Object key);
-
-  // Property table operators.
-  public abstract void clearPropertyTable();
-  public abstract void updatePropertyTable(Hashtable propertyTable);
-  public abstract void setPropertyTable(Hashtable propertyTable);
-
-  // Error handling.
-  public abstract void flagError(Object inputKey);
-  public abstract void flagRowError(Object inputKey,int rowNumber);
-  public abstract void flagRowError(Object inputKey,Object rowId);
-  public abstract void clearErrors();
-  public abstract boolean isInputValid(Object inputKey);
-  public abstract boolean isRowInputValid(Object inputKey,int rowNumber);
-  public abstract boolean isRowInputValid(Object inputKey,Object rowId);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
deleted file mode 100644
index 44491de41..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/History.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Vector;
-
-// A class representing a Vector of breadcrumbs. A position index is used
-// to navigate through the data structure.
-public class History
-{
-  private Vector items_;
-  private int position_;
-
-  public History()
-  {
-    items_ = new Vector();
-    position_ = -1;
-  }
-
-  // Add a new breadcrumb to the history list. When adding a new breadcrumb
-  // within the current list, all breadcrumbs after the newly added one are
-  // removed.
-  public boolean addBreadCrumb(BreadCrumb b)
-  {
-    int numberOfItems = items_.size();
-    if (numberOfItems == 0)
-    {
-      position_++;
-      items_.addElement(b);
-      return true;
-    }
-    else
-    {
-      BreadCrumb currentBreadCrumb = (BreadCrumb)items_.elementAt(position_);
-      if (!currentBreadCrumb.equals(b))
-      {
-        position_++;
-        items_.insertElementAt(b,position_);
-        for (int i=items_.size()-1;i>position_;i--)
-          items_.removeElementAt(i);
-        return true;
-      }
-    }
-    return false;
-  }
-
-  // Move forward within the history list and obtain the breadcrumb.
-  public BreadCrumb forward()
-  {
-    if (position_ < items_.size()-1)
-    {
-      position_++;
-      BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
-      return b;
-    }
-    return null;
-  }
-
-  // Move back within the history list and obtain the breadcrumb.
-  public BreadCrumb back()
-  {
-    if (position_ > 0)
-    {
-      position_--;
-      BreadCrumb b = (BreadCrumb)items_.elementAt(position_);
-      return b;
-    }
-    return null;
-  }
-
-  public void removeCurrentBreadCrumb()
-  {
-    items_.removeElementAt(position_);
-    if (position_ > items_.size()-1)
-      position_--;
-  }
-  
-  public void dump()
-  {
-    for (int i=0;i<items_.size();i++)
-    {
-      items_.elementAt(i);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
deleted file mode 100644
index 9b53c4eb9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToFileSystemTool.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToFileSystemTool extends ActionTool {
-    public ImportToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/import_fs_enabled.gif", "images/import_fs_highlighted.gif", alt);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
deleted file mode 100644
index af740540f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ImportToWorkbenchTool.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class ImportToWorkbenchTool extends FormTool {
-    public ImportToWorkbenchTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/import_to_workbench_enabled.gif", "images/import_to_workbench_highlighted.gif", alt);
-    }
-
-    public String getFormLink() {
-        return "forms/ImportToWorkbenchForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
deleted file mode 100644
index 432bf703d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchOptionsManager.java
+++ /dev/null
@@ -1,95 +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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.Hashtable;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class LaunchOptionsManager
-{
-  private static LaunchOptionsManager instance_;
-
-  private Hashtable optionsTable_;
-
-  private LaunchOptionsManager()
-  {
-    optionsTable_ = new Hashtable();
-  }
-
-  public static LaunchOptionsManager getInstance()
-  {
-    if (instance_ == null)
-      instance_ = new LaunchOptionsManager();
-    return instance_;
-  }
-
-  public synchronized void manage(String key, Object value, ServletContext application)
-  {
-    if (value instanceof String)
-      manageSession(key, (String)value, application);
-    else if (value instanceof Hashtable)
-      manageOptions(key, (Hashtable)value, application);
-  }
-
-  private void manageSession(String key, String sessionId, ServletContext application)
-  {
-    Object obj = optionsTable_.remove(key);
-    if (obj != null && (obj instanceof Hashtable))
-      loadOptions(sessionId, (Hashtable)obj, application);
-    else
-      optionsTable_.put(key, sessionId);
-  }
-
-  private void manageOptions(String key, Hashtable options, ServletContext application)
-  {
-    Object obj = optionsTable_.remove(key);
-    if (obj != null && (obj instanceof String))
-      loadOptions((String)obj, options, application);
-    else
-      optionsTable_.put(key, options);
-  }
-
-  private void loadOptions(String sessionId, Hashtable options, ServletContext application)
-  {
-    HttpSession httpSession = (HttpSession)application.getAttribute(sessionId);
-    if (httpSession != null)
-    {
-      Controller controller = (Controller)httpSession.getAttribute("controller");
-	  String[] stateLocations = (String[])options.get(LaunchOptions.STATE_LOCATION);
-	  String[] defaultFavoritesLocations = (String[])options.get(LaunchOptions.DEFAULT_FAVORITES_LOCATION);
-      String[] inquiryURLs = (String[])options.get(LaunchOptions.INQUIRY_URL);
-      String[] publishURLs = (String[])options.get(LaunchOptions.PUBLISH_URL);
-      String[] serviceNames = (String[])options.get(LaunchOptions.SERVICE_NAME);
-      String[] serviceKeys = (String[])options.get(LaunchOptions.SERVICE_KEY);
-      String[] wsdlURLs = (String[])options.get(LaunchOptions.WSDL_URL);
-      String[] endpoints = (String[])options.get(LaunchOptions.WEB_SERVICE_ENDPOINT);
-      String[] serviceQNameStrings = (String[])options.get(LaunchOptions.SERVICE_QNAME_STRING);
-      String[] bindingNameStrings = (String[])options.get(LaunchOptions.BINDING_NAME_STRING);
-	  String stateLocation = (stateLocations == null || stateLocations.length == 0) ? null : stateLocations[0];
-	  controller.setStateLocation(stateLocation);
-	  String defaultFavoritesLocation = (defaultFavoritesLocations == null || defaultFavoritesLocations.length == 0) ? null : defaultFavoritesLocations[0];
-	  controller.setDefaultFavoritesLocation(defaultFavoritesLocation);
-      UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-      uddiPerspective.preloadUDDIRegistries(inquiryURLs, publishURLs);
-      uddiPerspective.preloadServices(inquiryURLs,serviceNames,serviceKeys);
-      WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-      wsdlPerspective.preloadWSDL(wsdlURLs);
-      wsdlPerspective.preloadEndpoints(wsdlURLs, endpoints);
-      wsdlPerspective.preselectServiceOrBinding(wsdlURLs,serviceQNameStrings,bindingNameStrings);
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
deleted file mode 100644
index 1b3ea8d02..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/LaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class LaunchWebServiceWizardTool extends FormTool {
-    public LaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/launch_wswizard_enabled.gif", "images/launch_wswizard_highlighted.gif", alt);
-    }
-
-    public String getFormLink() {
-        return "forms/LaunchWebServiceWizardForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
deleted file mode 100644
index ce8c8ca48..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageBundle.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
-
-/**
-* An message bundle is a collection of messages drawn from some
-* set of properties.
-*/
-public class MessageBundle
-{
-  private ResourceBundle fResourceBundle;
-
-  /**
-  * Constructs a new MessageBundle from the given ResourceBundle.
-  */
-  public MessageBundle ( ResourceBundle resourceBundle )
-  {
-    fResourceBundle = resourceBundle;
-  }
-
-  /**
-  * Returns the message identified by messageId.
-  * @param messageId The message ID.
-  * @return String The message text.
-  */
-  public String getMessage ( String messageId )
-  {
-    try
-    {
-      return fResourceBundle.getString(messageId);
-    }
-    catch (MissingResourceException e)
-    {
-      return messageId;
-    }
-  }
-
-  /**
-  * Returns the message identified by messageId.
-  * @param messageId The message ID.
-  * @param sub A substitution value for "%1" in the message.
-  * @return String The message text.
-  */
-  public String getMessage ( String messageId, String sub )
-  {
-    String[] s = {sub};
-    return getMessage(messageId,s);
-  }
-
-  /**
-  * Returns the message identified by messageId.
-  * @param messageId The message ID.
-  * @param sub Substitution values for "%1..%n" (sub[0]..sub[n-1]) in
-  * the message.
-  * @return String The message text.
-  */
-  public String getMessage ( String messageId, String[] sub )
-  {
-    String m = getMessage(messageId);
-    int len = m.length();
-    int max = sub.length;
-    StringBuffer b = new StringBuffer();
-    int pos = 0;
-    while (pos >= 0)
-    {
-      int pct = m.indexOf('%',pos);
-      if (pct >= 0)
-      {
-        b.append(m.substring(pos,pct));
-        pos = pct + 1;
-        if (pos < len)
-        {
-          char d = m.charAt(pos);
-          if (Character.isDigit(d) && d != '0')
-          {
-            int v = Integer.parseInt(new Character(d).toString());
-            if (v <= max)
-            {
-              b.append(sub[v-1]);
-            }
-            else
-            {
-              b.append('?');
-            }
-            pos++;
-          }
-          else
-          {
-            b.append('%');
-            b.append(d);
-            pos++;
-          }
-        }
-        else
-        {
-          b.append('%');
-          pos = -1;
-        }
-      }
-      else
-      {
-        b.append(m.substring(pos));
-        pos = -1;
-      }
-    }
-    return b.toString();
-  }
-
-  public ResourceBundle getResourceBundle()
-  {
-    return fResourceBundle;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
deleted file mode 100644
index 1395a32a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageProvider.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.*;
-
-// A Class which provides String messages.
-public class MessageProvider
-{
-  protected MessageBundle messageBundle_;
-  private String messageProviderName_;
-
-  public MessageProvider(String messageBundleFileName)
-  {
-    try
-    {
-      // Load the message bundle from the WEB-INF\classes subdirectory.
-      messageProviderName_ = messageBundleFileName;
-      messageBundle_ = new MessageBundle(ResourceBundle.getBundle(messageBundleFileName));
-    }
-    catch (MissingResourceException e)
-    {
-    	System.err.println("Could not load "+messageBundleFileName);
-    	e.printStackTrace();
-    }
-  }
-
-  public String getMessage(String messageId)
-  {
-    return messageBundle_.getMessage(messageId);
-  }
-
-  public String getMessage(String messageId,String sub)
-  {
-    return messageBundle_.getMessage(messageId,sub);
-  }
-
-  public String getMessage(String messageId,String[] sub)
-  {
-    return messageBundle_.getMessage(messageId,sub);
-  }
-  
-  public String getMessageProviderName()
-  {
-    return messageProviderName_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
deleted file mode 100644
index cccfc5d24..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/MessageQueue.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-public class MessageQueue
-{
-  protected Vector messageList_;
-
-  public MessageQueue()
-  {
-    messageList_ = new Vector();
-  }
-
-  public void addMessage(String message)
-  {
-    messageList_.addElement(message);
-  }
-
-  public String getMessagesFromList()
-  {
-    StringBuffer messages = new StringBuffer();
-
-    if (messageList_.size()==0)
-      return "";
-
-    Enumeration e = messageList_.elements();
-    while (e.hasMoreElements())
-    {
-      String thisMessage = (String)e.nextElement();
-      messages.append(thisMessage);
-      messages.append(HTMLUtils.LINE_SEPARATOR);
-    }
-    messageList_.removeAllElements();
-    return messages.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
deleted file mode 100644
index e3a2cdf68..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Node.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import javax.servlet.http.*;
-import java.util.*;
-
-public abstract class Node
-{
-  protected TreeElement element_;
-  protected NodeManager nodeManager_;
-  protected int nodeId_;
-  protected int nodeDepth_;
-  protected String imagePath_;
-  protected boolean isOpen_;
-  protected Vector childNodes_;
-  protected ToolManager toolManager_;
-  protected Node parent_;
-  private String anchorName_;
-  private int viewId_;
-
-  public Node(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    element_ = element;
-    nodeManager_ = nodeManager;
-    nodeId_ = nodeManager.addToNodeTable(this);
-    nodeDepth_ = nodeDepth;
-    Controller controller = nodeManager_.getController();
-    if (imagePath == null)
-      imagePath_ = controller.getPathWithContext(NodeManager.PATH_SPACE);
-    else
-      imagePath_ = imagePath;
-    isOpen_ = true;
-    childNodes_ = new Vector();
-    toolManager_ = new ToolManager(this);
-    initTools();
-    anchorName_ = (new StringBuffer("action")).append(nodeId_).toString();
-    parent_ = null;
-    viewId_ = ActionInputs.VIEWID_DEFAULT;
-  }
-
-  /**
-  * Returns the TreeElement associated with this node.
-  * @return TreeElement The element associated with this node.
-  */
-  public TreeElement getTreeElement()
-  {
-    return element_;
-  }
-
-  /**
-  * Returns the name of the node.
-  * @return String
-  */
-  public String getNodeName()
-  {
-    return element_.getName();
-  }
-
-  /**
-  * Returns the NodeManager managing this node.
-  * @return NodeManager
-  */
-  public NodeManager getNodeManager()
-  {
-    return nodeManager_;
-  }
-
-  /**
-  * Returns the id of this node.
-  * @return int
-  */
-  public int getNodeId()
-  {
-    return nodeId_;
-  }
-
-  /**
-  * Returns the depth in the tree of this node relative to the root node
-  * @return int
-  */
-  public int getNodeDepth()
-  {
-    return nodeDepth_;
-  }
-
-  /**
-  * Set the path of the image representing this class of Node.
-  * @param String The path.
-  */
-  public void setImagePath(String path)
-  {
-    imagePath_ = path;
-  }
-
-  /**
-  * Returns true if the children of this node are visible. Returns false
-  * if they are not.
-  * @return boolean
-  */
-  public boolean isOpen()
-  {
-    return isOpen_;
-  }
-
-  public boolean isVisible()
-  {
-    Node parentNode = parent_;
-    while (parentNode != null)
-    {
-      if (!parentNode.isOpen())
-        return false;
-      parentNode = parentNode.getParent();
-    }
-    return true;
-  }
-
-  /**
-  * Sets the visibility of this node's children to the specified value.
-  * Updates the NodeManager's record of the maximum depth visible in the tree.
-  * @param boolean
-  */
-  public final void setVisibilityOfChildren(boolean open)
-  {
-    isOpen_ = open;
-    nodeManager_.updateMaxDepthVisible();
-  }
-
-  /**
-  * Gets the maximum depth displayed in this node's branch of the tree
-  * Used by NodeManager for html display purposes.
-  * @return int
-  */
-  public int getMaxDepthVisible()
-  {
-    if (!isOpen_)
-      return nodeDepth_;
-    else
-    {
-      int currentDepth = nodeDepth_;
-      Enumeration e = childNodes_.elements();
-      while (e.hasMoreElements())
-      {
-        Node thisNode = (Node)e.nextElement();
-        int depth = thisNode.getMaxDepthVisible();
-        if (depth>currentDepth)
-          currentDepth=depth;
-      }
-      return currentDepth;
-    }
-  }
-
-  public final void setParent(Node node)
-  {
-    parent_ = node;
-  }
-
-  public final Node getParent()
-  {
-    return parent_;
-  }
-
-  public final void setViewId(int viewId)
-  {
-    viewId_ = viewId;
-  }
-
-  public final int getViewId()
-  {
-    return viewId_;
-  }
-
-  public final int getViewToolId()
-  {
-    ToolManager viewToolManager = getViewToolManager();
-    if (viewToolManager != null)
-      return viewToolManager.getSelectedToolId();
-    return ActionInputs.VIEWTOOLID_DEFAULT;
-  }
-
-  /**
-  * Adds the specified node as a child of this node.
-  * @param Node The child being added.
-  * @return boolean Always true.
-  */
-  public final boolean addChild(Node childNode)
-  {
-    childNode.setParent(this);
-    childNodes_.addElement(childNode);
-    nodeManager_.updateMaxDepthVisible();
-    return true;
-  }
-
-  /**
-  * Returns the child nodes of this node. If this node has no children, an
-  * empty vector is returned.
-  * @return Vector
-  */
-  public Vector getChildNodes()
-  {
-    return childNodes_;
-  }
-
-  public final Node getChildNode(TreeElement element)
-  {
-    Enumeration e = childNodes_.elements();
-    while (e.hasMoreElements())
-    {
-      Node presentNode = (Node)e.nextElement();
-      if (presentNode.getTreeElement() == element)
-        return presentNode;
-    }
-    return null;
-  }
-
-  public final void removeChildNodes(boolean isEntry)
-  {
-    int numberOfChildNodes = childNodes_.size();
-    for (int i=numberOfChildNodes-1;i>=0;i--)
-    {
-      Node childNode = (Node)childNodes_.elementAt(i);
-      childNode.removeChildNodes(false);
-      nodeManager_.removeFromNodeTable(childNode.getNodeId());
-    }
-    if (numberOfChildNodes > 0)
-    {
-      childNodes_.removeAllElements();
-      if (isEntry)
-        nodeManager_.updateMaxDepthVisible();
-    }
-  }
-
-  public final boolean removeChildNode(TreeElement element)
-  {
-    Node childNode = getChildNode(element);
-    if (childNode != null)
-    {
-      int childNodeId = childNode.getNodeId();
-      if (nodeManager_.getSelectedNodeId() == childNodeId)
-        nodeManager_.setSelectedNodeId(nodeId_);
-      childNodes_.removeElement(childNode);
-      nodeManager_.removeFromNodeTable(childNodeId);
-      nodeManager_.updateMaxDepthVisible();
-      return true;
-    }
-    return false;
-  }
-
-  /**
-  * Get the name of the HTML anchor associated with this node.
-  * @return String The name of the anchor.
-  */
-  public String getAnchorName()
-  {
-    return anchorName_;
-  }
-
-  public ToolManager getToolManager()
-  {
-    return toolManager_;
-  }
-
-  public ToolManager getViewToolManager()
-  {
-    if (viewId_ != ActionInputs.VIEWID_DEFAULT)
-    {
-      ViewTool viewTool = (ViewTool)toolManager_.getSelectedTool();
-      return viewTool.getToolManager(viewId_);
-    }
-    return null;
-  }
-  
-  public ToolManager getCurrentToolManager()
-  {
-    ToolManager toolManager = getViewToolManager();
-    if (toolManager == null)
-      toolManager = toolManager_;
-    return toolManager;
-  }
-
-  protected abstract void initTools();
-
-  protected abstract String getToggleNodeActionHref();
-
-  protected String getToggleNodeActionTarget()
-  {
-    return FrameNames.PERSPECTIVE_WORKAREA;
-  }
-
-  protected void addToggle(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
-  {
-    if (nodeDepth_ != 1)
-    {
-      treeView.append("    <td align=\"left\" width=16 height=16 nowrap>");
-      String toggleImageTag;
-      if (childNodes_.size() > 0)
-      {
-        // <a href="..." target="...">toggleImageTag</a>
-        String href = nodeManager_.getController().getPathWithContext(getToggleNodeActionHref());
-        if (isOpen_)
-        {
-          String toggleAlt = nodeManager_.getController().getMessage("ALT_CLOSE");
-          if (isLastChild)
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_LAST),toggleAlt,"16","16",null);
-          else
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_MINUS_NOTLAST),toggleAlt,"16","16",null);
-        }
-        else
-        {
-          String toggleAlt = nodeManager_.getController().getMessage("ALT_OPEN");
-          if (isLastChild)
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_LAST),toggleAlt,"16","16",null);
-          else
-            toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_PLUS_NOTLAST),toggleAlt,"16","16",null);
-        }
-        String linkTag = HTMLUtils.getHTMLLinkTag(response,href,getToggleNodeActionTarget(),String.valueOf(nodeId_),toggleImageTag,null);
-        treeView.append(linkTag);
-      }
-      else
-      {
-        // <img...>
-        if (isLastChild)
-          toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_LAST),"","16","16",null);
-        else
-          toggleImageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE_NOTLAST),"","16","16",null);
-        treeView.append(toggleImageTag);
-      }
-      treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    }
-  }
-
-  protected abstract String getLinkActionHref();
-
-  protected String getLinkActionTarget()
-  {
-    return FrameNames.PERSPECTIVE_WORKAREA;
-  }
-
-  public String getOpenImagePath()
-  {
-    return imagePath_;
-  }
-
-  public String getClosedImagePath()
-  {
-    return imagePath_;
-  }
-
-  protected void addHTMLLabel(HttpServletResponse response,StringBuffer treeView,boolean isLastChild)
-  {
-    // <a href="..." target="..." onClick="selectNode('...')"><img...></a>
-    Hashtable additionalAttributes = new Hashtable();
-    additionalAttributes.put("name",anchorName_);
-    String imagePath = (nodeManager_.getSelectedNodeId() == nodeId_)?getOpenImagePath():getClosedImagePath();
-
-    String imageTag = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(imagePath),"","16","16",additionalAttributes);
-    String baseHref = getLinkActionHref();
-    String href = ((baseHref == null)?baseHref:nodeManager_.getController().getPathWithContext(baseHref));
-    String target = getLinkActionTarget();
-    additionalAttributes.clear();
-
-    treeView.append("    <td align=\"left\" width=16 height=16 nowrap>");
-    if (href != null)
-      treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,null,imageTag,additionalAttributes));
-    else
-      treeView.append(imageTag);
-    treeView.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("    <td align=\"left\" width=3 height=10 nowrap>").append(HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","3","10",null)).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-
-    // <a name="..." href="..." target="...">label</a>
-    treeView.append("    <td align=\"left\" nowrap>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("      ");
-    if (href != null)
-    {
-      String textAnchorClass;
-      if (nodeManager_.getSelectedNodeId() == nodeId_)
-        textAnchorClass="selectedTextAnchor";
-      else
-        textAnchorClass="unselectedTextAnchor";
-      additionalAttributes.put("class",textAnchorClass);
-      treeView.append(HTMLUtils.getHTMLLinkTag(response,href,target,anchorName_,getNodeName(),additionalAttributes));
-    }
-    else
-      treeView.append("<strong>").append(getNodeName()).append("</strong>");
-    treeView.append(HTMLUtils.LINE_SEPARATOR).append("    </td>").append(HTMLUtils.LINE_SEPARATOR);
-  }
-
-  public void renderNode(HttpServletResponse response,StringBuffer treeView,String prefixColumns,boolean isLastChild)
-  {
-    String space_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_SPACE),"","16","16",null);
-    String line_16x16 = HTMLUtils.getHTMLImageTag(response,nodeManager_.getController().getPathWithContext(NodeManager.PATH_LINE),"","16","16",null);
-
-    // Use border=1 to help with debugging.
-    treeView.append("<table cellspacing=0 cellpadding=0 border=0>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("  <tr>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("    <td align=\"left\" width=16 height=16 nowrap>").append(space_16x16).append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    StringBuffer newPrefixColumns = new StringBuffer(prefixColumns);
-    if (nodeDepth_ >= 2)
-    {
-      if (prefixColumns.length() > 0)
-        treeView.append(prefixColumns).append(HTMLUtils.LINE_SEPARATOR);
-      // generate a new prefix columns.
-      newPrefixColumns.append("    <td align=\"left\" width=16 height=16 nowrap>");
-      if (isLastChild)
-        newPrefixColumns.append(space_16x16);
-      else
-        newPrefixColumns.append(line_16x16);
-      newPrefixColumns.append("</td>").append(HTMLUtils.LINE_SEPARATOR);
-    }
-    addToggle(response,treeView,isLastChild);
-    addHTMLLabel(response,treeView,isLastChild);
-    treeView.append("  </tr>").append(HTMLUtils.LINE_SEPARATOR);
-    treeView.append("</table>").append(HTMLUtils.LINE_SEPARATOR);
-    int numberOfChildNodes = childNodes_.size();
-    if (numberOfChildNodes > 0)
-    {
-      if (isOpen_)
-      {
-        for (int i=0;i<numberOfChildNodes-1;i++)
-        {
-          Node childNode = (Node)childNodes_.elementAt(i);
-          childNode.renderNode(response,treeView,newPrefixColumns.toString(),false);
-        }
-        Node lastChildNode = (Node)childNodes_.elementAt(numberOfChildNodes-1);
-        lastChildNode.renderNode(response,treeView,newPrefixColumns.toString(),true);
-      }
-    }
-  }
-
-  // For sorting purposes.  
-  public final String toString()
-  {
-    return getNodeName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
deleted file mode 100644
index edbe5ae85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/NodeManager.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import javax.servlet.http.*;
-import java.util.*;
-
-public class NodeManager
-{
-  // paths to icon images
-  public static final String PATH_PLUS_NOTLAST = "images/plus_notlast.gif";
-  public static final String PATH_PLUS_LAST = "images/plus_last.gif";
-  public static final String PATH_MINUS_NOTLAST = "images/minus_notlast.gif";
-  public static final String PATH_MINUS_LAST = "images/minus_last.gif";
-  public static final String PATH_LINE = "images/line.gif";
-  public static final String PATH_LINE_NOTLAST = "images/line_notlast.gif";
-  public static final String PATH_LINE_LAST = "images/line_last.gif";
-  public static final String PATH_SPACE = "images/space.gif";
-
-  private Controller controller_;
-  private Node rootNode_;
-  private Hashtable nodeTable_;
-  private int focusedNodeId_;
-  private int selectedNodeId_;
-  private int previousSelectedNodeId_;
-  private int maxDepthVisible_;
-  private int nextId_;
-
-  public NodeManager(Controller controller)
-  {
-    controller_ = controller;
-    rootNode_ = null;
-    nodeTable_ = new Hashtable();
-    focusedNodeId_ = -1;
-    selectedNodeId_ = -1;
-    previousSelectedNodeId_ = -1;
-    maxDepthVisible_ = 1;
-    nextId_ = 0;
-  }
-
-  /**
-  * Hook for the controller.
-  * @return Controller The perspective controller.
-  */
-  public Controller getController()
-  {
-    return controller_;
-  }
-
-  /**
-  * Sets the root node of the tree.
-  * @param rootNode The node being designated as the root node.
-  */
-  public void setRootNode(Node rootNode)
-  {
-    rootNode_ = rootNode;
-  }
-
-  /**
-  * Returns the root node of the tree managed by this NodeManager.
-  * @return Node The root node.
-  */
-  public Node getRootNode()
-  {
-    return rootNode_;
-  }
-
-  /**
-  * @param Integer The id of the node being added.
-  * @param Node The node being added.
-  * @return The nodeId assigned to this node.
-  */
-  public int addToNodeTable(Node node)
-  {
-    int assignedNodeId = nextId_;
-    nodeTable_.put(String.valueOf(assignedNodeId),node);
-    nextId_++;
-    return assignedNodeId;
-  }
-
-  public void removeFromNodeTable(int nodeId)
-  {
-    Vector nodesToRemove = new Vector();
-    Node node = getNode(nodeId);
-    gatherNodesToRemove(nodesToRemove, node);
-    for (Iterator it = nodesToRemove.iterator(); it.hasNext();) {
-      nodeTable_.remove(String.valueOf(((Node)it.next()).getNodeId()));
-    }
-  }
-
-  private void gatherNodesToRemove(Vector nodesToRemove, Node node) {
-    if (node != null) {
-      nodesToRemove.add(node);
-      Vector childNodes = node.getChildNodes();
-      for (Iterator it = childNodes.iterator(); it.hasNext();) {
-        gatherNodesToRemove(nodesToRemove, (Node)it.next());
-      }
-    }
-  }
-
-  /**
-  * Returns the depth of the deepest visible node in the tree.
-  * @return int
-  */
-  public int getMaxDepthVisible()
-  {
-    return maxDepthVisible_;
-  }
-
-  /**
-  * Updates the depth of the deepest visible node in the tree. Nodes
-  * must call this when the visibility of their children changes.
-  * (e.g. expand/collapse of a parent node).
-  */
-  public void updateMaxDepthVisible()
-  {
-    if (rootNode_ != null)
-      maxDepthVisible_ = rootNode_.getMaxDepthVisible();
-  }
-
-  /**
-  * Returns the next available id for a newly created node.
-  * @return int
-  */
-  public int getNextNodeId()
-  {
-    return nextId_;
-  }
-
-  /**
-  * Returns the id of the currently focused node in the tree. A node
-  * becomes focused when any of the following events occur:
-  * 1) The node's icon or image are selected by a user.
-  * 2) The node's expand/collapse icon is clicked.
-  * 3) Programmatically set by the programmer.
-  * The treeview will always scroll to the current focused node when loaded.
-  * @return int The id.
-  */
-  public int getFocusedNodeId()
-  {
-    return focusedNodeId_;
-  }
-
-  /**
-  * Allows modification of the focused node.
-  * @param int The id of the node that is in focus.
-  */
-  public void setFocusedNodeId(int nodeId)
-  {
-    focusedNodeId_ = nodeId;
-  }
-
-  public Node getFocusedNode()
-  {
-    return getNode(focusedNodeId_);
-  }
-
-  /**
-  * Returns the id of the currently selected node in the tree.
-  * @return int The id.
-  */
-  public int getSelectedNodeId()
-  {
-    return selectedNodeId_;
-  }
-
-  public Node getSelectedNode()
-  {
-    return getNode(selectedNodeId_);
-  }
-
-  /**
-  * Retrieve a reference to a Node in this manager's node table.
-  * @return Node The node.
-  */
-  public Node getNode(int nodeId)
-  {
-    return (Node)nodeTable_.get(String.valueOf(nodeId));
-  }
-
-  /**
-  * Allows modification of the selected Node. Note that setting a node to become
-  * selected automatically makes it the focused node. However, this is only a one
-  * way relationship.
-  * @param int The id of the node that is being selected.
-  */
-  public void setSelectedNodeId(int nodeId)
-  {
-    previousSelectedNodeId_ = selectedNodeId_;
-    selectedNodeId_ = nodeId;
-    setFocusedNodeId(selectedNodeId_);
-  }
-
-  public int getPreviousSelectedNodeId()
-  {
-    return previousSelectedNodeId_;
-  }
-
-  public Node getPreviousSelectedNode()
-  {
-    return (Node)nodeTable_.get(String.valueOf(previousSelectedNodeId_));
-  }
-
-  /**
-  * Render the HTML tree view for this node.
-  * @param HttpServletResponse For encoding URLs.
-  * @return String The HTML representing the tree view.
-  */
-  public String renderTreeView(HttpServletResponse response)
-  {
-    StringBuffer treeView = new StringBuffer();
-    rootNode_.renderNode(response,treeView,"",false);
-    return treeView.toString();
-  }
-  
-  /**
-  * Make the provided node is visible by ensuring that its ancestors are visible.
-  * @param Node The node to be made visible.
-  * @return boolean Indicator for whether or not the treeview needs refreshing (i.e. an ancestor was not visible).
-  */
-  public final boolean makeNodeVisible(Node node)
-  {
-    boolean requiresTreeViewRefresh = false;
-    while ((node = node.getParent()) != null)
-    {
-      if (!node.isOpen())
-      {
-        requiresTreeViewRefresh = true;
-        node.setVisibilityOfChildren(true);
-      }
-    }
-    return requiresTreeViewRefresh;
-  }
-  
-  /**
-  * Make the currently selected node visible by ensuring that its ancestors are visible.
-  */
-  public final boolean makeSelectedNodeVisible()
-  {
-    return makeNodeVisible(getSelectedNode());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
deleted file mode 100644
index bbe34a0f7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Perspective.java
+++ /dev/null
@@ -1,57 +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.wst.ws.internal.explorer.platform.perspective;
-
-import javax.servlet.*;
-
-public abstract class Perspective extends MessageProvider
-{
-  protected Controller controller_;
-  protected MessageQueue messageQueue_;
-
-  public Perspective(String messageBundleFileName,Controller controller)
-  {
-    super(messageBundleFileName);
-    controller_ = controller;
-    messageQueue_ = new MessageQueue();
-  }
-
-  public MessageQueue getMessageQueue()
-  {
-    return messageQueue_;
-  }
-
-  public Controller getController()
-  {
-    return controller_;
-  }
-
-  public abstract String getPanesFile();
-  public abstract String getFramesetsFile();
-  public abstract String getProcessFramesetsForm();
-
-  public abstract String getTreeContentVar();
-  public abstract String getTreeContentPage();
-  public abstract String getPropertiesContainerVar();
-  public abstract String getPropertiesContainerPage();
-  public abstract String getStatusContentVar();
-  public abstract String getStatusContentPage();
-
-  public abstract String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory);
-  public abstract String getPerspectiveContentPage();
-  public abstract int getPerspectiveId();
-
-  // This should only be called after the perspective has been successfully instantiated.
-  public abstract void initPerspective(ServletContext application);
-  
-  // Node manager for the navigator/tree content page
-  public abstract NodeManager getNodeManager();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
deleted file mode 100644
index 105f395c3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SectionHeaderInfo.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public class SectionHeaderInfo
-{
-  private String containerId_;
-  private boolean dynamic_;
-  private Object otherProperties_;
-
-  public SectionHeaderInfo()
-  {
-    clear();
-  }
-
-  public final void clear()
-  {
-    containerId_ = "";
-    dynamic_ = true;
-    otherProperties_ = null;
-  }
-
-  public final void setContainerId(String containerId)
-  {
-    containerId_ = containerId;
-  }
-
-  public final String getContainerId()
-  {
-    return containerId_;
-  }
-
-  public final void enableDynamic(boolean isEnabled)
-  {
-    dynamic_ = isEnabled;
-  }
-
-  public final boolean isDynamic()
-  {
-    return dynamic_;
-  }
-
-  public final void setOtherProperties(Object object)
-  {
-    otherProperties_ = object;
-  }
-
-  public final Object getOtherProperties()
-  {
-    return otherProperties_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
deleted file mode 100644
index b3ef1e7a0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/SetDefaultViewTool.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-public abstract class SetDefaultViewTool extends ActionTool
-{
-  public SetDefaultViewTool(ToolManager viewToolManager,String alt)
-  {
-    super(viewToolManager,"images/top_enabled.gif","images/top_highlighted.gif",alt);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
deleted file mode 100644
index f7dd679bb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/Tool.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import javax.servlet.http.*;
-
-import java.util.*;
-
-// A class for representing toolbar tools.
-public abstract class Tool
-{
-  protected ToolManager toolManager_;
-  private String enabledImageLink_;
-  private String highlightedImageLink_;
-  private String alt_;
-  protected int toolId_;
-  protected byte toolType_;
-
-  public Tool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt,byte toolType)
-  {
-    toolManager_ = toolManager;
-    enabledImageLink_ = enabledImageLink;
-    highlightedImageLink_ = highlightedImageLink;
-    alt_ = alt;
-    toolId_ = toolManager_.addTool(this);
-    toolType_ = toolType;
-  }
-
-  public abstract String getSelectToolActionHref(boolean forHistory);
-
-  public String getSelectToolActionTarget()
-  {
-    return FrameNames.PERSPECTIVE_WORKAREA;
-  }
-
-  private final void generateOnMouseValue(StringBuffer value,HttpServletResponse response,String fullImageLink)
-  {
-    value.append("src='").append(response.encodeURL(fullImageLink)).append('\'');
-  }
-
-  public String renderTool(HttpServletResponse response,Controller controller)
-  {
-    Hashtable jsImageProperties = new Hashtable();
-    StringBuffer propertyValue = new StringBuffer();
-    String fullEnabledImageLink = controller.getPathWithContext(enabledImageLink_);
-    generateOnMouseValue(propertyValue,response,fullEnabledImageLink);
-    int propertyValueLength = propertyValue.length();
-    jsImageProperties.put("class","normal");
-    jsImageProperties.put("onMouseOut",propertyValue.append(";mouseout(this)").toString());
-    propertyValue.delete(propertyValueLength,propertyValue.length());
-    jsImageProperties.put("onMouseUp",propertyValue.append(";mouseup(this)").toString());
-    propertyValue.setLength(0);
-    generateOnMouseValue(propertyValue,response,controller.getPathWithContext(highlightedImageLink_));
-    propertyValueLength = propertyValue.length();
-    jsImageProperties.put("onMouseOver",propertyValue.append(";mouseover(this)").toString());
-    propertyValue.delete(propertyValueLength,propertyValue.length());
-    jsImageProperties.put("onMouseDOwn",propertyValue.append(";mousedown(this)").toString());
-
-    String imageTag = HTMLUtils.getHTMLImageTag(response,fullEnabledImageLink,alt_,"16","16",jsImageProperties);
-    return HTMLUtils.getHTMLLinkTag(response,controller.getPathWithContext(getSelectToolActionHref(false)),getSelectToolActionTarget(),null,imageTag,null);
-  }
-
-  public final ToolManager getToolManager()
-  {
-    return toolManager_;
-  }
-
-  public final int getToolId()
-  {
-    return toolId_;
-  }
-
-  public final byte getToolType()
-  {
-    return toolType_;
-  }
-  
-  public final String getEnabledImageLink()
-  {
-    return enabledImageLink_;
-  }
-  
-  public final String getHighlightedImageLink()
-  {
-    return highlightedImageLink_;
-  }
-  
-  public final String getAltText()
-  {
-    return alt_;
-  }
-
-  public abstract String getFormLink();
-  public abstract String getActionLink();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
deleted file mode 100644
index 260b109b3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ToolManager.java
+++ /dev/null
@@ -1,74 +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.wst.ws.internal.explorer.platform.perspective;
-
-import java.util.*;
-
-public class ToolManager
-{
-  private Vector tools_;
-  private int selectedToolId_;
-  private Node node_;
-
-  public ToolManager(Node node)
-  {
-    tools_ = new Vector();
-    selectedToolId_ = 0;
-    node_ = node;
-  }
-
-  public final int getSelectedToolId()
-  {
-    return selectedToolId_;
-  }
-
-  public final int setSelectedToolId(int toolId)
-  {
-    if (toolId >= 0 && toolId < tools_.size())
-      selectedToolId_ = toolId;
-    return selectedToolId_;
-  }
-
-  public final int addTool(Tool tool)
-  {
-    tools_.addElement(tool);
-    return tools_.size()-1;
-  }
-
-  public final Tool getTool(int toolId)
-  {
-    if (toolId >=0 && toolId < getNumberOfTools())
-      return (Tool)tools_.elementAt(toolId);
-    return null;
-  }
-  
-  public final List getTools()
-  {
-    return tools_;
-  }
-
-  public final Tool getSelectedTool()
-  {
-    if (selectedToolId_ >=0 && selectedToolId_ < getNumberOfTools())
-      return (Tool)tools_.elementAt(selectedToolId_);
-    return null;
-  }
-
-  public final int getNumberOfTools()
-  {
-    return tools_.size();
-  }
-
-  public final Node getNode()
-  {
-    return node_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
deleted file mode 100644
index 5dc398d6b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/perspective/ViewTool.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-
-import java.util.*;
-
-public abstract class ViewTool extends FormTool
-{
-  private Hashtable viewToolManagers_;
-
-  public ViewTool(ToolManager toolManager,String enabledImageLink,String highlightedImageLink,String alt)
-  {
-    super(toolManager,enabledImageLink,highlightedImageLink,alt);
-    toolType_ = ToolTypes.VIEW;
-    viewToolManagers_ = new Hashtable();
-  }
-
-  protected abstract void addSetDefaultViewTool(ToolManager viewToolManager,int index);
-  protected abstract void addTools(ToolManager viewToolManager,int index);
-
-  public final ToolManager createToolManager(int viewId)
-  {
-    ToolManager viewToolManager = new ToolManager(toolManager_.getNode());
-    addTools(viewToolManager,viewId);
-    addSetDefaultViewTool(viewToolManager,viewId);
-    viewToolManagers_.put(String.valueOf(viewId),viewToolManager);
-    return viewToolManager;
-  }
-
-  public final ToolManager getToolManager(int viewId)
-  {
-    return (ToolManager)(viewToolManagers_.get(String.valueOf(viewId)));
-  }
-
-  public final void clearViewToolManager(int viewId)
-  {
-    viewToolManagers_.remove(String.valueOf(viewId));
-  }
-
-  public final void clearViewToolManagers()
-  {
-    viewToolManagers_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
deleted file mode 100644
index 6043aebc1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddItemsToFavoritesAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-public class AddItemsToFavoritesAction extends UDDIPropertiesFormAction
-{
-  public AddItemsToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    return true;
-  }
-  
-  public final boolean run()
-  {
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    AddToFavoritesAction action = new AddToFavoritesAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    for (int i=0;i<selectedNodeIds.length;i++)
-    {
-      propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
-      if (action.favoriteExists()) {
-        UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-        Node node = uddiPerspective.getNavigatorManager().getNode(Integer.parseInt(selectedNodeIds[i]));
-        String nodeName = node.getNodeName();
-        uddiPerspective.getMessageQueue().addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_ALREADY_EXISTS",nodeName));
-      }
-      else
-        action.run();
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
deleted file mode 100644
index 9271d416c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddPublisherAssertionsAction.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.*;
-import org.uddi4j.util.*;
-import org.uddi4j.response.*;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.assertion.*;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.transport.TransportException;
-
-import java.util.*;
-import java.net.*;
-
-public class AddPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-  public AddPublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // ids from uddiObjects_table.jsp
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds == null || selectedBusIds.length == 0) {
-      // Synchronize client view and server model (uddiObject_table.jsp)
-      synchronizeUDDIObjectTable();
-      inputsValid = false;
-    }
-    else {
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-      // Synchronize client view and server model (uddiObject_table.jsp)
-      synchronizeUDDIObjectTable();
-    }
-
-    String[] assertionTypes = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
-    if (assertionTypes != null && assertionTypes.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE, assertionTypes);
-    else
-      inputsValid = false;
-
-    String[] directions = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
-    if (directions != null && directions.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION, directions);
-    else
-      inputsValid = false;
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-  
-      if (!Validator.validateString(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userID != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-  
-      if (!Validator.validateString(userID))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        registryElement.performLogin(publishURL, userID, password);
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }
-    }
-
-    UDDIProxy proxy = registryElement.getProxy();
-    registryElement.getUserId();
-    registryElement.getCred();
-    BusinessElement busElement = (BusinessElement)selectedElement;
-
-    // determine whether this is a owned business
-    // if not, the AddPublisherAssertionsAction cannot be performed
-    if (!isBusinessOwned(busElement)) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
-        return false;
-    }
-
-    try {
-      String[] assertionTypes = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_TYPE);
-      String[] directions = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_DIRECTION);
-      String thisBusinessKey = busElement.getBusinessEntity().getBusinessKey();
-
-      // get all selected businesses
-      FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-      String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-      FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-      Vector selectedBusinesses = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
-      Enumeration e = selectedBusinesses.elements();
-      if (!e.hasMoreElements())
-        return true;
-
-      // create a vector of publisher assertions based on all the selected businesses
-      Vector pubAssertionVector = new Vector();
-      int i = 0;
-      while (e.hasMoreElements()) {
-        ListElement le = (ListElement)e.nextElement();
-        BusinessEntity sp = (BusinessEntity)le.getObject();
-        KeyedReference keyedRef = new KeyedReference(assertionTypes[i], assertionTypes[i], TModel.RELATIONSHIPS_TMODEL_KEY);
-        if (Integer.parseInt(directions[i]) == UDDIActionInputs.DIRECTION_TO)
-          pubAssertionVector.add(new PublisherAssertion(sp.getBusinessKey(), thisBusinessKey, keyedRef));
-        else
-          pubAssertionVector.add(new PublisherAssertion(thisBusinessKey, sp.getBusinessKey(), keyedRef));
-        i++;
-      }
-
-      // proxy.add_publisherAssertions(...)
-      DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-
-      // refresh publisher assertions iff proxy reports success
-      if (report.success()) {
-        selectedBusinesses.removeAllElements();
-        ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
-        Hashtable propertyTable = showPAAction.getPropertyTable();
-        Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-        if (ids != null)
-          propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
-        showPAAction.run();
-      }
-
-      return report.success();
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch(Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
deleted file mode 100644
index 87a82c1b2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import java.util.*;
-
-public class AddToFavoritesAction extends UDDINodeAction
-{
-  public AddToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/CheckFavoriteExistsActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean registryExists(String registryName,Node registryNode)
-  {
-    registryNode.getTreeElement();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
-  }
-
-  public final boolean businessExists(String businessName,Node businessNode)
-  {
-    BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String businessKey = busElement.getBusinessEntity().getBusinessKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-  }
-
-   public final boolean serviceExists(String serviceName,Node serviceNode)
-  {
-    ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String serviceKey = serviceElement.getBusinessService().getServiceKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-  }
-
-  public final boolean serviceInterfaceExists(String siName,Node siNode)
-  {
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String tModelKey = siElement.getTModel().getTModelKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
-    return favoriteExists(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
-  }
-
-  public final boolean addRegistryToFavorites(String registryName,Node registryNode)
-  {
-    RegistryElement regElement = (RegistryElement)registryNode.getTreeElement();
-    String inquiryURL = regElement.getInquiryURL();
-    String publishURL = regElement.getPublishURL();
-    if (publishURL == null)
-      publishURL = "";
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_PUBLISH_API,publishURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_NAME,registryName);
-    Enumeration userDefinedCategoriesEnum = regElement.getUserDefinedCategories();
-    if (userDefinedCategoriesEnum != null)
-    {
-      table.put(FavoritesModelConstants.PROP_UDDI_REGISTRY_CATEGORIES_ENUM,userDefinedCategoriesEnum);
-      table.put(FavoritesModelConstants.PROP_PLUGIN_METADATA_DIRECTORY,controller_.getServletEngineStateLocation());
-    }
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE);
-  }
-
-  public final boolean addBusinessToFavorites(String businessName,Node businessNode)
-  {
-    BusinessElement busElement = (BusinessElement)businessNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String businessKey = busElement.getBusinessEntity().getBusinessKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME,businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-  }
-  
-  public final boolean addServiceToFavorites(String serviceName,Node serviceNode)
-  {
-    ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String serviceKey = serviceElement.getBusinessService().getServiceKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME,serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY,serviceKey);
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-  }
-  
-  public final boolean addServiceInterfaceToFavorites(String siName,Node siNode)
-  {
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    String tModelKey = siElement.getTModel().getTModelKey();
-    String inquiryURL = regElement.getInquiryURL();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_NAME,siName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_INQUIRY_API,inquiryURL);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INTERFACE_KEY,tModelKey);
-    return addToFavorites(table,FavoritesModelConstants.REL_UDDI_SERVICE_INTERFACE_FOLDER_NODE);
-  }
-
-  public boolean favoriteExists()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    String nodeName = node.getNodeName();
-    if (node instanceof RegistryNode)
-      return registryExists(nodeName,node);
-    else if (node instanceof BusinessNode)
-      return businessExists(nodeName,node);
-    else if (node instanceof ServiceNode)
-      return serviceExists(nodeName,node);
-    else if (node instanceof ServiceInterfaceNode)
-      return serviceInterfaceExists(nodeName,node);
-    else
-      return false;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    String nodeName = node.getNodeName();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    boolean addToFavoritesResult = false;
-    if (node instanceof RegistryNode)
-    {
-      addToFavoritesResult = addRegistryToFavorites(nodeName,node);
-      RegistryElement regElement = (RegistryElement)node.getTreeElement();
-      Enumeration e = regElement.getUserDefinedCategories();
-      if (e != null)
-      {
-        while (e.hasMoreElements())
-        {
-          CategoryModel categoryModel = (CategoryModel)e.nextElement();
-          Throwable errorException = categoryModel.getErrorException();
-          if (errorException != null)
-          {
-            String[] args = {categoryModel.getDisplayName(),errorException.getMessage()};
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_SAVING_CATEGORY_DATA",args));
-          }
-        }
-      }
-    }
-    else if (node instanceof BusinessNode)
-      addToFavoritesResult = addBusinessToFavorites(nodeName,node);
-    else if (node instanceof ServiceNode)
-      addToFavoritesResult = addServiceToFavorites(nodeName,node);
-    else if (node instanceof ServiceInterfaceNode)
-      addToFavoritesResult = addServiceInterfaceToFavorites(nodeName,node);
-    if (addToFavoritesResult)
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_FAVORITE_ADDED",nodeName));
-    else
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_FAVORITE_NOT_ADDED",nodeName));
-    return addToFavoritesResult;      
-  }
-  
-  protected boolean addToFavorites(Hashtable table, String rel)
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favNodeManager = favPerspective.getNodeManager();
-    TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-    Enumeration e = favRootElement.getElements(rel);
-    if (!e.hasMoreElements())
-      return false;
-    FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-    return favFolderElement.addFavorite(table);
-  }
-
-  protected boolean favoriteExists(Hashtable table, String rel)
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favNodeManager = favPerspective.getNodeManager();
-    TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-    Enumeration e = favRootElement.getElements(rel);
-    if (!e.hasMoreElements())
-      return false;
-    FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-    return favFolderElement.favoriteExists(table);
-  }
-  
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.java
deleted file mode 100644
index 6961248ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceAdvancedAction.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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceAdvancedAction extends PublishAction
-{
-  private RegPublishServiceAdvancedAction regPublishServiceAdvancedAction_;
-  public BusPublishServiceAdvancedAction(Controller controller)
-  {
-    super(controller);
-    regPublishServiceAdvancedAction_ = new RegPublishServiceAdvancedAction(controller);
-    propertyTable_ = regPublishServiceAdvancedAction_.getPropertyTable();
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    Node businessNode = getSelectedNavigatorNode();
-    BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
-    BusinessEntity businessEntity = businessElement.getBusinessEntity();
-    ListElement busListElement = new ListElement(businessEntity);
-    Vector serviceBusinessCopy = new Vector();
-    serviceBusinessCopy.addElement(busListElement);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY,serviceBusinessCopy);
-    boolean result = regPublishServiceAdvancedAction_.processOthers(parser,formToolPI);
-    if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER))
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,businessEntity);
-    return result;
-  }
-
-  public final boolean run()
-  {
-    return regPublishServiceAdvancedAction_.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
deleted file mode 100644
index ea9da0af8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,53 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusPublishServiceSimpleAction extends PublishAction
-{
-  private RegPublishServiceSimpleAction regPublishServiceSimpleAction_;
-
-  public BusPublishServiceSimpleAction(Controller controller)
-  {
-    super(controller);
-    regPublishServiceSimpleAction_ = new RegPublishServiceSimpleAction(controller);
-    propertyTable_ = regPublishServiceSimpleAction_.getPropertyTable();
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    Node businessNode = getSelectedNavigatorNode();
-    BusinessElement businessElement = (BusinessElement)businessNode.getTreeElement();
-    BusinessEntity businessEntity = businessElement.getBusinessEntity();
-    ListElement busListElement = new ListElement(businessEntity);
-    Vector serviceBusinessCopy = new Vector();
-    serviceBusinessCopy.addElement(busListElement);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY,serviceBusinessCopy); 
-    boolean result = regPublishServiceSimpleAction_.processOthers(parser,formToolPI);
-    if (!propertyTable_.containsKey(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER))
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,businessEntity);
-    return result;
-  }
-
-  public final boolean run()
-  {
-    return regPublishServiceSimpleAction_.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
deleted file mode 100644
index 9f305f803..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/BusinessGetServicesAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-
-import java.util.*;
-
-public class BusinessGetServicesAction extends UDDINodeAction
-{
-  private BusinessNode busNode_;
-  public BusinessGetServicesAction(Controller controller)
-  {
-    super(controller);
-    busNode_ = null;
-  }
-
-  // uddi/actions/BusinessGetServicesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/BusinessGetServicesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateBusiness()
-  {
-    int busNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    busNode_ = (BusinessNode)nodeManager_.getNode(busNodeId);
-    BusinessElement busElement = (BusinessElement)busNode_.getTreeElement();
-    RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busElement.getBusinessEntity().getBusinessKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_BUSINESS_SERVICES",busNode_.getNodeName()));
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);    
-    
-    ListElement businessListElement = new ListElement(sp);
-    businessListElement.setTargetViewToolInfo(busNode_.getNodeId(),busNode_.getToolManager().getSelectedToolId(),busNode_.getViewId());
-    Vector businessListVector = new Vector();
-    businessListVector.addElement(businessListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,businessListVector);
-    
-    
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
deleted file mode 100644
index 3a5db863c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorFolderNodeAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class ClearNavigatorFolderNodeAction extends ClearNavigatorNodeAction
-{
-  public ClearNavigatorFolderNodeAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  // uddi/actions/ClearNavigatorFolderNodeAction.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorFolderNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      Node node = nodeManager_.getNode(nodeId);
-      TreeElement element = node.getTreeElement();
-      element.disconnectRel(element.getPropertyAsString(ModelConstants.REL_CHILDREN));
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
deleted file mode 100644
index 75e4b421b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodeAction.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class ClearNavigatorNodeAction extends ClearNodeAction
-{
-  public ClearNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-    propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
-  }
-
-  // uddi/actions/ClearNavigatorNodeAction.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ClearNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-
-  public final String getStatusContentVar()
-  {
-    return "statusContent";
-  }
-
-  public final String getStatusContentPage()
-  {
-    return "uddi/status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
deleted file mode 100644
index e0f5166d2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ClearNavigatorNodesAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-public class ClearNavigatorNodesAction extends UDDIPropertiesFormAction
-{
-  public ClearNavigatorNodesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    if (selectedNodeIds != null)
-      propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    else
-      removeProperty(UDDIActionInputs.SELECTED_NODEIDS);
-    return true;
-  }
-  
-  public final boolean run()
-  {
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    if (selectedNodeIds != null)
-    {
-      ClearNavigatorNodeAction action = new ClearNavigatorNodeAction(controller_);
-      Hashtable propertyTable = action.getPropertyTable();
-      for (int i=0;i<selectedNodeIds.length;i++)
-      {
-        propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
-        action.run();
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
deleted file mode 100644
index 5e14725a3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CommonPublisherAssertionsAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.RegisteredInfo;
-
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.Enumeration;
-
-public abstract class CommonPublisherAssertionsAction extends UDDIPropertiesFormAction
-{
-
-  protected RegistryNode registryNode_;
-  protected boolean isLoggedIn_;
-
-  public CommonPublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-
-    registryNode_ = getRegistryNode();
-    if (registryNode_ != null)
-      isLoggedIn_ = ((RegistryElement)registryNode_.getTreeElement()).isLoggedIn();
-  }
-
-  protected void synchronizeUDDIObjectTable() {
-    String[] selectedBusIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    Node selectedNode = controller_.getUDDIPerspective().getNavigatorManager().getSelectedNode();
-    FormTool formTool = (FormTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    String subQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey);
-    Vector businessVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS);
-    ListManager businessCopy = (ListManager)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY);
-    if (selectedBusIds == null || selectedBusIds.length <= 0) {
-      businessVector.removeAllElements();
-      businessCopy.clear();
-    }
-    Enumeration e = businessCopy.getListElements();
-    while (e.hasMoreElements()) {
-      boolean isIdFound = false;
-      ListElement le = (ListElement)e.nextElement();
-      int listElementViewId = le.getViewId();
-      for (int i = 0; i < selectedBusIds.length; i++) {
-        if (listElementViewId == Integer.parseInt(selectedBusIds[i])) {
-          isIdFound = true;
-          break;
-        }
-      }
-      if (!isIdFound)
-        businessVector.remove(le);
-    }
-  }
-
-  protected boolean isBusinessOwned(BusinessElement busElement) {
-    boolean isBusinessOwned = false;
-    String isBusinessOwnedString = busElement.getPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED);
-    if (isBusinessOwnedString != null) {
-      isBusinessOwned = Boolean.valueOf(isBusinessOwnedString).booleanValue();
-    }
-    else if (isLoggedIn_) {
-      try {
-        RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
-        UDDIProxy proxy = regElement.getProxy();
-        RegisteredInfo ri = proxy.get_registeredInfo(regElement.getAuthInfoString());
-        Vector beVector = ri.getBusinessInfos().getBusinessInfoVector();
-        for (Iterator it = beVector.iterator(); it.hasNext();)
-        { 
-          BusinessInfo bi = (BusinessInfo)it.next();
-          if (bi.getBusinessKey().equals(busElement.getBusinessEntity().getBusinessKey()))
-          {  
-            isBusinessOwned = true;
-            break;
-          }
-        }
-        busElement.setPropertyAsString(UDDIModelConstants.IS_BUSINESS_OWNED, String.valueOf(isBusinessOwned));
-      }
-      catch (Exception e) {}
-    }
-    return isBusinessOwned;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
deleted file mode 100644
index 985c352f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/CompletePublisherAssertionsAction.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.UDDIException;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-
-import java.util.*;
-import java.net.*;
-
-public class CompletePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-  public CompletePublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // ids from uddiObjects_table
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds != null && selectedBusIds.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-    // Synchronize client view and server model (uddiObject_table.jsp)
-    synchronizeUDDIObjectTable();
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-  
-      if (!Validator.validateString(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userID != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-  
-      if (!Validator.validateString(userID))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    // ids from publisher assertion table
-    String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-    if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
-      inputsValid = false;
-    else
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        registryElement.performLogin(publishURL, userID, password);
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }      
-    }
-
-    UDDIProxy proxy = registryElement.getProxy();
-    registryElement.getUserId();
-    registryElement.getCred();
-    BusinessElement busElement = (BusinessElement)selectedElement;
-    ListManager pubAssertions = busElement.getPublisherAssertions();
-
-    // determine whether this is a owned business
-    // if not, the AddPublisherAssertionsAction cannot be performed
-    if (!isBusinessOwned(busElement)) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
-        return false;
-    }
-
-    try {
-      String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-      Vector pubAssertionVector = new Vector();
-
-      for (int i = 0; i < pubAssertionViewIds.length; i++) {
-        int viewID = Integer.parseInt(pubAssertionViewIds[i]);
-        ListElement listElement = pubAssertions.getElementWithViewId(viewID);
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
-        if (!(pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE)))
-          pubAssertionVector.add(pubAssertionElement.getPublisherAssertion());
-      }
-
-      if (pubAssertionVector.size() <= 0) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_INCOMPLETE_ASSERTION_SELECTED"));
-        return false;
-      }
-
-      DispositionReport report = proxy.add_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-      //report status
-	  Vector reportErrInfo = report.getResultVector();
-      for (int j = 0; j < reportErrInfo.size(); j++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
-      }
-
-      ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
-      Hashtable propertyTable = showPAAction.getPropertyTable();
-      Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-      if (ids != null)
-        propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
-      showPAAction.run();
-
-      return report.success();
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int j = 0; j < reportErrInfo.size(); j++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(j)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
deleted file mode 100644
index b33b22a34..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/FindAction.java
+++ /dev/null
@@ -1,249 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-public abstract class FindAction extends UDDIPropertiesFormAction
-{
-  protected QueryElement queryElement_;
-  protected String subQueryKey_;
-  protected boolean isSubQueryGet_;
-  protected String newSubQuery_;
-  protected String newSubQueryItem_;
-  protected boolean subQueryInitiated_;
-  protected RegistryNode regNode_;
-  private boolean isRefreshAction_;
-
-  public FindAction(Controller controller)
-  {
-    super(controller);
-    queryElement_ = null;
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-    regNode_ = getRegistryNode();
-    isRefreshAction_ = false;
-  }
-
-  protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    // Setup for MultipartFormDataParserTransformer
-    propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String queryName = parser.getParameter(UDDIActionInputs.QUERY_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-      
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    if (queryName != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_NAME,queryName);
-
-    if (!Validator.validateString(queryName) && !subQueryInitiated_)
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_QUERY_NAME"));
-    }
-
-    if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
-      inputsValid = false;
-      
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-      
-    // Process authentication information. If valid, these should be set in the formTool (not the formToolPI).
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
-    boolean validateAuthentication = (ownedChecked != null) && (!regElement.isLoggedIn()) && !overrideAuthenticationValidation();
-
-    if (publishURL != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    }      
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-    }
-
-    if (userId != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    }
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-    }
-
-    if (password != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    }        
-      
-    return inputsValid;
-  }
-
-  protected boolean overrideAuthenticationValidation()
-  {
-    return false;
-  }
-  
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-  
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }    
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-  
-  public final void setRefreshAction(boolean isRefreshAction)
-  {
-    isRefreshAction_ = isRefreshAction;
-  }
-  
-  public final boolean isRefreshAction()
-  {
-    return isRefreshAction_;
-  }
-
-  protected final void addQueryNode()
-  {
-    // If the queryElement already exists, remove it first.
-    String queryName = queryElement_.getName();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    QueryParentElement queryParentElement = regElement.getQueryParentElement();
-    Enumeration e = queryParentElement.getQueries();
-    while (e.hasMoreElements())
-    {
-      QueryElement qe = (QueryElement)e.nextElement();
-      if (qe.getName().equals(queryName))
-      {
-        SubQueryTransferTarget subQueryTransferTarget = (SubQueryTransferTarget)qe.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET);
-        if (subQueryTransferTarget != null && (qe.getQueryType() == queryElement_.getQueryType()))
-          queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,subQueryTransferTarget);
-        qe.disconnectAll();
-        break;
-      }
-    }
-    if (!isRefreshAction_)
-    {
-      // We can make safe assumptions about the node that is currently selected.
-      if (subQueryKey_ != null && subQueryKey_.length() > 0)
-      {
-        String parentQueryKey;
-        int lastSeparatorPos = subQueryKey_.lastIndexOf(':');
-        if (lastSeparatorPos == -1)
-          parentQueryKey = "";
-        else
-          parentQueryKey = subQueryKey_.substring(0,lastSeparatorPos);
-        FormToolPropertiesInterface parentFormToolPI = ((MultipleFormToolPropertiesInterface)getSelectedFormTool()).getFormToolProperties(parentQueryKey);
-        Object queryItem = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_ITEM);
-        Object queryStyleBus = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES);
-        Object queryStyleSer = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICES);
-        Object queryStyleSerInt = parentFormToolPI.getProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES);
-        Hashtable parentQueryData = new Hashtable();
-        if (queryItem != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_ITEM, queryItem);
-        if (queryStyleBus != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES, queryStyleBus);
-        if (queryStyleSer != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICES, queryStyleSer);
-        if (queryStyleSerInt != null)
-          parentQueryData.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES, queryStyleSerInt);
-        queryElement_.setPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET,new SubQueryTransferTarget(getSelectedNavigatorNode(),subQueryKey_,parentQueryData));
-      }
-    }
-    queryParentElement.connect(queryElement_,UDDIModelConstants.REL_QUERIES,ModelConstants.REL_OWNER);
-    QueryNode queryNode = (QueryNode)(regNode_.getChildNode(queryParentElement).getChildNode(queryElement_));
-    int newSelectedNodeId;
-    // If there is only 1 result, select the result. Otherwise, select the query node to present a summary.
-    if (queryNode.getChildNodes().size() == 1 && (subQueryKey_ == null || subQueryKey_.length() == 0))
-      newSelectedNodeId = ((Node)(queryNode.getChildNodes().elementAt(0))).getNodeId();
-    else
-      newSelectedNodeId = queryNode.getNodeId();
-    NodeManager nodeManager = regNode_.getNodeManager();
-    nodeManager.setSelectedNodeId(newSelectedNodeId);
-    queryNode.setFindToolProperties(this);
-    Node selectedNode = nodeManager.getSelectedNode();
-    ToolManager toolManager = selectedNode.getCurrentToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
-    return transformers;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
deleted file mode 100644
index 0e470bad6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ManageReferencedServicesAction.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.service.BusinessServices;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.UDDIException;
-import org.uddi4j.transport.TransportException;
-
-import java.util.*;
-import java.net.*;
-
-public class ManageReferencedServicesAction extends UDDIPropertiesFormAction
-{
-  protected String subQueryKey_;
-  protected boolean isSubQueryGet_;
-  protected String newSubQuery_;
-  protected String newSubQueryItem_;
-  protected boolean subQueryInitiated_;
-  protected RegistryNode regNode_;
-
-  public ManageReferencedServicesAction(Controller controller)
-  {
-    super(controller);
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-    regNode_ = getRegistryNode();
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String[] referencedServicesCheckboxes = parser.getParameterValues(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-    String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
-    String operation = parser.getParameter(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    if (operation != null)
-      propertyTable_.put(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION,operation);
-    else
-      removeProperty(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-
-    if (referencedServicesCheckboxes != null)
-      propertyTable_.put(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE,referencedServicesCheckboxes);
-    else
-      removeProperty(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-
-    if (serviceNodeIds != null)
-    {
-      Vector services = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-      if (services == null)
-        services = new Vector();
-      Hashtable resultHash = new Hashtable();
-      for (int i=0;i<serviceNodeIds.length;i++)
-        resultHash.put(serviceNodeIds[i],Boolean.TRUE);
-      for (int i=0;i<services.size();i++)
-      {
-        ListElement listElement = (ListElement)services.elementAt(i);
-        if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) == null)
-        {
-          services.removeElementAt(i);
-          i--;
-        }
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_SERVICES);
-
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    if (!regElement.isLoggedIn())
-    {
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-
-      if (!subQueryInitiated_ && !Validator.validateString(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userId != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      }
-
-      if (!subQueryInitiated_ && !Validator.validateString(userId))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    String operationString = (String)propertyTable_.get(UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION);
-    int operation = Integer.parseInt(operationString);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    BusinessElement busElement = (BusinessElement)(getSelectedNavigatorNode().getTreeElement());
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    Vector referencedServices = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
-    boolean operationResult = true;
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      UDDIProxy proxy = regElement.getProxy();
-      BusinessEntity currentSP = busElement.getBusinessEntity();
-      BusinessEntity sp = (BusinessEntity)proxy.get_businessDetail(currentSP.getBusinessKey()).getBusinessEntityVector().get(0);
-      
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-        
-      Hashtable servicesHash = new Hashtable();
-      Vector backupBusServiceVector = new Vector();
-      switch (operation)
-      {
-        case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_ADD:
-          Vector services = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SERVICES);          
-          for (int i=0;i<services.size();i++)
-          {
-            ListElement serviceListElement = (ListElement)services.elementAt(i);
-            BusinessService bs = (BusinessService)serviceListElement.getObject();
-            servicesHash.put(bs.getServiceKey(),bs);
-          }
-          
-          // Save the current list of BusinessServices for rollback operations.
-          backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,true);
-                    
-          try
-          {
-            Vector beVector = new Vector();
-            beVector.add(sp);
-            sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-            for (int i=0;i<services.size();i++)
-            {
-              ListElement serviceElement = (ListElement)services.elementAt(i);
-              BusinessService bs = (BusinessService)serviceElement.getObject();
-              String bsName = bs.getDefaultNameString();
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCED",bsName));
-              services.removeElementAt(i);
-              i--;
-            }
-          }
-          catch (TransportException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
-            handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-            operationResult = false;
-          }
-          catch (UDDIException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,services,uddiPerspective,messageQueue,"MSG_ERROR_SERVICE_NOT_REFERENCED");
-            messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-            messageQueue.addMessage("UDDIException");
-            messageQueue.addMessage(e.toString());
-            operationResult = false;
-          }
-          formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SERVICES,services);
-          break;
-        case UDDIActionInputs.MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE:
-          String[] referencedServicesCheckboxes = (String[])propertyTable_.get(UDDIActionInputs.REFERENCED_SERVICE_SELECT_STATE);
-          Vector selectedReferencedServiceVector = new Vector();
-          for (int i=0;i<referencedServicesCheckboxes.length;i++)
-          {
-            boolean isChecked = Boolean.valueOf(referencedServicesCheckboxes[i]).booleanValue();
-            if (isChecked)
-            {
-              ListElement referencedServiceListElement = (ListElement)referencedServices.elementAt(i);
-              BusinessService bs = (BusinessService)referencedServiceListElement.getObject();
-              servicesHash.put(bs.getServiceKey(),bs);
-              selectedReferencedServiceVector.addElement(bs);
-            }
-          }          
-          
-          // Save the current list of business services for rollback operations.
-          backupAndUpdateBusinessServices(backupBusServiceVector,sp,servicesHash,false);
-          
-          try
-          {
-            Vector beVector = new Vector();
-            beVector.add(sp);
-            sp = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-            for (int i=0;i<selectedReferencedServiceVector.size();i++)
-            {
-              BusinessService bs = (BusinessService)selectedReferencedServiceVector.elementAt(i);
-              String bsName = bs.getDefaultNameString();
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_REFERENCE_REMOVED",bsName));
-            }
-          }
-          catch (TransportException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
-            handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-            operationResult = false;
-          }
-          catch (UDDIException e)
-          {
-            // Roll back and restore the old list of services.
-            rollbackBusinessServices(sp,backupBusServiceVector,selectedReferencedServiceVector,uddiPerspective,messageQueue,"MSG_ERROR_REFERENCE_NOT_REMOVED");
-            messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-            messageQueue.addMessage("UDDIException");
-            messageQueue.addMessage(e.toString());
-            operationResult = false;
-          }
-      }
-      // Ensure that the referenced services are refreshed when the form reloads.
-      formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_REFERENCED_SERVICES);
-      busElement.setBusinessEntity(sp);
-      return operationResult;
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-      operationResult = false;
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-      operationResult = false;
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-      operationResult = false;
-    }
-    return operationResult;
-  }
-
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-  
-  // Backup the business services and remove those in serviceHash from the current list. Return the updated list of business services
-  private final void backupAndUpdateBusinessServices(Vector backupBusServiceVector,BusinessEntity be,Hashtable servicesHash,boolean isAdd)
-  {
-    // Save the current list of business services for rollback operations.
-    BusinessServices currentBusServices = be.getBusinessServices();
-    if (currentBusServices == null)
-      currentBusServices = new BusinessServices();
-    Vector currentBusServiceVector = currentBusServices.getBusinessServiceVector();
-    for (int i=0;i<currentBusServiceVector.size();i++)
-    {
-      BusinessService currentBusService = (BusinessService)currentBusServiceVector.elementAt(i);
-      backupBusServiceVector.addElement(currentBusService);
-      // If the current business service is a member of the list to be removed/added, remove it now.
-      if (servicesHash.get(currentBusService.getServiceKey()) != null)
-      {
-        currentBusServiceVector.removeElementAt(i);
-        i--;
-      }
-    }
-    
-    if (isAdd)
-    {
-      Enumeration e = servicesHash.elements();
-      while (e.hasMoreElements())
-        currentBusServiceVector.addElement((BusinessService)e.nextElement());
-    }
-    be.setBusinessServices(currentBusServices);
-  }
-  
-  private final void rollbackBusinessServices(BusinessEntity be,Vector backupBusServiceVector,Vector operatedServices,Perspective perspective,MessageQueue messageQueue,String errorMessageKey)
-  {
-    // Roll back and restore the old list of services.
-    be.getBusinessServices().setBusinessServiceVector(backupBusServiceVector);
-    for (int i=0;i<operatedServices.size();i++)
-    {
-      ListElement serviceListElement = (ListElement)operatedServices.elementAt(i);
-      BusinessService bs = (BusinessService)serviceListElement.getObject();
-      String bsName = bs.getDefaultNameString();
-      messageQueue.addMessage(perspective.getMessage(errorMessageKey,bsName));
-    }    
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
deleted file mode 100644
index 55573c624..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenCategoryBrowserAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import javax.servlet.http.*;
-
-public class OpenCategoryBrowserAction extends Action
-{
-  public OpenCategoryBrowserAction()
-  {
-  }
-
-  private static final void addSessionAndTModelKey(StringBuffer result,String sessionId,String categoryTModelKey)
-  {
-    result.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
-  }
-  
-  // uddi/category_browser.jsp?sessionId=...&categoryTModelKey=...
-  public static final String getActionLink(String sessionId,String categoryTModelKey)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/category_browser.jsp?");
-    addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
-    return actionLink.toString();
-  }
-  
-  public static final String getCategoryContentPage(String sessionId,String categoryTModelKey)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/category_content.jsp?");
-    addSessionAndTModelKey(actionLink,sessionId,categoryTModelKey);
-    return actionLink.toString();
-  }
-  
-  public static final String getWildCardActionLink(String sessionId)
-  {
-    return getActionLink(sessionId,"%");
-  }
-  
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
deleted file mode 100644
index e07820f97..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/OpenRegistryAction.java
+++ /dev/null
@@ -1,232 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.*;
-import org.uddi4j.transport.*;
-import org.uddi4j.response.*;
-import org.uddi4j.util.*;
-import org.uddi4j.*;
-
-import java.util.*;
-import java.net.*;
-
-public class OpenRegistryAction extends UDDIPropertiesFormAction
-{
-  public OpenRegistryAction(Controller controller)
-  {
-    super(controller);
-    // Select UDDI Main.
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String registryName = parser.getParameter(UDDIActionInputs.REGISTRY_NAME);
-    String inquiryURL = parser.getParameter(UDDIActionInputs.INQUIRY_URL);
-    String publishURL = parser.getParameter(UDDIActionInputs.PUBLISH_URL);
-    String username = parser.getParameter(UDDIActionInputs.UDDI_USERNAME);
-    String password = parser.getParameter(UDDIActionInputs.UDDI_PASSWORD);
-    String checkUserDefinedCategoriesChecked = parser.getParameter(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-    String categoriesDirectory = parser.getParameter(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-    if (registryName != null)
-      propertyTable_.put(UDDIActionInputs.REGISTRY_NAME,registryName);
-
-    if (!Validator.validateString(registryName))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.REGISTRY_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_REGISTRY_NAME"));
-    }
-
-    if (inquiryURL != null)
-      propertyTable_.put(UDDIActionInputs.INQUIRY_URL,inquiryURL);
-    if (!Validator.validateURL(inquiryURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.INQUIRY_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_INQUIRY_URL"));
-    }
-
-    if (publishURL != null)
-      propertyTable_.put(UDDIActionInputs.PUBLISH_URL, publishURL);
-    
-    if (username != null)
-      propertyTable_.put(UDDIActionInputs.UDDI_USERNAME, username);
-
-    if (password != null)
-      propertyTable_.put(UDDIActionInputs.UDDI_PASSWORD, password);
-
-    if (checkUserDefinedCategoriesChecked != null)
-      propertyTable_.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,checkUserDefinedCategoriesChecked);
-    else
-      removeProperty(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-      
-    if (categoriesDirectory != null)
-      propertyTable_.put(UDDIActionInputs.CATEGORIES_DIRECTORY,categoriesDirectory);
-    else
-      removeProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
-    formTool.updatePropertyTable(propertyTable_);
-    return inputsValid;
-  }
-
-  public final void gatherWSUserDefinedCategories(UDDIProxy proxy,Hashtable categoryModels)
-  {
-    try
-    {
-      CategoryBag categoryBag = new CategoryBag();
-      categoryBag.add(new KeyedReference("","categorization",TModel.TYPES_TMODEL_KEY));
-      TModelList tModelList = proxy.find_tModel("%",categoryBag,null,null,100);
-      TModelInfos tModelInfos = tModelList.getTModelInfos();
-      Vector tModelKeyVector = new Vector();
-      for (int i=0;i<tModelInfos.size();i++)
-      {
-        TModelInfo tModelInfo = tModelInfos.get(i);
-        tModelKeyVector.addElement(tModelInfo.getTModelKey());
-      }
-      TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
-      Vector tModelVector = tModelDetail.getTModelVector();
-      for (int i=0;i<tModelVector.size();i++)
-      {
-        TModel tModel = (TModel)tModelVector.elementAt(i);
-        boolean checked = false;
-        String displayName = null;
-        String categoryKey = null;
-        categoryBag = tModel.getCategoryBag();
-        for (int j=0;j<categoryBag.size();j++)
-        {
-          KeyedReference kr = categoryBag.get(j);
-          String krTModelKey = kr.getTModelKey();
-          if (krTModelKey.equalsIgnoreCase(TModel.GENERAL_KEYWORDS_TMODEL_KEY))
-          {
-            String krKeyName = kr.getKeyName();
-            if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:key"))
-              categoryKey = kr.getKeyValue();
-            else if (krKeyName.equals("urn:x-ibm:uddi:customTaxonomy:displayName"))
-              displayName = kr.getKeyValue();
-          }
-          else if (krTModelKey.equalsIgnoreCase(TModel.TYPES_TMODEL_KEY))
-            checked = kr.getKeyValue().equals("checked");            
-        }
-        if (categoryKey != null)
-        {
-          if (displayName == null)
-            displayName = tModel.getNameString();
-          CategoryModel categoryModel = new CategoryModel();
-          categoryModel.setCategoryKey(categoryKey);
-          categoryModel.enableChecked(checked);
-          categoryModel.setDisplayName(displayName);
-          String tModelKey = tModel.getTModelKey();
-          categoryModel.setTModelKey(tModelKey);
-          categoryModels.put(tModelKey,categoryModel);
-        }
-      }
-    }
-    catch (UDDIException e)
-    {
-    }
-    catch (TransportException e)
-    {
-    }
-  }
-  
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String registryName = (String)propertyTable_.get(UDDIActionInputs.REGISTRY_NAME);
-      String inquiryURL = (String)propertyTable_.get(UDDIActionInputs.INQUIRY_URL);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.PUBLISH_URL);
-      String registrationURL = (String)propertyTable_.get(UDDIActionInputs.REGISTRATION_URL);
-      String username = (String)propertyTable_.get(UDDIActionInputs.UDDI_USERNAME);
-      String password = (String)propertyTable_.get(UDDIActionInputs.UDDI_PASSWORD);
-      boolean checkForUserDefinedCategoriesChecked = (propertyTable_.get(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES) != null);
-      String categoriesDirectory = (String)propertyTable_.get(UDDIActionInputs.CATEGORIES_DIRECTORY);
-
-      String recognizedPublishURL = uddiPerspective.getKnownRegistryPublishURL(inquiryURL);
-      String recognizedRegistrationURL = uddiPerspective.getKnownRegistryRegistrationURL(inquiryURL);
-      
-      if (publishURL == null)
-        publishURL = recognizedPublishURL;
-      if (registrationURL == null)
-        registrationURL = recognizedRegistrationURL;
-        
-      UDDIMainNode uddiMainNode = (UDDIMainNode)(controller_.getUDDIPerspective().getNavigatorManager().getRootNode());
-      UDDIMainElement uddiMainElement = (UDDIMainElement)uddiMainNode.getTreeElement();
-      Properties props = new Properties();
-      props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
-      UDDIProxy proxy = new UDDIProxy(props);
-      proxy.setInquiryURL(new URL(inquiryURL));
-      RegistryElement registryElement = new RegistryElement(proxy,inquiryURL,registryName,uddiMainElement.getModel());
-      // Set registry element's publish URL and registration URL provided by external callers (e.g. favorites).
-      if (publishURL != null)
-        registryElement.setCachedPublishURL(publishURL);
-      if (registrationURL != null)
-        registryElement.setRegistrationURL(registrationURL);
-      if (username != null)
-      	registryElement.setUserId(username);
-      if (password != null)
-      	registryElement.setCred(password);
-      registryElement.setCheckForUserDefinedCategories(checkForUserDefinedCategoriesChecked);
-      if (checkForUserDefinedCategoriesChecked)
-      {
-        Hashtable categoryModels = new Hashtable();
-        gatherWSUserDefinedCategories(proxy,categoryModels);
-        if (categoryModels.size() > 0)
-          registryElement.setUserDefinedCategories(categoryModels);
-        else
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NO_USER_DEFINED_CATEGORIES_FOUND"));
-      }
-      registryElement.setCategoriesDirectory(categoriesDirectory);
-      uddiMainElement.connect(registryElement,UDDIModelConstants.REL_REGISTRIES,ModelConstants.REL_OWNER);
-      NodeManager nodeManager = uddiMainNode.getNodeManager();
-      int newRegistryNodeId = uddiMainNode.getChildNode(registryElement).getNodeId();
-      // Select the new registry node and add the select action to the history.
-      nodeManager.setSelectedNodeId(newRegistryNodeId);
-      Node registryNode = nodeManager.getSelectedNode();
-      ToolManager toolManager = registryNode.getCurrentToolManager();
-      addToHistory(ActionInputs.PERSPECTIVE_UDDI,toolManager.getSelectedTool().getSelectToolActionHref(true));
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_OPENED",new String[]{registryName,inquiryURL}));
-      return true;
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-      FormTool formTool = getSelectedFormTool();
-      formTool.flagError(UDDIActionInputs.INQUIRY_URL);
-    }
-    /*
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    */
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
deleted file mode 100644
index 01a22061e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/PublishAction.java
+++ /dev/null
@@ -1,223 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import java.util.*;
-
-public abstract class PublishAction extends UDDIPropertiesFormAction
-{
-  protected String subQueryKey_;
-  protected boolean subQueryInitiated_;
-  protected String newSubQuery_;
-  protected boolean isSubQueryGet_;
-  protected String newSubQueryItem_;
-  protected RegistryNode regNode_;
-
-  public PublishAction(Controller controller)
-  {
-    super(controller);
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-    regNode_ = getRegistryNode();
-  }
-
-  protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    // Setup for MultipartFormDataParserTransformer
-    propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
- 
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    if (!processOthers(parser,formToolPI) && !subQueryInitiated_)
-      inputsValid = false;
-
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-
-    boolean validateAuthentication = !regElement.isLoggedIn();
-
-    if (publishURL != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    }
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(publishURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-    }
-
-    if (userId != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    }
-
-    if (!subQueryInitiated_ && validateAuthentication && !Validator.validateString(userId))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-    }
-
-    if (password != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    }
-
-    return inputsValid;
-  }
-
-  protected final void addPublishedItemNode(BusinessEntity be,RegistryElement regElement)
-  {
-    BusinessElement beElement = new BusinessElement(be,regElement.getModel());
-    PublishedItemsElement publishedBusinessesElement = regElement.getPublishedBusinessesElement();
-    Enumeration e = publishedBusinessesElement.getItems();
-    while (e.hasMoreElements())
-    {
-      BusinessElement element = (BusinessElement)e.nextElement();
-      BusinessEntity elementBE = element.getBusinessEntity();
-      if (elementBE.getBusinessKey().equals(be.getBusinessKey()))
-      {
-        element.disconnectAll();
-        break;
-      }
-    }
-    connectElements(publishedBusinessesElement,beElement);
-  }
-
-  protected final void addPublishedItemNode(BusinessService bs,RegistryElement regElement)
-  {
-    ServiceElement sElement = new ServiceElement(bs,regElement.getModel());
-    PublishedItemsElement publishedServicesElement = regElement.getPublishedServicesElement();
-    Enumeration e = publishedServicesElement.getItems();
-    while (e.hasMoreElements())
-    {
-      ServiceElement element = (ServiceElement)e.nextElement();
-      BusinessService elementBS = element.getBusinessService();
-      if (elementBS.getServiceKey().equals(bs.getServiceKey()))
-      {
-        element.disconnectAll();
-        break;
-      }
-    }
-    connectElements(publishedServicesElement,sElement);
-  }
-
-  protected final void addPublishedItemNode(TModel tModel,RegistryElement regElement)
-  {
-    ServiceInterfaceElement siElement = new ServiceInterfaceElement(tModel,regElement.getModel());
-    PublishedItemsElement publishedServiceInterfacesElement = regElement.getPublishedServiceInterfacesElement();
-    Enumeration e = publishedServiceInterfacesElement.getItems();
-    while (e.hasMoreElements())
-    {
-      ServiceInterfaceElement element = (ServiceInterfaceElement)e.nextElement();
-      TModel elementTModel = element.getTModel();
-      if (tModel.getTModelKey().equals(elementTModel.getTModelKey()))
-      {
-        element.disconnectAll();
-        break;
-      }
-    }
-    connectElements(publishedServiceInterfacesElement,siElement);
-  }
-
-  private final void connectElements(PublishedItemsElement publishedItemsElement,TreeElement itemElement)
-  {
-    publishedItemsElement.connect(itemElement,UDDIModelConstants.REL_PUBLISHED_ITEMS,ModelConstants.REL_OWNER);
-    int newNodeId = regNode_.getChildNode(publishedItemsElement).getChildNode(itemElement).getNodeId();
-    NodeManager nodeManager = regNode_.getNodeManager();
-    nodeManager.setSelectedNodeId(newNodeId);
-    Node newNode = nodeManager.getSelectedNode();
-    ToolManager toolManager = newNode.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
-    return transformers;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
deleted file mode 100644
index 489bc0102..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodeAction.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import java.util.*;
-
-public class RefreshUDDINodeAction extends UDDINodeAction
-{
-  private Vector staleNodes_;
-  public RefreshUDDINodeAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(ActionInputs.NODEID,String.valueOf(controller.getUDDIPerspective().getNavigatorManager().getSelectedNodeId()));
-    staleNodes_ = new Vector();
-  }
-
-  // uddi/actions/RefreshUDDINodeActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/RefreshUDDINodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean verifyNodeData()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    if (node instanceof BusinessNode)
-      return refreshBusinessElement((BusinessNode)node);
-    else if (node instanceof ServiceNode)
-      return refreshServiceElement((ServiceNode)node);
-    else if (node instanceof ServiceInterfaceNode)
-      return refreshServiceInterfaceElement((ServiceInterfaceNode)node);
-    else if (node instanceof QueryNode)
-    {
-      // Nothing to verify
-      return true;
-    }
-    else if (node != null)
-    {
-      // RegistryNode
-      if (node instanceof RegistryNode)
-        refreshRegistryElement((RegistryNode)node);
-        
-      // FolderNodes
-      Vector childNodes = node.getChildNodes();
-      Vector refreshActions = new Vector();
-      for (int i=0;i<childNodes.size();i++)
-      {
-        Node childNode = (Node)childNodes.elementAt(i);
-        RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
-        action.setStaleNodes(staleNodes_);
-        Hashtable propertyTable = action.getPropertyTable();
-        String childNodeIdString = String.valueOf(childNode.getNodeId());
-        propertyTable.put(ActionInputs.NODEID,childNodeIdString);
-        if (!action.verifyNodeData())
-          staleNodes_.addElement(childNode);
-        else
-          refreshActions.addElement(action);
-      }
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,refreshActions);
-      return true;
-    }
-    return true;
-  }
-  
-  private final void refreshRegistryElement(RegistryNode regNode)
-  {
-    RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-    Hashtable userDefinedCategories = null;
-    if (regElement.getCheckForUserDefinedCategories())
-    {
-      userDefinedCategories = new Hashtable();
-      OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-      openRegAction.gatherWSUserDefinedCategories(regElement.getProxy(),userDefinedCategories);
-      if (!userDefinedCategories.keys().hasMoreElements())
-      {
-        userDefinedCategories = null;
-        regNode.setImagePath(RegistryNode.IMAGE_PATH_STANDARD);
-      }
-      else
-      {
-        String categoriesDirectory = regElement.getCategoriesDirectory();
-        AddRegistryToUDDIPerspectiveAction addAction = new AddRegistryToUDDIPerspectiveAction(controller_);
-        if (categoriesDirectory != null)
-          addAction.linkCategoryModelsWithSavedData(userDefinedCategories.elements(),categoriesDirectory);
-        else
-          addAction.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories.elements());
-        regNode.setImagePath(RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES);
-      }
-    }
-    regElement.setUserDefinedCategories(userDefinedCategories);
-  }
-
-  private final boolean refreshBusinessElement(BusinessNode busNode)
-  {
-    BusinessElement busElement = (BusinessElement)busNode.getTreeElement();
-    String uuidKey = busElement.getBusinessEntity().getBusinessKey();
-    RegFindBusinessUUIDAction verifyAction = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-    propertyTable.put(UDDIActionInputs.REFRESH_NODE,busNode);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    boolean verifyResult = verifyAction.run();
-    if (verifyResult)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new BusinessElement((BusinessEntity)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),busElement.getModel()));
-    return verifyResult;
-  }
-
-  private final boolean refreshServiceElement(ServiceNode serviceNode)
-  {
-    ServiceElement serviceElement = (ServiceElement)serviceNode.getTreeElement();
-    String uuidKey = serviceElement.getBusinessService().getServiceKey();
-    RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
-    propertyTable.put(UDDIActionInputs.REFRESH_NODE,serviceNode);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    boolean verifyResult = verifyAction.run();
-    if (verifyResult)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceElement((BusinessService)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),serviceElement.getModel()));
-    return verifyResult;
-  }
-
-  private final boolean refreshServiceInterfaceElement(ServiceInterfaceNode siNode)
-  {
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode.getTreeElement();
-    String uuidKey = siElement.getTModel().getTModelKey();
-    RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-    propertyTable.put(UDDIActionInputs.REFRESH_NODE,siNode);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    boolean verifyResult = verifyAction.run();
-    if (verifyResult)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,new ServiceInterfaceElement((TModel)propertyTable.get(UDDIActionInputs.LATEST_OBJECT),siElement.getModel()));
-    return verifyResult;
-  }
-
-  public final void connectElements(Node parentNode,TreeElement newElement)
-  {
-    TreeElement parentElement = parentNode.getTreeElement();
-    String rel = null;
-    if (parentNode instanceof PublishedItemsNode)
-      rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
-    else if (parentNode instanceof QueryNode)
-      rel = UDDIModelConstants.REL_QUERY_RESULTS;
-    else if (parentNode instanceof QueryParentNode)
-      rel = UDDIModelConstants.REL_QUERIES;
-    parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
-    Node newNode = parentNode.getChildNode(newElement);
-    int newNodeId = newNode.getNodeId();
-    nodeManager_.setSelectedNodeId(newNodeId);
-    ToolManager toolManager = newNode.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    if (!isStaleNode(nodeId))
-    {
-      Node node = nodeManager_.getNode(nodeId);
-      Object latestObject = propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-      if (latestObject != null)
-      {
-        if (latestObject instanceof Vector)
-        {
-          Vector refreshActions = (Vector)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-          for (int i=0;i<refreshActions.size();i++)
-          {
-            RefreshUDDINodeAction refreshAction = (RefreshUDDINodeAction)refreshActions.elementAt(i);
-            refreshAction.run();
-          }
-          nodeManager_.setSelectedNodeId(nodeId);        
-        }
-        else
-        {
-          TreeElement oldElement = node.getTreeElement();
-          oldElement.disconnectAll();
-          connectElements(node.getParent(),(TreeElement)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT));
-        }
-      }
-      else
-      {
-        // QueryNodes
-        QueryNode queryNode = (QueryNode)node;
-        FindAction findAction = queryNode.getFindAction();
-        findAction.setRefreshAction(true);
-        if (!findAction.run())
-          queryNode.removeChildNodes(true);
-        findAction.setRefreshAction(false);
-      }
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_NODE_REFRESHED",node.getNodeName()));
-      return true;
-    }
-    return false;
-  }
-  
-  public final Vector getStaleNodes()
-  {
-    return staleNodes_;
-  }
-  
-  public final void setStaleNodes(Vector staleNodes)
-  {
-    staleNodes_ = staleNodes;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
deleted file mode 100644
index 4b3d246e9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RefreshUDDINodesAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-public class RefreshUDDINodesAction extends UDDIPropertiesFormAction
-{
-  private Vector staleNodes_;
-
-  public RefreshUDDINodesAction(Controller controller)
-  {
-    super(controller);
-    staleNodes_ = new Vector();
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    return true;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    int collectorNodeId = getSelectedNavigatorNode().getNodeId();
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    RefreshUDDINodeAction action = new RefreshUDDINodeAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    for (int i=0;i<selectedNodeIds.length;i++)
-    {
-      propertyTable.put(ActionInputs.NODEID,selectedNodeIds[i]);
-      if (action.verifyNodeData())
-        action.run();
-      else
-      {
-        int nodeId = Integer.parseInt(selectedNodeIds[i]);
-        staleNodes_.addElement(navigatorManager.getNode(nodeId));
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NODE_DATA_VALIDATION_FAILED",navigatorManager.getNode(nodeId).getNodeName()));
-      }
-    }
-    navigatorManager.setSelectedNodeId(collectorNodeId);
-    return true;
-  }
-
-  public final Vector getStaleNodes()
-  {
-    return staleNodes_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
deleted file mode 100644
index 34223f5dd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessUUIDAction.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-import java.util.*;
-
-public class RegFindBusinessUUIDAction extends FindAction
-{
-  public RegFindBusinessUUIDAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-      
-    if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      
-      // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
-      if (regNode_ == null)
-        regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      BusinessEntity[] beList = new BusinessEntity[1];
-      Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
-      if (beVector.size() > 0)
-      {
-        beVector.toArray(beList);
-        if (shouldAddQueryNode)
-        {
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
-        }
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,beList[0]);
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
deleted file mode 100644
index 300a7946f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesAdvancedAction.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormInputException;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.*;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-import org.uddi4j.util.*;
-
-import java.util.*;
-import java.net.MalformedURLException;
-
-public class RegFindBusinessesAdvancedAction extends FindAction
-{
-  public RegFindBusinessesAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
-    String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-    String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
-    String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
-    String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    getSelectedNavigatorNode();
-    getRegistryNode();
-    regNode_.getTreeElement();
-
-    if (ownedChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED,ownedChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED);
-
-    if (languages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      for (int i=0;i<names.length;i++)
-      {
-        Name uddi4jName;
-        if (languages[i].length() > 0)
-          uddi4jName = new Name(names[i],languages[i]);
-        else
-          uddi4jName = new Name(names[i]);
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-
-    if (siNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector busServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
-      if (busServiceInterfaces == null)
-        busServiceInterfaces = new Vector();
-      else
-        busServiceInterfaces.removeAllElements();
-      Vector busServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY);
-      Vector tModelKeyStringVector = new Vector();
-      Hashtable resultHash = new Hashtable();
-      for (int i=0;i<siNodeIds.length;i++)
-        resultHash.put(siNodeIds[i],Boolean.TRUE);
-      for (int i=0;i<busServiceInterfacesCopy.size();i++)
-      {
-        ListElement listElement = (ListElement)busServiceInterfacesCopy.elementAt(i);
-        if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
-        {
-          busServiceInterfaces.addElement(listElement);
-          TModel tModel = (TModel)listElement.getObject();
-          tModelKeyStringVector.addElement(tModel.getTModelKey());
-        }
-      }
-      TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,busServiceInterfaces);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
-    }
-
-    if (discoveryURLValues != null)
-    {
-      DiscoveryURLs discoveryURLs = new DiscoveryURLs();
-      Vector discoveryURLVector = new Vector();
-      for (int i=0;i<discoveryURLValues.length;i++)
-      {
-        DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLValues[i],"");
-        discoveryURLVector.addElement(discoveryURL);
-      }
-      discoveryURLs.setDiscoveryURLVector(discoveryURLVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
-    if (findQualifierValues != null)
-    {
-      FindQualifiers findQualifiers = new FindQualifiers();
-      Vector findQualifierVector = new Vector();
-      for (int i=0;i<findQualifierValues.length;i++)
-      {
-        FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
-        findQualifierVector.addElement(findQualifier);
-      }
-      findQualifiers.setFindQualifierVector(findQualifierVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS,findQualifiers);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-
-    if (maxSearchSet != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
-      inputsValid = false;
-    }
-
-    if (maxResults != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  private DiscoveryURLs dupDiscoveryURLs(DiscoveryURLs discoveryURLs, String useType, String dupUseType) {
-    if (discoveryURLs == null)
-      return discoveryURLs;
-    Vector discoveryURLVector = discoveryURLs.getDiscoveryURLVector();
-    if (discoveryURLVector == null)
-      return discoveryURLs;
-    Vector newDiscoveryURLVector = new Vector(discoveryURLVector);
-    Enumeration e = discoveryURLVector.elements();
-    while (e.hasMoreElements()) {
-      DiscoveryURL discoveryURL = (DiscoveryURL)e.nextElement();
-      if (discoveryURL.getUseType().equals(useType)) {
-        newDiscoveryURLVector.add(new DiscoveryURL(discoveryURL.getText(), dupUseType));
-      }
-    }
-    DiscoveryURLs newDiscoveryURLs = new DiscoveryURLs();
-    newDiscoveryURLs.setDiscoveryURLVector(newDiscoveryURLVector);
-    return newDiscoveryURLs;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG);
-      boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_OWNED) != null);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET));
-      int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS));
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (owned && !regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-
-      UDDIProxy proxy = regElement.getProxy();
-
-      BusinessInfos busInfos = null;
-      if (owned)
-        busInfos = proxy.get_registeredInfo(regElement.getAuthInfoString()).getBusinessInfos();
-      else
-        busInfos = proxy.find_business(nameVector, dupDiscoveryURLs(discoveryURLs,"",UDDIActionInputs.DISCOVERY_URL_TYPE), identifierBag, categoryBag, tModelBag, findQualifiers, maxSearchSet).getBusinessInfos();
-      
-      int finalNumberOfBusinessEntities = Math.min(maxResults, busInfos.size());
-      Vector businessKeys = new Vector();
-      for (int i = 0; i < finalNumberOfBusinessEntities; i++)
-      {
-        BusinessInfo busInfo = (BusinessInfo)busInfos.get(i);
-        businessKeys.addElement(busInfo.getBusinessKey());
-      }
-
-      if (finalNumberOfBusinessEntities > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
-          BusinessEntity[] beList = new BusinessEntity[beVector.size()];
-          beVector.toArray(beList);
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
deleted file mode 100644
index b30e24530..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindBusinessesSimpleAction.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.*;
-import org.uddi4j.response.BusinessInfo;
-import org.uddi4j.response.BusinessInfos;
-
-import java.util.*;
-
-public class RegFindBusinessesSimpleAction extends FindAction
-{
-  public RegFindBusinessesSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
-    else
-    {
-      // This shouldn't occur.
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-      Vector nameVector = new Vector();
-      nameVector.addElement(new Name(name));
-
-      // The action can be run under the context of either a registry or a query node.
-      getSelectedNavigatorNode();
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      
-      BusinessInfos busInfos = proxy.find_business(nameVector, null, null, null, null, null, UDDIActionInputs.QUERY_MAX_SEARCH_SET).getBusinessInfos();
-      int finalNumberOfBusinessEntities = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS, busInfos.size());
-      Vector businessKeys = new Vector();
-      for (int i = 0; i < finalNumberOfBusinessEntities; i++)
-      {
-        BusinessInfo busInfo = busInfos.get(i);
-        businessKeys.addElement(busInfo.getBusinessKey());
-      }
-
-      if (finalNumberOfBusinessEntities > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          Vector beVector = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
-          BusinessEntity[] beList = new BusinessEntity[beVector.size()];
-          beVector.toArray(beList);
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(beList,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESSES_FOUND",String.valueOf(beList.length)));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_BUSINESSES_FOUND"));
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
deleted file mode 100644
index ead534a14..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfaceUUIDAction.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.UDDIException;
-
-import java.util.*;
-
-public class RegFindServiceInterfaceUUIDAction extends FindAction
-{
-  public RegFindServiceInterfaceUUIDAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-
-    if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-
-      // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
-      if (regNode_ == null)
-        regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
-      Vector tModelVector = tModelDetail.getTModelVector();
-      if (tModelVector.size() > 0)
-      {
-        TModel tModel = (TModel)tModelVector.elementAt(0);
-        if (shouldAddQueryNode)
-        {
-          TModel[] tModelArray = new TModel[1];
-          tModelArray[0] = tModel;
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
-        }
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModel);
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
deleted file mode 100644
index 2b5c302f7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesAdvancedAction.java
+++ /dev/null
@@ -1,362 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.*;
-import org.uddi4j.datatype.service.*;
-import org.uddi4j.datatype.tmodel.*;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.*;
-import org.uddi4j.UDDIException;
-
-import java.util.*;
-import java.net.*;
-
-public class RegFindServiceInterfacesAdvancedAction extends FindAction
-{
-  public RegFindServiceInterfacesAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String useServiceChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
-    String[] serviceNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE);
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
-    String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
-    String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    regNode_.getTreeElement();
-
-    if (useServiceChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,useServiceChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE);
-    
-    if (serviceNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector siService = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-      if (siService == null)
-        siService = new Vector();
-      else
-        siService.removeAllElements();
-      Vector siServiceCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY);
-      // The browser will enforce the rule of having only one service in this list.
-      ListElement listElement = (ListElement)siServiceCopy.elementAt(0);
-      siService.addElement(listElement);
-      BusinessService bs = (BusinessService)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,siService);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
-      if (!subQueryInitiated_ && useServiceChecked != null)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_SERVICE"));
-      }
-    }
-    
-    if (ownedChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED,ownedChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED);
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
-    if (findQualifierValues != null)
-    {
-      FindQualifiers findQualifiers = new FindQualifiers();
-      Vector findQualifierVector = new Vector();
-      for (int i=0;i<findQualifierValues.length;i++)
-      {
-        FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
-        findQualifierVector.addElement(findQualifier);
-      }
-      findQualifiers.setFindQualifierVector(findQualifierVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS,findQualifiers);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-
-    if (maxSearchSet != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
-      inputsValid = false;
-    }
-
-    if (maxResults != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-  
-  public final boolean overrideAuthenticationValidation()
-  {
-    return (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      boolean useService = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE) != null);
-      BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-      boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED) != null);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET));
-      int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS));
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      Vector tModelKeyVector = new Vector();
-      
-      if (owned)
-      {
-        if (!regElement.isLoggedIn())
-          regElement.performLogin(publishURL,userId,password);
-        tModelKeyVector = findAllOwnedTModels(proxy, regElement.getAuthInfoString(), maxResults);
-      }
-      if (useService)
-      {
-        BindingTemplates bindingTemplates = bs.getBindingTemplates();
-        boolean endSearch = false;
-        if (bindingTemplates != null)
-        {
-          for (int i=0;i<bindingTemplates.size();i++)
-          {
-            BindingTemplate bt = bindingTemplates.get(i);
-            TModelInstanceDetails tModelInstanceDetails = bt.getTModelInstanceDetails();
-            for (int j=0;j<tModelInstanceDetails.size();j++)
-            {
-              TModelInstanceInfo tModelInstanceInfo = tModelInstanceDetails.get(j);
-              if (tModelKeyVector.size() < maxResults)
-                tModelKeyVector.addElement(tModelInstanceInfo.getTModelKey());
-              else
-              {
-                endSearch = true;
-                break;
-              }
-            }
-            if (endSearch)
-              break;
-          }
-        }
-      }
-      else
-      {  
-        TModelList tModelList = proxy.find_tModel(name,categoryBag,identifierBag,findQualifiers,maxSearchSet);
-        TModelInfos tModelInfos = tModelList.getTModelInfos();
-        for (int i=0;i<tModelInfos.size();i++)
-        {
-          TModelInfo tModelInfo = tModelInfos.get(i);
-          if (tModelKeyVector.size() < maxResults)
-            tModelKeyVector.addElement(tModelInfo.getTModelKey());
-          else
-            break;
-        }
-      }
-      
-      int finalNumberOfTModelKeys = tModelKeyVector.size();
-      if (finalNumberOfTModelKeys > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          Vector finalTModelVector = new Vector();
-          int currentIndex = 0;
-          int windowSize = finalNumberOfTModelKeys;
-          while (currentIndex < tModelKeyVector.size())
-          {
-            int subListToIndex = Math.min(currentIndex+windowSize,tModelKeyVector.size());
-            try
-            {
-              TModelDetail tModelDetail = proxy.get_tModelDetail(new Vector(tModelKeyVector.subList(currentIndex,subListToIndex)));
-              Vector tModelVector = tModelDetail.getTModelVector();
-              for (int i=0;i<tModelVector.size();i++)
-                finalTModelVector.addElement(tModelVector.elementAt(i));
-              if (tModelDetail.getTruncatedBoolean())
-                windowSize = tModelVector.size();
-              currentIndex += windowSize;
-            }
-            catch (UDDIException e)
-            {
-              DispositionReport dr = e.getDispositionReport();
-              if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
-              {
-                String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
-                for (int i=currentIndex;i<subListToIndex;i++)
-                {
-                  String tModelKey = (String)tModelKeyVector.elementAt(i);
-                  if (errInfoText.indexOf(tModelKey) != -1 || errInfoText.indexOf(tModelKey.toUpperCase()) != -1 || errInfoText.indexOf(tModelKey.toLowerCase()) != -1)
-                  {
-                    tModelKeyVector.removeElementAt(i);
-                    break;
-                  }
-                }
-              }
-              else
-                throw e;
-            }
-            catch (TransportException e)
-            {
-              throw e;
-            }
-          }
-          
-          int finalNumberOfTModels = finalTModelVector.size();
-          if (finalNumberOfTModels > 0)
-          {
-            TModel[] tModelArray = new TModel[finalNumberOfTModels];
-            finalTModelVector.toArray(tModelArray);
-            String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-            queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
-            addQueryNode();
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));
-          }
-          else
-            throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-  
-  // Copied directly from UDDIWSDLProxy's findAllServiceInterfaces() method with minor modifications. The hardcoded strings should NOT be translated.
-  private final Vector findAllOwnedTModels(UDDIProxy proxy, String authInfoString, int maxResults) throws UDDIException, TransportException
-  {
-    RegisteredInfo registeredInfo = null;
-
-    // Get the complete list of owned (registered) info.
-    // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
-    // BusinessInfos also contain ServiceInfos.)
-    registeredInfo = proxy.get_registeredInfo(authInfoString);
-
-    //Create a Vector to add the TModelKeys from the registeredInfo.
-    Vector tModelKeyList = new Vector();
-
-    //Get the TModelInfos from the registeredInfo.
-    TModelInfos tModelInfos = registeredInfo.getTModelInfos();
-
-    //Get all the TModelKeys from within the TModelInfos
-    for (int i = 0; i < tModelInfos.size(); i++)
-    {
-      TModelInfo tModelInfo = tModelInfos.get(i);
-      if (tModelKeyList.size() < maxResults)
-        tModelKeyList.addElement(tModelInfo.getTModelKey());
-      else
-        break;
-    }    
-    return tModelKeyList;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
deleted file mode 100644
index a6567a9eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceInterfacesSimpleAction.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.UDDIException;
-
-import java.util.*;
-
-public class RegFindServiceInterfacesSimpleAction extends FindAction
-{
-  public RegFindServiceInterfacesSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-    else
-    {
-      // This should never occur.
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      TModelList tModelList = proxy.find_tModel(name,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-      TModelInfos tModelInfos = tModelList.getTModelInfos();
-      Vector tModelKeyVector = new Vector();
-      
-      for (int i=0;i<tModelInfos.size();i++)
-      {
-        TModelInfo tModelInfo = tModelInfos.get(i);
-        if (tModelKeyVector.size() < UDDIActionInputs.QUERY_MAX_RESULTS)
-          tModelKeyVector.addElement(tModelInfo.getTModelKey());
-        else
-          break;
-      }
-      
-      if (tModelKeyVector.size() > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          TModelDetail tModelDetail = proxy.get_tModelDetail(tModelKeyVector);
-          Vector tModelVector = tModelDetail.getTModelVector();
-          TModel[] tModelArray = new TModel[tModelVector.size()];
-          tModelVector.toArray(tModelArray);
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(tModelArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACES_FOUND",String.valueOf(tModelArray.length)));        
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICE_INTERFACES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
deleted file mode 100644
index 207e86876..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServiceUUIDAction.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.UDDIException;
-
-import java.util.*;
-
-public class RegFindServiceUUIDAction extends FindAction
-{
-  public RegFindServiceUUIDAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_UUID));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_KEY);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidKey);
-
-    if (!subQueryInitiated_ && !Validator.validateString(uuidKey))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_UUID_KEY"));
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-
-      // The action can be run under the context of either a registry or a query node or even UDDIMainNode.
-      if (regNode_ == null)
-        regNode_ = getRegistryNode((Node)propertyTable_.get(UDDIActionInputs.REFRESH_NODE));
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      BusinessService[] bsArray = new BusinessService[1];
-      ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidKey);
-      Vector bsVector = serviceDetail.getBusinessServiceVector();
-      if (bsVector.size() > 0)
-      {
-        bsVector.toArray(bsArray);
-        if (shouldAddQueryNode)
-        {
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
-        }
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,bsArray[0]);
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
deleted file mode 100644
index 0f249e3bd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesAdvancedAction.java
+++ /dev/null
@@ -1,376 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.*;
-import org.uddi4j.util.*;
-import org.uddi4j.UDDIException;
-
-import java.util.*;
-import java.net.*;
-
-public class RegFindServicesAdvancedAction extends FindAction
-{
-  public RegFindServicesAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET));
-    propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS));
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String ownedChecked = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_OWNED);
-    String[] busNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_BUSINESS);
-    String[] languages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] siNodeIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
-    String[] findQualifierValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_FINDQUALIFIER);
-    String maxSearchSet = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET);
-    String maxResults = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    regNode_.getTreeElement();
-
-    if (ownedChecked != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED,ownedChecked);
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED);
-
-    if (busNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      if (serviceBusiness == null)
-        serviceBusiness = new Vector();
-      else
-        serviceBusiness.removeAllElements();
-      Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
-      // The browser will enforce the rule of having only one business in this list.
-      ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
-      serviceBusiness.addElement(listElement);
-      BusinessEntity sp = (BusinessEntity)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-    }
-
-    if (languages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      for (int i=0;i<names.length;i++)
-      {
-        Name uddi4jName;
-        if (languages[i].length() > 0)
-          uddi4jName = new Name(names[i],languages[i]);
-        else
-          uddi4jName = new Name(names[i]);
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-    if (siNodeIds != null)
-    {
-      // Although we already have the "submitted" data, deletions occur on the client side and thus the need to track this using hidden form elements.
-      Vector serviceServiceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      if (serviceServiceInterfaces == null)
-        serviceServiceInterfaces = new Vector();
-      else
-        serviceServiceInterfaces.removeAllElements();
-      Vector serviceServiceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-      Vector tModelKeyStringVector = new Vector();
-      Hashtable resultHash = new Hashtable();
-      for (int i=0;i<siNodeIds.length;i++)
-        resultHash.put(siNodeIds[i],Boolean.TRUE);
-      for (int i=0;i<serviceServiceInterfacesCopy.size();i++)
-      {
-        ListElement listElement = (ListElement)serviceServiceInterfacesCopy.elementAt(i);
-        if (resultHash.get(String.valueOf(listElement.getTargetNodeId())) != null)
-        {
-          serviceServiceInterfaces.addElement(listElement);
-          TModel tModel = (TModel)listElement.getObject();
-          tModelKeyStringVector.addElement(tModel.getTModelKey());
-        }
-      }
-      TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,serviceServiceInterfaces);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
-    }
-
-    if (findQualifierValues != null)
-    {
-      FindQualifiers findQualifiers = new FindQualifiers();
-      Vector findQualifierVector = new Vector();
-      for (int i=0;i<findQualifierValues.length;i++)
-      {
-        FindQualifier findQualifier = new FindQualifier(findQualifierValues[i]);
-        findQualifierVector.addElement(findQualifier);
-      }
-      findQualifiers.setFindQualifierVector(findQualifierVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS,findQualifiers);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-
-    if (maxSearchSet != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_SEARCH_SET,maxSearchSet);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxSearchSet))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_SEARCH_SET"));
-      inputsValid = false;
-    }
-
-    if (maxResults != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_MAX_RESULTS,maxResults);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
-    }
-    if (!subQueryInitiated_ && !Validator.validateInteger(maxResults))
-    {
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_MAX_RESULTS"));
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);      
-      FindQualifiers findQualifiers = (FindQualifiers)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS);
-      BusinessEntity sp = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-      TModelBag tModelBag = (TModelBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG);
-      boolean owned = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_OWNED) != null);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      int maxSearchSet = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET));
-      int maxResults = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS));
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (owned && !regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-        
-      UDDIProxy proxy = regElement.getProxy();
-      String businessKey;
-      if (sp != null)
-        businessKey = sp.getBusinessKey();
-      else
-        businessKey = "";
-
-      int finalNumberOfServiceKeys;
-      Vector serviceKeyVector;
-      if (owned)
-      {
-        serviceKeyVector = findAllOwnedServices(proxy,regElement.getAuthInfoString(),businessKey,maxResults);
-        finalNumberOfServiceKeys = serviceKeyVector.size();
-      }
-      else
-      {
-        ServiceList serviceList = proxy.find_service(businessKey,nameVector,categoryBag,tModelBag,findQualifiers,maxSearchSet);
-        ServiceInfos sInfos = serviceList.getServiceInfos();
-        finalNumberOfServiceKeys = Math.min(maxResults,sInfos.size());
-        serviceKeyVector = new Vector();
-        for (int i=0;i<finalNumberOfServiceKeys;i++)
-        {
-          ServiceInfo sInfo = sInfos.get(i);
-          serviceKeyVector.addElement(sInfo.getServiceKey());
-        }
-      }
-      
-      if (finalNumberOfServiceKeys > 0)
-      {      
-        if (shouldAddQueryNode)
-        {
-          Vector finalBusServiceVector = new Vector();
-          int currentIndex = 0;
-          int windowSize = finalNumberOfServiceKeys;
-          while (currentIndex < serviceKeyVector.size())
-          {
-            int subListToIndex = Math.min(currentIndex+windowSize,serviceKeyVector.size());
-            try
-            {
-              ServiceDetail serviceDetail = proxy.get_serviceDetail(new Vector(serviceKeyVector.subList(currentIndex,subListToIndex)));
-              Vector busServiceVector = serviceDetail.getBusinessServiceVector();
-              for (int i=0;i<busServiceVector.size();i++)
-                finalBusServiceVector.addElement(busServiceVector.elementAt(i));
-              if (serviceDetail.getTruncatedBoolean())
-                windowSize = busServiceVector.size();
-              currentIndex += windowSize;
-            }
-            catch (UDDIException e)
-            {
-              DispositionReport dr = e.getDispositionReport();
-              if (((Result) dr.getResultVector().get(0)).getErrInfo().getErrCode() == DispositionReport.E_invalidKeyPassed)
-              {
-                String errInfoText = ((Result) dr.getResultVector().get(0)).getErrInfo().getText();
-                for (int i=currentIndex;i<subListToIndex;i++)
-                {
-                  String serviceKey = (String)serviceKeyVector.elementAt(i);
-                  if (errInfoText.indexOf(serviceKey) != -1 || errInfoText.indexOf(serviceKey.toUpperCase()) != -1 || errInfoText.indexOf(serviceKey.toLowerCase()) != -1)
-                  {
-                    serviceKeyVector.removeElementAt(i);
-                    break;
-                  }
-                }
-              }
-              else
-                throw e;
-            }
-            catch (TransportException e)
-            {
-              throw e;
-            }            
-          }
-          
-          int finalNumberOfBusinessServices = finalBusServiceVector.size();
-          if (finalNumberOfBusinessServices > 0)
-          {
-            BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
-            finalBusServiceVector.toArray(bsArray);
-            String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-            queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
-            addQueryNode();
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
-          }
-          else
-            throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-    }   
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    } 
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }
-    return false;
-  }
-  
-  // Copied directly from UDDIWSDLProxy's findAllOwnedServices() method with minor modifications. The hardcoded strings should NOT be translated.
-  private final Vector findAllOwnedServices(UDDIProxy proxy,String authInfoString,String businessKey,int maxResults) throws UDDIException, TransportException
-  {
-    RegisteredInfo registeredInfo = null;
-
-    // Get the complete list of owned (registered) info.
-    // (A RegisteredInfo consists of BusinessInfos and TModelInfos.
-    // BusinessInfos also contain ServiceInfos.)
-    registeredInfo = proxy.get_registeredInfo(authInfoString);
-
-    //Create a vector to add the serviceKeys from the registeredInfo to.
-    Vector serviceKeyList = new Vector();
-
-    //Get the businessInfos from the registeredInfo.
-    BusinessInfos businessInfos = registeredInfo.getBusinessInfos();
-
-    //Get all the serviceKeys from the serviceInfos within the businessInfos,
-    //and add them to the serviceKeyList.
-    boolean endSearch = false;
-    for (int i = 0; i < businessInfos.size(); i++)
-    {
-      BusinessInfo businessInfo = businessInfos.get(i);
-      String currentBusinessKey = businessInfo.getBusinessKey();
-      if (businessKey.length() > 0 && currentBusinessKey.equals(businessKey))
-        endSearch = true;
-      ServiceInfos serviceInfos = businessInfo.getServiceInfos();
-      for (int j = 0; j < serviceInfos.size(); j++)
-      {
-        ServiceInfo serviceInfo = serviceInfos.get(j);
-        if (serviceInfo.getBusinessKey().equals(currentBusinessKey))
-        {
-          if (serviceKeyList.size() < maxResults)
-            serviceKeyList.add(serviceInfo.getServiceKey());
-          else
-          {
-            endSearch = true;
-            break;
-          }
-        }
-      }
-      if (endSearch)
-        break;
-    }    
-    return serviceKeyList;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
deleted file mode 100644
index 0a6793168..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegFindServicesSimpleAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.*;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.UDDIException;
-
-import java.util.*;
-
-public class RegFindServicesSimpleAction extends FindAction
-{
-  public RegFindServicesSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-
-    // Validate the data.
-    boolean inputsValid = true;
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
-    else
-    {
-      // This shouldn't occur.
-      inputsValid = false;
-    }
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      boolean shouldAddQueryNode = (propertyTable_.get(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE) == null);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-      Vector nameVector = new Vector();
-      nameVector.addElement(new Name(name));
-
-      // The action can be run under the context of either a registry or a query node.
-      getSelectedNavigatorNode();
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      ServiceList serviceList = proxy.find_service("",nameVector,null,null,null,UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-      
-      ServiceInfos sInfos = serviceList.getServiceInfos();
-      int finalNumberOfBusinessServices = Math.min(UDDIActionInputs.QUERY_MAX_RESULTS,sInfos.size());
-      Vector serviceKeyVector = new Vector();
-      for (int i=0;i<finalNumberOfBusinessServices;i++)
-      {
-        ServiceInfo sInfo = sInfos.get(i);
-        serviceKeyVector.addElement(sInfo.getServiceKey());
-      }
-        
-      if (finalNumberOfBusinessServices > 0)
-      {
-        if (shouldAddQueryNode)
-        {
-          ServiceDetail serviceDetail = proxy.get_serviceDetail(serviceKeyVector);
-          Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
-          String queryName = (String)propertyTable_.get(UDDIActionInputs.QUERY_NAME);
-          BusinessService[] bsArray = new BusinessService[finalNumberOfBusinessServices];
-          businessServiceVector.toArray(bsArray);
-          queryElement_ = new QueryElement(bsArray,queryName,regElement.getModel());
-          addQueryNode();
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICES_FOUND",String.valueOf(bsArray.length)));
-        }
-        return true;
-      }
-      else
-        throw new FormInputException(uddiPerspective.getMessage("MSG_ERROR_NO_SERVICES_FOUND"));
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (FormInputException e)
-    {
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
deleted file mode 100644
index 001fbad7e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessAdvancedAction.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.*;
-import org.uddi4j.util.IdentifierBag;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.DiscoveryURLs;
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.util.KeyedReference;
-
-import java.util.*;
-import java.net.*;
-
-public class RegPublishBusinessAdvancedAction extends PublishAction
-{
-  public RegPublishBusinessAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    String[] discoveryURLValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    Hashtable languageHash = new Hashtable();
-    if (nameLanguages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (names[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-      }
-    }
-
-    if (descriptionLanguages != null && descriptions != null)
-    {
-      Vector descriptionVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (descriptions[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        descriptionVector.addElement(uddi4jDescription);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      
-    if (discoveryURLValues != null)
-    {
-      DiscoveryURLs discoveryURLs = new DiscoveryURLs();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
-      for (int i=0;i<discoveryURLValues.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        if (!subQueryInitiated_ && !Validator.validateURL(discoveryURLValues[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        discoveryURLs.add(new DiscoveryURL(discoveryURLValues[i],""));
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLs);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);      
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      DiscoveryURLs discoveryURLs = (DiscoveryURLs)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      BusinessEntity be = new BusinessEntity();
-      be.setBusinessKey("");
-      be.setNameVector(nameVector);
-      be.setDescriptionVector(descriptionVector);
-      be.setIdentifierBag(identifierBag);
-      be.setCategoryBag(categoryBag);
-      be.setDiscoveryURLs(discoveryURLs);
-      Vector beVector = new Vector();
-      beVector.add(be);
-
-      be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-      addPublishedItemNode(be,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
-      return true;
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
deleted file mode 100644
index 10ee7ef74..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishBusinessSimpleAction.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.*;
-
-import java.util.*;
-import java.net.*;
-
-public class RegPublishBusinessSimpleAction extends PublishAction
-{
-  public RegPublishBusinessSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_BUSINESSES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-    String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,description);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME);
-    String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    try
-    {
-      UDDIProxy proxy = regElement.getProxy();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-
-      BusinessEntity be = new BusinessEntity();
-      be.setBusinessKey("");
-      be.setDefaultName(new Name(name));
-      be.setDefaultDescriptionString(description);
-      Vector beVector = new Vector();
-      beVector.add(be);
-
-      be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-      addPublishedItemNode(be,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
-      return true;
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
deleted file mode 100644
index d9a3ca50a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceAdvancedAction.java
+++ /dev/null
@@ -1,363 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.*;
-import org.uddi4j.util.*;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import java.util.*;
-import java.net.*;
-
-public class RegPublishServiceAdvancedAction extends PublishAction
-{
-  public RegPublishServiceAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
-    String[] serIntIds = parser.getParameterValues(UDDIActionInputs.NODEID_SERVICE_INTERFACE);
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);    
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (busNodeIds != null)
-    {
-      Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      if (serviceBusiness == null)
-        serviceBusiness = new Vector();
-      else
-        serviceBusiness.removeAllElements();
-      Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY);
-      // The browser will enforce the rule of having only one business in this list.
-      ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
-      serviceBusiness.addElement(listElement);
-      BusinessEntity sp = (BusinessEntity)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS,serviceBusiness);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER,sp);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,sp.getBusinessKey());
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
-      }      
-    }
-    
-    if (serIntIds != null && serIntIds.length > 0)
-    {
-      Vector serviceInterfaces = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      if (serviceInterfaces == null)
-        serviceInterfaces = new Vector();
-      else
-        serviceInterfaces.removeAllElements();
-      Vector serviceInterfacesCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY);
-      Vector tmodels = new Vector();
-      for (Iterator it = serviceInterfacesCopy.iterator(); it.hasNext();)
-      {
-        ListElement listElement = (ListElement)it.next();
-        int targetNodeId = listElement.getTargetNodeId();
-        for (int i = 0; i < serIntIds.length; i++)
-        {
-          try
-          {
-            if (targetNodeId == Integer.parseInt(serIntIds[i]))
-            {
-              serviceInterfaces.add(listElement);
-              tmodels.add(listElement.getObject());
-              break;
-            }
-          }
-          catch (NumberFormatException nfe)
-          {
-          }
-        }
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES, serviceInterfaces);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL, tmodels);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
-    }
-    
-    if (wsdlURL != null)
-    {
-      propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURL);
-    }
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    Hashtable languageHash = new Hashtable();
-    if (nameLanguages != null && names != null)
-    {
-      Vector nameVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (names[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        nameVector.addElement(uddi4jName);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-      }
-    }
-
-    if (descriptionLanguages != null && descriptions != null)
-    {
-      Vector descriptionVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (descriptions[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        descriptionVector.addElement(uddi4jDescription);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER);
-      String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      Vector tModelVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODEL);
-      String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      Vector nameVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-
-      BusinessService bs;
-      if (tModelVector != null && tModelVector.size() > 0)
-        bs = uddi4jHelper.newBusinessService(wsdlURL, def, (TModel[])tModelVector.toArray(new TModel[0]));
-      else
-      {
-        RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
-        int currentNodeId = getSelectedNavigatorNode().getNodeId();
-        NodeManager nodeManager = regNode_.getNodeManager();
-        TModel[] tModels = null;
-        if (uddi4jHelper.isMonolithicWSDL(def))
-        {
-          tModels = new TModel[1];
-          tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
-        }
-        else
-        {
-          String[] imports = uddi4jHelper.getImports(def, wsdlURL);
-          tModels = new TModel[imports.length];
-          for (int i = 0; i < tModels.length; i++)
-            tModels[i] = uddi4jHelper.newTModel(imports[i]);
-        }
-        Hashtable tModelsTable = new Hashtable();
-        if (tModels != null)
-        {
-          for (int i=0;i<tModels.length;i++)
-          {
-            boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
-            if (inputsValid)
-            {
-              regPublishSIAction.run();
-              Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
-              if (savedTModel != null)
-                tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
-              // Reselect the current node.
-              nodeManager.setSelectedNodeId(currentNodeId);
-            }
-          }
-        }
-        bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
-      }
-      
-      if (be != null)
-        bs.setBusinessKey(be.getBusinessKey());
-      else if (businessKey != null)
-        bs.setBusinessKey(businessKey);
-      bs.setNameVector(nameVector);
-      bs.setDescriptionVector(descriptionVector);
-      bs.setCategoryBag(categoryBag);
-      Vector bsVector = new Vector();
-      bsVector.add(bs);
-      regElement.handlePreInvocation(bs);
-      bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
-      addPublishedItemNode(bs,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());      
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
deleted file mode 100644
index ef218529a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceAdvancedAction.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.*;
-import org.uddi4j.util.*;
-
-import javax.wsdl.WSDLException;
-import java.util.*;
-import java.net.*;
-
-public class RegPublishServiceInterfaceAdvancedAction extends PublishAction
-{
-  public RegPublishServiceInterfaceAdvancedAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));    
-  }
-
-  protected final boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
-    // Validate the data.
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    Hashtable languageHash = new Hashtable();
-
-    if (wsdlURL != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (descriptionLanguages != null && descriptions != null)
-    {
-      Vector descriptionVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0 && !subQueryInitiated_)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (descriptions[i].trim().length() < 1)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        descriptionVector.addElement(uddi4jDescription);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-
-    if (idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      IdentifierBag idBag = new IdentifierBag();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        idBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-
-    if (catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      CategoryBag catBag = new CategoryBag();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        catBag.add(kr);
-      }
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catBag);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-      String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      Vector descriptionVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      IdentifierBag identifierBag = (IdentifierBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      CategoryBag categoryBag = (CategoryBag)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-
-      // The action can be run under the context of either a registry or a query node.
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
-      tModel.setName(name);
-      tModel.setDescriptionVector(descriptionVector);
-      tModel.setIdentifierBag(identifierBag);
-      
-      // The category bag may contain wsdlSpec.
-      CategoryBag defaultCategoryBag = tModel.getCategoryBag();
-      Vector defaultKeyedReferenceVector = null;
-      if (defaultCategoryBag != null)
-      {
-        if (categoryBag == null)
-          categoryBag = defaultCategoryBag;
-        else
-        {
-          defaultKeyedReferenceVector = defaultCategoryBag.getKeyedReferenceVector();
-          for (int i=0;i<defaultKeyedReferenceVector.size();i++)
-          {
-            KeyedReference kr = (KeyedReference)defaultKeyedReferenceVector.elementAt(i);
-            if (categoryBag != null)
-              categoryBag.add(kr);
-          }
-        }
-      }
-      tModel.setCategoryBag(categoryBag);
-
-      Vector tModelVector = new Vector();
-      tModelVector.add(tModel);
-      tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
-      propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
-      addPublishedItemNode(tModel,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
deleted file mode 100644
index 211baade0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceInterfaceSimpleAction.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import javax.wsdl.WSDLException;
-import java.util.*;
-import java.net.*;
-
-public class RegPublishServiceInterfaceSimpleAction extends PublishAction
-{
-  public RegPublishServiceInterfaceSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-    String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (wsdlURL != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
-
-    return inputsValid;
-  }
-  
-  public final boolean populatePropertyTable(String wsdlURL, TModel tModel)
-  {
-    boolean inputsValid = true;
-    String name = tModel.getNameString();
-    String description = tModel.getDefaultDescriptionString();
-    if (wsdlURL != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,wsdlURL);
-    else
-      inputsValid = false;
-    
-    if (name != null) 
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,name);
-    else
-      inputsValid = false;
-    
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,description);
-    else
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL);
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME);
-    String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    try
-    {
-      UDDIProxy proxy = regElement.getProxy();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-
-      TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
-      tModel.setName(name);
-      tModel.setDefaultDescriptionString(description);
-
-      Vector tModelVector = new Vector();
-      tModelVector.add(tModel);
-      tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
-      propertyTable_.put(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL, tModel);
-      addPublishedItemNode(tModel,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      e.printStackTrace();
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      e.printStackTrace();
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      e.printStackTrace();
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
deleted file mode 100644
index bbe0caafb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RegPublishServiceSimpleAction.java
+++ /dev/null
@@ -1,212 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.*;
-
-import javax.wsdl.WSDLException;
-import javax.wsdl.Definition;
-import java.util.*;
-import java.net.*;
-
-public class RegPublishServiceSimpleAction extends PublishAction
-{
-  public RegPublishServiceSimpleAction(Controller controller)
-  {
-    super(controller);
-    propertyTable_.put(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    propertyTable_.put(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE));    
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {    
-    String busNodeIds = parser.getParameter(UDDIActionInputs.NODEID_BUSINESS);
-    String wsdlURL = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-    String description = parser.getParameter(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (busNodeIds != null)
-    {
-      Vector serviceBusiness = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-      if (serviceBusiness == null)
-        serviceBusiness = new Vector();
-      else
-        serviceBusiness.removeAllElements();
-      Vector serviceBusinessCopy = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY);
-      // The browser will enforce the rule of having only one business in this list.
-      ListElement listElement = (ListElement)serviceBusinessCopy.elementAt(0);
-      serviceBusiness.addElement(listElement);
-      BusinessEntity be = (BusinessEntity)listElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS,serviceBusiness);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER,be);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-      removeProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
-      if (!subQueryInitiated_)
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_BUSINESS"));
-      }
-    }
-
-    if (wsdlURL != null)
-    {
-      propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,wsdlURL);
-    }
-
-    if (!subQueryInitiated_ && !Validator.validateString(wsdlURL))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-    }
-
-    if (name != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,name);
-
-    if (!subQueryInitiated_ && !Validator.validateString(name))
-    {
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-    }
-
-    if (description != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,description);
-
-    return inputsValid;
-  }
-
-  public final boolean run()
-  {
-    String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER);
-    String businessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-    String wsdlURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL);
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME);
-    String description = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    try
-    {
-      UDDIProxy proxy = regElement.getProxy();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-      RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
-      int currentNodeId = getSelectedNavigatorNode().getNodeId();
-      NodeManager nodeManager = regNode_.getNodeManager();
-
-      Hashtable tModelsTable = new Hashtable();
-      TModel[] tModels = null;
-      if (uddi4jHelper.isMonolithicWSDL(def))
-      {
-        tModels = new TModel[1];
-        tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
-      }
-      else
-      {
-        String[] imports = uddi4jHelper.getImports(def, wsdlURL);
-        tModels = new TModel[imports.length];
-        for (int i = 0; i < tModels.length; i++)
-          tModels[i] = uddi4jHelper.newTModel(imports[i]);
-      }
-
-      if (tModels != null)
-      {
-        for (int i=0;i<tModels.length;i++)
-        {
-          boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
-          if (inputsValid)
-          {
-            regPublishSIAction.run();
-            Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
-            if (savedTModel != null)
-            {
-              tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
-            }
-            // Reselect the current node.
-            nodeManager.setSelectedNodeId(currentNodeId);
-          }
-        }
-      }
-
-      BusinessService bs = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
-      if (be != null)
-        bs.setBusinessKey(be.getBusinessKey());
-      else if (businessKey != null)
-        bs.setBusinessKey(businessKey);
-      bs.setDefaultName(new Name(name));
-      bs.setDefaultDescriptionString(description);
-      Vector bsVector = new Vector();
-      bsVector.add(bs);
-      regElement.handlePreInvocation(bs);
-      bs = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
-      addPublishedItemNode(bs,regElement);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",bs.getDefaultNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("WSDLException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (TransportException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("TransportException");
-      messageQueue.addMessage(e.getMessage());
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("MalformedURLException");
-      messageQueue.addMessage(e.getMessage());
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
deleted file mode 100644
index ed001171c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemovePublisherAssertionsAction.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.*;
-import org.uddi4j.response.*;
-import org.uddi4j.datatype.assertion.*;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-
-import java.util.*;
-import java.net.*;
-
-public class RemovePublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-  public RemovePublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // ids from uddiObjects_table
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds != null && selectedBusIds.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-    // Synchronize client view and server model (uddiObject_table.jsp)
-    synchronizeUDDIObjectTable();
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-  
-      if (!Validator.validateURL(publishURL))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userID!= null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-  
-      if (!Validator.validateString(userID))
-      {
-        inputsValid = false;
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    // ids from publisher assertion table
-    String[] pubAssertionsViewIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-    if (pubAssertionsViewIds == null || pubAssertionsViewIds.length == 0)
-      inputsValid = false;
-    else
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID, pubAssertionsViewIds);
-
-    return inputsValid;
-  }
-
-  public boolean run()
-  {
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    if (!(selectedElement instanceof BusinessElement))
-      return false;
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        registryElement.performLogin(publishURL, userID, password);
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }      
-    }
-
-    UDDIProxy proxy = registryElement.getProxy();
-    registryElement.getUserId();
-    registryElement.getCred();
-    BusinessElement busElement = (BusinessElement)selectedElement;
-    ListManager pubAssertions = busElement.getPublisherAssertions();
-
-    // determine whether this is a owned business
-    // if not, the AddPublisherAssertionsAction cannot be performed
-    if (!isBusinessOwned(busElement)) {
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NOT_OWNED_BUSINESS"));
-        return false;
-    }
-
-    try {
-      String[] pubAssertionViewIds = (String[])propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_VIEWID);
-      Vector pubAssertionVector = new Vector();
-      boolean refreshRequired = false;
-
-      for (int i = 0; i < pubAssertionViewIds.length; i++) {
-        int viewID = Integer.parseInt(pubAssertionViewIds[i]);
-        ListElement listElement = pubAssertions.getElementWithViewId(viewID);
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)listElement.getObject();
-        PublisherAssertion pubAssertion = pubAssertionElement.getPublisherAssertion();
-        pubAssertionVector.add(pubAssertion);
-        if (pubAssertionElement.getStatus().equals(CompletionStatus.COMPLETE))
-          refreshRequired = true;
-      }
-
-      DispositionReport report = proxy.delete_publisherAssertions(registryElement.getAuthInfoString(), pubAssertionVector);
-      //report status
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-
-      // refresh is required, refresh the whole publisher assertion table
-      if (refreshRequired) {
-        ShowPublisherAssertionsAction showPAAction = new ShowPublisherAssertionsAction(controller_);
-        Hashtable propertyTable = showPAAction.getPropertyTable();
-        Object ids = propertyTable_.get(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-        if (ids != null)
-          propertyTable.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, ids);
-        showPAAction.run();
-      }
-      // refresh is not required, delete the selected publisher assertion elements
-      else {
-        for (int k = 0; k < pubAssertionViewIds.length; k++) {
-          pubAssertions.removeElementWithViewId(Integer.parseInt(pubAssertionViewIds[k]));
-        }
-      }
-
-      return report.success();
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
deleted file mode 100644
index e9f354432..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/RemoveSubQueryItemAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import javax.servlet.http.*;
-
-import java.util.*;
-
-public class RemoveSubQueryItemAction extends Action
-{
-  private Controller controller_;
-  
-  public RemoveSubQueryItemAction(Controller controller)
-  {
-    super();
-    controller_ = controller;
-  }
-  
-  // uddi/actions/RemoveSubQueryItemActionJSP.jsp?subQueryKey=...&subQueryListKey=...&subQueryListItemId=...
-  public static final String getActionLink(String subQueryKey,String subQueryListKey,int subQueryListItemId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/RemoveSubQueryItemActionJSP.jsp?");
-    actionLink.append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
-    return actionLink.toString();
-  }
-  
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
-    String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
-    
-    if (subQueryKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-      
-    if (subQueryListKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-      
-    if (subQueryListItemId != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-      
-    return true;
-  }
-  
-  public boolean run()
-  {
-    propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY);
-    propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY);
-    int subQueryListItemId = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID));
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node currentNode = navigatorManager.getSelectedNode();
-    FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
-    Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
-    list.removeElementAt(subQueryListItemId);
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
deleted file mode 100644
index 6b30c2e5a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ResizeUDDIFramesAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-public class ResizeUDDIFramesAction extends ResizeFramesAction
-{
-  public ResizeUDDIFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(UDDIFrameNames.NAVIGATOR_CONTAINER))
-    {
-      uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        uddiPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(UDDIFrameNames.PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
-          uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        uddiPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(UDDIFrameNames.STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          uddiPerspective.setPerspectiveContentFramesetCols(uddiPerspective.getSavedPerspectiveContentFramesetCols());
-          uddiPerspective.setActionsContainerFramesetRows(uddiPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        uddiPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        uddiPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          uddiPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          uddiPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
deleted file mode 100644
index 7fa3d43df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectCategoryNodeAction.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectCategoryNodeAction extends SelectNodeAction
-{
-  public SelectCategoryNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getCategoryManager());
-  }
-
-  // uddi/actions/SelectCategoryNodeAction.jsp?sessionId=...&nodeId=...
-  public static String getActionLink(String sessionId,int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectCategoryNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-  
-  public final String getActionLinkForHistory()
-  {
-    // Do not add this action to the history.
-    return null;
-  }
-  
-  public final boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    performBaseAction(nodeId);
-    return true;
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "categoryBrowserWindowContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return null;
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return null;
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return null;
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
deleted file mode 100644
index 5afd276b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectFindToolAction.java
+++ /dev/null
@@ -1,83 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import javax.servlet.http.*;
-
-public class SelectFindToolAction extends SelectPropertiesToolAction
-{
-  protected String subQueryKey_;
-  protected boolean toolLinkChanged_;
-
-  public SelectFindToolAction(Controller controller)
-  {
-    super(controller);
-    subQueryKey_ = null;
-    toolLinkChanged_ = false;
-  }
-
-  public boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = super.processLinkParameters(request);
-    subQueryKey_ = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    return result;
-  }
-
-  // /uddi/actions/SelectFindToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...>&subQueryKey=...<&isHistory=1>
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,String subQueryKey,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectFindToolActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
-    if (viewId != ActionInputs.VIEWID_DEFAULT)
-    {
-      actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
-      actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
-    }
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  public boolean run()
-  {
-    if (!super.run())
-      return false;
-    FormTool formTool = (FormTool)(selectedNode_.getCurrentToolManager().getSelectedTool());
-    String currentSubQueryKey = (String)formTool.getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    if (subQueryKey_ != null && !subQueryKey_.equals(currentSubQueryKey))
-    {
-      toolLinkChanged_ = true;
-      formTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,subQueryKey_);
-    }
-    return true;
-  }
-
-  public boolean requiresViewSelection()
-  {
-    return toolLinkChanged_;
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    int nodeId = selectedNode_.getNodeId();
-    int toolId = selectedTool_.getToolId();
-    int viewId = selectedNode_.getViewId();
-    int viewToolId = selectedNode_.getViewToolId();
-    return getActionLink(nodeId,toolId,viewId,viewToolId,subQueryKey_,true);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
deleted file mode 100644
index 44c9845ae..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectNavigatorNodeAction.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectNavigatorNodeAction extends SelectNodeAction
-{
-  public SelectNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-  }
-
-  // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...<&isHistory=1>
-  public static String getActionLink(int nodeId,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  public String getActionLinkForHistory()
-  {
-    ToolManager toolManager = selectedNode_.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    int nodeId = selectedNode_.getNodeId();
-    selectedTool.getToolId();
-    selectedNode_.getViewId();
-    selectedNode_.getViewToolId();
-    if (selectedTool.getToolType() != ToolTypes.ACTION)
-      return selectedTool.getSelectToolActionHref(true);
-    else
-      return getActionLink(nodeId,true);
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
deleted file mode 100644
index 388995c4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectPropertiesToolAction.java
+++ /dev/null
@@ -1,83 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectPropertiesToolAction extends SelectNodeToolAction
-{
-  public SelectPropertiesToolAction(Controller controller)
-  {
-    super(controller, controller.getUDDIPerspective().getNavigatorManager());
-  }
-
-  // /uddi/actions/SelectPropertiesToolAction.jsp?nodeId=...&toolId=...<&viewId=...&viewToolId=...><&isHistory=1>
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectPropertiesToolActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
-    if (viewId != ActionInputs.VIEWID_DEFAULT)
-    {
-      actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
-      actionLink.append('&').append(ActionInputs.VIEWTOOLID).append('=').append(viewToolId);
-    }
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    int nodeId = selectedNode_.getNodeId();
-    int toolId = selectedTool_.getToolId();
-    int viewId = selectedNode_.getViewId();
-    int viewToolId = selectedNode_.getViewToolId();
-    return getActionLink(nodeId,toolId,viewId,viewToolId,true);
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-
-  public final String getPropertiesContentVar()
-  {
-    return "propertiesContent";
-  }
-
-  public final String getPropertiesContentPage()
-  {
-    return "uddi/properties_content.jsp";
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
deleted file mode 100644
index 0d9f2f06a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SelectSubQueryItemAction.java
+++ /dev/null
@@ -1,226 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import javax.servlet.http.*;
-
-import java.util.*;
-
-public class SelectSubQueryItemAction extends SelectPropertiesToolAction
-{
-  private boolean requiresTreeViewRefresh_;
-  private boolean requiresViewSelection_;
-  private boolean newUUIDQueryCreated_;
-  private String itemName_;
-  public SelectSubQueryItemAction(Controller controller)
-  {
-    super(controller);
-    requiresTreeViewRefresh_ = false;
-    requiresViewSelection_ = false;
-    newUUIDQueryCreated_ = false;
-    itemName_ = null;
-  }
-
-  // /uddi/actions/SelectSubQueryItemAction.jsp?nodeId=...&toolId=...<&viewId=...>&subQueryKey=...&subQueryListKey=...&subQueryListItemId=...&queryItem=...<&isHistory=1>
-  public static final String getActionLink(int nodeId,int toolId,int viewId,String subQueryKey,String subQueryListKey,int subQueryListItemId,int queryItem,boolean forHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/SelectSubQueryItemActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.TOOLID).append('=').append(toolId);
-    if (viewId != ActionInputs.VIEWID_DEFAULT)
-      actionLink.append('&').append(ActionInputs.VIEWID).append('=').append(viewId);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_KEY).append('=').append(subQueryKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_KEY).append('=').append(subQueryListKey);
-    actionLink.append('&').append(UDDIActionInputs.SUBQUERY_LIST_ITEMID).append('=').append(subQueryListItemId);
-    actionLink.append('&').append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
-
-    if (forHistory)
-      actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return actionLink.toString();
-  }
-
-  public boolean processLinkParameters(HttpServletRequest request)
-  {
-    boolean result = super.processLinkParameters(request);
-    String subQueryKey = request.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryListKey = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_KEY);
-    String subQueryListItemId = request.getParameter(UDDIActionInputs.SUBQUERY_LIST_ITEMID);
-    String queryItemString = request.getParameter(UDDIActionInputs.QUERY_ITEM);
-
-    if (subQueryKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_KEY,subQueryKey);
-
-    if (subQueryListKey != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_KEY,subQueryListKey);
-
-    if (subQueryListItemId != null)
-      propertyTable_.put(UDDIActionInputs.SUBQUERY_LIST_ITEMID,subQueryListItemId);
-
-    if (queryItemString != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_ITEM,queryItemString);
-    return result;
-  }
-
-  private final boolean findByUUID()
-  {
-    Node currentNode = nodeManager_.getSelectedNode();
-    FormTool formTool = (FormTool)(currentNode.getCurrentToolManager().getSelectedTool());
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_KEY));
-    Vector list = (Vector)formToolPI.getProperty((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_KEY));
-    ListElement listElement = (ListElement)list.elementAt(Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.SUBQUERY_LIST_ITEMID)));
-    int queryItem = Integer.parseInt((String)propertyTable_.get(UDDIActionInputs.QUERY_ITEM));
-    FindAction findAction = null;
-    String uuidKey = null;
-    String uuidKeyValue = null;
-    switch (queryItem)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        findAction = new RegFindBusinessUUIDAction(controller_);
-        uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY;
-        BusinessEntity sp = (BusinessEntity)listElement.getObject();
-        uuidKeyValue = sp.getBusinessKey();
-        itemName_ = sp.getDefaultNameString();
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        findAction = new RegFindServiceUUIDAction(controller_);
-        uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY;
-        BusinessService bs = (BusinessService)listElement.getObject();
-        uuidKeyValue = bs.getServiceKey();
-        itemName_ = bs.getDefaultNameString();
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-      default:
-        findAction = new RegFindServiceInterfaceUUIDAction(controller_);
-        uuidKey = UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY;
-        TModel tModel = (TModel)listElement.getObject();
-        uuidKeyValue = tModel.getTModelKey();
-        itemName_ = tModel.getNameString();
-    }
-    Hashtable propertyTable = findAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uuidKeyValue);
-    propertyTable.put(uuidKey,uuidKeyValue);
-    boolean result = findAction.run();
-    if (result)
-    {
-      Node itemNode = nodeManager_.getSelectedNode();
-      int nodeId = itemNode.getNodeId();
-      int toolId = itemNode.getToolManager().getSelectedToolId();
-      int viewId = ActionInputs.VIEWID_DEFAULT;
-      int viewToolId = ActionInputs.VIEWTOOLID_DEFAULT;
-      propertyTable_.put(ActionInputs.NODEID,String.valueOf(nodeId));
-      propertyTable_.put(ActionInputs.TOOLID,String.valueOf(toolId));
-      propertyTable_.put(ActionInputs.VIEWID,String.valueOf(viewId));
-      propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
-      super.run();
-      requiresTreeViewRefresh_ = true;
-      requiresViewSelection_ = true;
-      newUUIDQueryCreated_ = true;
-      listElement.setTargetViewToolInfo(nodeId,toolId,viewId);
-      return true;
-    }
-    else
-    {
-      // The item is no longer in the registry.
-      return false;
-    }
-  }
-
-  public final String getItemName()
-  {
-    return itemName_;
-  }
-  
-  public boolean run()
-  {
-    // Given the nodeId, toolId and viewId, check if the node or view is stale.
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    int toolId = Integer.parseInt((String)propertyTable_.get(ActionInputs.TOOLID));
-    int viewId = ActionInputs.VIEWID_DEFAULT;
-    try
-    {
-      viewId = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    }
-    catch (NumberFormatException e)
-    {
-    }
-    int viewToolId = 0;
-    if (!isStaleNode(nodeId))
-    {
-      // Enusre the node is visible.
-      requiresTreeViewRefresh_ = makeNodeVisible(nodeManager_.getNode(nodeId));
-
-      Node node = nodeManager_.getNode(nodeId);
-      if (viewId != ActionInputs.VIEWID_DEFAULT)
-      {
-        ViewTool viewTool = (ViewTool)(node.getToolManager().getTool(toolId));
-        ToolManager elementToolManager = viewTool.getToolManager(viewId);
-        if (elementToolManager != null)
-          viewToolId = elementToolManager.getSelectedToolId();
-        else
-        {
-          // Stale view
-          return findByUUID();
-        }
-      }
-      propertyTable_.put(ActionInputs.VIEWTOOLID,String.valueOf(viewToolId));
-      return super.run();
-    }
-    else
-    {
-      // Stale node
-      return findByUUID();
-    }
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    int nodeId = selectedNode_.getNodeId();
-    int toolId = selectedTool_.getToolId();
-    int viewId = selectedNode_.getViewId();
-    int viewToolId = selectedNode_.getViewToolId();
-    return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
-  }
-
-  public boolean requiresTreeViewRefresh()
-  {
-    return super.requiresTreeViewRefresh()|requiresTreeViewRefresh_;
-  }
-
-  public boolean requiresViewSelection()
-  {
-    return super.requiresViewSelection()|requiresViewSelection_;
-  }
-
-  public boolean requiresStatusUpdate()
-  {
-    return newUUIDQueryCreated_;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return "statusContent";
-  }
-
-  public final String getStatusContentPage()
-  {
-    return "uddi/status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
deleted file mode 100644
index 9b0987f8c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetBusinessAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.service.*;
-
-import java.util.*;
-
-public class ServiceGetBusinessAction extends NodeAction
-{
-  private ServiceNode serviceNode_;
-  public ServiceGetBusinessAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-    serviceNode_ = null;
-  }
-
-  // uddi/actions/ServiceGetBusinessActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetBusinessActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateService()
-  {
-    int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
-    ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
-    RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_BUSINESS",serviceNode_.getNodeName()));
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,bs.getBusinessKey());
-
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
deleted file mode 100644
index 22ced4ccb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceGetServiceInterfacesAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.service.*;
-
-import java.util.*;
-
-public class ServiceGetServiceInterfacesAction extends UDDINodeAction
-{
-  private ServiceNode serviceNode_;
-  public ServiceGetServiceInterfacesAction(Controller controller)
-  {
-    super(controller);
-    serviceNode_ = null;
-  }
-
-  // uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateService()
-  {
-    int serviceNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    serviceNode_ = (ServiceNode)nodeManager_.getNode(serviceNodeId);
-    ServiceElement serviceElement = (ServiceElement)serviceNode_.getTreeElement();
-    RegFindServiceUUIDAction verifyAction = new RegFindServiceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceElement.getBusinessService().getServiceKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    BusinessService bs = (BusinessService)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-    RegFindServiceInterfacesAdvancedAction action = new RegFindServiceInterfacesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SERVICE_SERVICE_INTERFACES",serviceNode_.getNodeName()));
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE,Boolean.TRUE);
-    ListElement serviceListElement = new ListElement(bs);
-    serviceListElement.setTargetViewToolInfo(serviceNode_.getNodeId(),serviceNode_.getToolManager().getSelectedToolId(),serviceNode_.getViewId());
-    Vector serviceListVector = new Vector();
-    serviceListVector.addElement(serviceListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE,serviceListVector);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE,bs);
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
deleted file mode 100644
index 8187288a7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetBusinessesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.tmodel.*;
-import org.uddi4j.util.*;
-
-import java.util.*;
-
-public class ServiceInterfaceGetBusinessesAction extends UDDINodeAction
-{
-  private ServiceInterfaceNode siNode_;
-  public ServiceInterfaceGetBusinessesAction(Controller controller)
-  {
-    super(controller);
-    siNode_ = null;
-  }
-
-  // uddi/actions/ServiceInterfacGetBusinessesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateServiceInterface()
-  {
-    int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
-    RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindBusinessesAdvancedAction action = new RegFindBusinessesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_BUSINESSES",siNode_.getNodeName()));
-    
-    ListElement siListElement = new ListElement(tModel);
-    siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
-    Vector siListVector = new Vector();
-    siListVector.addElement(siListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES,siListVector);
-    
-    Vector tModelKeyStringVector = new Vector();
-    tModelKeyStringVector.addElement(tModel.getTModelKey());
-    TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG,tModelBag);
-    
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
deleted file mode 100644
index 52cbeea5e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ServiceInterfaceGetServicesAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import org.uddi4j.datatype.tmodel.*;
-import org.uddi4j.util.*;
-
-import java.util.*;
-
-public class ServiceInterfaceGetServicesAction extends UDDINodeAction
-{
-  private ServiceInterfaceNode siNode_;
-  public ServiceInterfaceGetServicesAction(Controller controller)
-  {
-    super(controller);
-    siNode_ = null;
-  }
-
-  // uddi/actions/ServiceInterfacGetServicesActionJSP.jsp?nodeId=...
-  public static String getActionLink(int nodeId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    return actionLink.toString();
-  }
-
-  public final boolean validateServiceInterface()
-  {
-    int siNodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    siNode_ = (ServiceInterfaceNode)nodeManager_.getNode(siNodeId);
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)siNode_.getTreeElement();
-    RegFindServiceInterfaceUUIDAction verifyAction = new RegFindServiceInterfaceUUIDAction(controller_);
-    Hashtable propertyTable = verifyAction.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE,Boolean.TRUE);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,siElement.getTModel().getTModelKey());
-    boolean result = verifyAction.run();
-    if (result)
-      propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,propertyTable.get(UDDIActionInputs.LATEST_OBJECT));
-    return result;
-  }
-    
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    TModel tModel = (TModel)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-
-    RegFindServicesAdvancedAction action = new RegFindServicesAdvancedAction(controller_);
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("NODE_NAME_SI_SERVICES",siNode_.getNodeName()));
-    
-    ListElement siListElement = new ListElement(tModel);
-    siListElement.setTargetViewToolInfo(siNode_.getNodeId(),siNode_.getToolManager().getSelectedToolId(),siNode_.getViewId());
-    Vector siListVector = new Vector();
-    siListVector.addElement(siListElement);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES,siListVector);
-    
-    Vector tModelKeyStringVector = new Vector();
-    tModelKeyStringVector.addElement(tModel.getTModelKey());
-    TModelBag tModelBag = new TModelBag(tModelKeyStringVector);
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG,tModelBag);
-    
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
deleted file mode 100644
index 01c321f4e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ShowPublisherAssertionsAction.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.*;
-import org.uddi4j.response.*;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.client.UDDIProxy;
-
-import java.util.*;
-import java.net.*;
-
-public class ShowPublisherAssertionsAction extends CommonPublisherAssertionsAction
-{
-
-  protected String subQueryKey_;
-  protected boolean isSubQueryGet_;
-  protected boolean subQueryInitiated_;
-  protected String newSubQuery_;
-  protected String newSubQueryItem_;
-
-  public ShowPublisherAssertionsAction(Controller controller)
-  {
-    super(controller);
-
-    subQueryKey_ = null;
-    isSubQueryGet_ = false;
-    subQueryInitiated_ = false;
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    if (registryNode_ == null)
-      return false;
-
-    // ids from uddiObjects_table
-    String[] selectedBusIds = parser.getParameterValues(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID);
-    if (selectedBusIds != null && selectedBusIds.length > 0)
-      propertyTable_.put(UDDIActionInputs.PUBLISHER_ASSERTIONS_SELECTED_BUS_ID, selectedBusIds);
-
-    newSubQuery_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_INITIATED);
-    String isSubQueryGetString = parser.getParameter(UDDIActionInputs.SUBQUERY_GET);
-    newSubQueryItem_ = parser.getParameter(UDDIActionInputs.NEW_SUBQUERY_QUERY_ITEM);
-    subQueryKey_ = parser.getParameter(UDDIActionInputs.SUBQUERY_KEY);
-
-    // Validate the data.
-    controller_.getUDDIPerspective();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.clearErrors();
-
-    if (newSubQuery_ != null && newSubQuery_.length() > 0)
-      subQueryInitiated_ = true;
-    else
-      subQueryInitiated_ = false;
-
-    if (isSubQueryGetString != null)
-      isSubQueryGet_ = Boolean.valueOf(isSubQueryGetString).booleanValue();
-
-    // if not yet logged in, validate the parameters needed to log in
-    // NOTE: This action does NOT require the user to be logged in.
-    if (!isLoggedIn_) {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      if (publishURL != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      }
-
-      if (userID != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userID);
-      }
-
-      if (password != null)
-      {
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-        formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      }
-    }
-
-    return true;
-  }
-
-  public final boolean isSubQueryInitiated()
-  {
-    return subQueryInitiated_;
-  }
-
-  public final boolean isSubQueryGet()
-  {
-    return isSubQueryGet_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final String getNewSubQuery()
-  {
-    return newSubQuery_;
-  }
-
-  public final String getNewSubQueryItem()
-  {
-    return newSubQueryItem_;
-  }
-
-  public boolean run()
-  {
-    // Synchronize client view and server model (uddiObject_table.jsp)
-    synchronizeUDDIObjectTable();
-
-    if (registryNode_ == null)
-      return false;
-
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    if (!(selectedElement instanceof BusinessElement))
-      return false;
-
-    // if not yet logged in, log in first
-    if (!isLoggedIn_) {
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userID = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      try {
-        if (Validator.validateURL(publishURL) &&
-            Validator.validateString(userID) &&
-            password != null) {
-          registryElement.performLogin(publishURL, userID, password);
-          isLoggedIn_ = registryElement.isLoggedIn();
-        }
-      }
-      catch (TransportException te) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("TransportException");
-        messageQueue.addMessage(te.getMessage());
-        return false;
-      }
-      catch (UDDIException uddie) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("UDDIException");
-        messageQueue.addMessage(uddie.toString());
-        return false;
-      }
-      catch (MalformedURLException me) {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-        messageQueue.addMessage("MalformedURLException");
-        messageQueue.addMessage(me.getMessage());
-        return false;
-      }      
-    }
-
-    // show all assertion iff is logged in and business is owned
-    // else show only completed ones
-    BusinessElement busElement = (BusinessElement)selectedElement;
-    if (isLoggedIn_ && isBusinessOwned(busElement))
-      return showPublisherAssertionsForOwnedBus(busElement);
-    else
-      return showPublisherAssertionsForNonOwnedBus(busElement);
-  }
-
-  private boolean showPublisherAssertionsForOwnedBus(BusinessElement busElement) {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    // try to get a list of all publisher assertion based on the current registry's authToken
-    ListManager listManager = new ListManager();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
-    Vector queryInputVector = new Vector();
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    registryElement.getUserId();
-    registryElement.getCred();
-
-    // show all publisher assertions
-    UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
-    AssertionStatusReport assertionReport;
-    try {
-      assertionReport = proxy.get_assertionStatusReport(registryElement.getAuthInfoString(), (CompletionStatus)null);
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-    Vector assertionVector = assertionReport.getAssertionStatusItemVector();
-    Vector otherBusinessKeys = new Vector();
-    Vector pubAssertionElements = new Vector();
-
-    for (int i = 0; i < assertionVector.size(); i++) {
-      AssertionStatusItem assertionItem = (AssertionStatusItem)assertionVector.elementAt(i);
-      // determine the from/to business keys
-      String fromKey = assertionItem.getFromKey().getText();
-      String toKey = assertionItem.getToKey().getText();
-      String owningBusinessKey = busElement.getBusinessEntity().getBusinessKey();
-      // ignore this assertion if neither the from key nor the to key equals to this business's key
-      if (!owningBusinessKey.equals(fromKey) && !owningBusinessKey.equals(toKey))
-        continue;
-      String otherBusinessKey = ((owningBusinessKey.equals(fromKey)) ? toKey : fromKey);
-      // retrieve the information of the "other business"
-      otherBusinessKeys.add(otherBusinessKey);
-
-      // retrieve the status of the publisher assertion
-      String status = assertionItem.getCompletionStatus().getText();
-      KeyedReference keyedRef = assertionItem.getKeyedReference();
-      PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
-                                                                                    fromKey,
-                                                                                    toKey,
-                                                                                    owningBusinessKey,
-                                                                                    null,
-                                                                                    -1,
-                                                                                    status,
-                                                                                    keyedRef);
-      pubAssertionElements.add(pubAssertionElement);
-    }
-    if (otherBusinessKeys.size() > 0) {
-      Vector busEntities;
-      try {
-        busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
-      }
-      catch (Exception ex) {
-        busEntities = new Vector();
-        if (otherBusinessKeys.size() > 1) {
-          for (int j = 0; j < otherBusinessKeys.size(); j++) {
-            try {
-              busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
-            }
-            catch (Exception exception) {
-              pubAssertionElements.remove(j);
-            }
-          }
-        }
-        else
-          pubAssertionElements.remove(0);
-      }
-      for (int j = 0; j < busEntities.size(); j++) {
-        BusinessEntity be = (BusinessEntity)busEntities.get(j);
-        PublisherAssertionElement pubAssertionElement = (PublisherAssertionElement)pubAssertionElements.get(j);
-        ListElement le = new ListElement(be);
-        queryInputVector.add(le);
-        int subQueryItemId = queryInputVector.indexOf(le);
-        pubAssertionElement.setServiceProvider(le);
-        pubAssertionElement.setSubQueryItemId(subQueryItemId);
-        listManager.add(new ListElement(pubAssertionElement));
-      }
-    }
-    busElement.setPublisherAssertions(listManager);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
-    return true;
-  }
-
-  private boolean showPublisherAssertionsForNonOwnedBus(BusinessElement busElement) {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    // try to get a list of publisher assertions based on the business key
-    ListManager listManager = new ListManager();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = ((MultipleFormToolPropertiesInterface)formTool).getFormToolProperties(subQueryKey_);
-    formToolPI.removeProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS);
-    Vector queryInputVector = new Vector();
-    UDDIProxy proxy = ((RegistryElement)registryNode_.getTreeElement()).getProxy();
-    RelatedBusinessesList relatedBusList;
-    try {
-      relatedBusList = proxy.find_relatedBusinesses(busElement.getBusinessEntity().getBusinessKey(),
-                                                                                                         (KeyedReference)null,
-                                                                                                         (FindQualifiers)null);
-    }
-    catch (UDDIException uddie) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      DispositionReport report = uddie.getDispositionReport();
-	  Vector reportErrInfo = report.getResultVector();
-      for (int i = 0; i < reportErrInfo.size(); i++) {
-        messageQueue.addMessage(((Result) reportErrInfo.get(i)).getErrInfo().getText());
-      }
-      return false;
-    }
-    catch (Exception e) {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("Exception");
-      messageQueue.addMessage(e.getMessage());
-      return false;
-    }
-    Vector relatedBusVector = relatedBusList.getRelatedBusinessInfos().getRelatedBusinessInfoVector();
-    Vector otherBusinessKeys = new Vector();
-    Vector pubAssertionElements = new Vector();
-    for (int i  = 0; i < relatedBusVector.size(); i++) {
-      RelatedBusinessInfo relatedBusInfo = (RelatedBusinessInfo)relatedBusVector.elementAt(i);
-      // determine the from/to business keys
-      String fromKey;
-      String toKey;
-      String owningBusinessKey;
-      if (relatedBusInfo.getDefaultSharedRelationships().getDirection().equals(SharedRelationships.DIRECTION_FROMKEY)) {
-        fromKey = busElement.getBusinessEntity().getBusinessKey();
-        toKey = relatedBusInfo.getBusinessKey();
-        owningBusinessKey = fromKey;
-        otherBusinessKeys.add(toKey);
-      }
-      else {
-        fromKey = relatedBusInfo.getBusinessKey();
-        toKey = busElement.getBusinessEntity().getBusinessKey();
-        owningBusinessKey = toKey;
-        otherBusinessKeys.add(fromKey);
-      }
-
-      Vector keyedRefVector = relatedBusInfo.getDefaultSharedRelationships().getKeyedReferenceVector();
-      PublisherAssertionElement[] pubAssertionElementArray = new PublisherAssertionElement[keyedRefVector.size()];
-      for (int k = 0; k < keyedRefVector.size(); k++) {
-        // retrieve the status of the publisher assertion
-        String status = CompletionStatus.COMPLETE;
-        KeyedReference keyedRef = (KeyedReference)keyedRefVector.elementAt(k);
-        PublisherAssertionElement pubAssertionElement = new PublisherAssertionElement(
-                                                                                      fromKey,
-                                                                                      toKey,
-                                                                                      owningBusinessKey,
-                                                                                      null,
-                                                                                      -1,
-                                                                                      status,
-                                                                                      keyedRef);
-        pubAssertionElementArray[k] = pubAssertionElement;
-      }
-      pubAssertionElements.add(pubAssertionElementArray);
-    }
-    if (otherBusinessKeys.size() > 0) {
-      Vector busEntities;
-      try {
-        busEntities = proxy.get_businessDetail(otherBusinessKeys).getBusinessEntityVector();
-      }
-      catch (Exception ex) {
-        busEntities = new Vector();
-        if (otherBusinessKeys.size() > 1) {
-          for (int j = 0; j < otherBusinessKeys.size(); j++) {
-            try {
-              busEntities.add(proxy.get_businessDetail((String)otherBusinessKeys.get(j)).getBusinessEntityVector().get(0));
-            }
-            catch (Exception exception) {
-              pubAssertionElements.remove(j);
-            }
-          }
-        }
-        else
-          pubAssertionElements.remove(0);
-      }
-      for (int j  = 0; j < busEntities.size(); j++) {
-        BusinessEntity be = (BusinessEntity)busEntities.get(j);
-        ListElement le = new ListElement(be);
-        queryInputVector.add(le);
-        int subQueryItemId = queryInputVector.indexOf(le);
-        PublisherAssertionElement[] pubAssertionElementArray = (PublisherAssertionElement[])pubAssertionElements.get(j);
-        for (int k = 0; k < pubAssertionElementArray.length; k++) {
-          pubAssertionElementArray[k].setServiceProvider(le);
-          pubAssertionElementArray[k].setSubQueryItemId(subQueryItemId);
-          listManager.add(new ListElement(pubAssertionElementArray[k]));
-        }
-      }
-    }
-    busElement.setPublisherAssertions(listManager);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS, queryInputVector);
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_PUBLISHER_ASSERTIONS_REFRESHED"));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
deleted file mode 100644
index 8a142b386..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/SwitchPerspectiveFromUDDIAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-public final class SwitchPerspectiveFromUDDIAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromUDDIAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(UDDIActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      uddiPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      uddiPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
deleted file mode 100644
index 43272da62..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleCategoryNodeAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-public class ToggleCategoryNodeAction extends ToggleNodeAction
-{
-  public ToggleCategoryNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getCategoryManager());
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?sId=...&nodeId=...&open=...
-  public static final String getActionLink(String sessionId,int nodeId,boolean open)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleCategoryNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
-    return actionLink.toString();
-  }
-
-  public final boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    performBaseAction(nodeId);
-    return true;
-  }
-
-  public final String getActionLinkForHistory()
-  {
-    return null;
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "categoryBrowserWindowContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return OpenCategoryBrowserAction.getCategoryContentPage(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
-  }
-
-  public final String getTreeContainerPage()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return OpenCategoryBrowserAction.getActionLink(controller_.getSessionId(),uddiPerspective.getCategoryTModelKey());
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return null;
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return null;
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
deleted file mode 100644
index a0fccac81..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/ToggleNavigatorNodeAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class ToggleNavigatorNodeAction extends ToggleNodeAction
-{
-  public ToggleNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
-  public static String getActionLink(int nodeId,boolean open)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/ToggleNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
-    return actionLink.toString();
-  }
-
-  // This should be called only to select the toggled node when, at the time of
-  // the collapse event, a descendant node was selected.
-  public final String getActionLinkForHistory()
-  {
-    ToolManager toolManager = toggledNode_.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    int nodeId = toggledNode_.getNodeId();
-    int toolId = selectedTool.getToolId();
-    int viewId = toggledNode_.getViewId();
-    int viewToolId = toggledNode_.getViewToolId();
-    if (selectedTool.getToolType() != ToolTypes.ACTION)
-      return SelectPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
-    else
-      return SelectNavigatorNodeAction.getActionLink(nodeId,true);
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
deleted file mode 100644
index e6b31f079..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferSubQueryResultsAction.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.util.*;
-
-public class TransferSubQueryResultsAction extends UDDIPropertiesFormAction
-{
-  private Node targetNode_;
-  public TransferSubQueryResultsAction(Controller controller)
-  {
-    super(controller);
-    targetNode_ = null;
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] selectedNodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    // The client Javascript enforces the rule that at least one item was selected before the form can be submitted.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,selectedNodeIds);
-    return true;
-  }
-
-  public static final String getActionLinkForReturn()
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/TransferSubQueryResultsActionJSP.jsp?");
-    actionLink.append(UDDIActionInputs.SHOW_RESULTS_TARGET).append("=1");
-    return actionLink.toString();
-  }
-
-  public final void enableShowResultsTarget()
-  {
-    // This should only be called if the user clicks on the target link on the query results page. Insert a zero element
-    // array so that no results are transferred but the jump back to the correct query and its info occurs.
-    propertyTable_.put(UDDIActionInputs.SELECTED_NODEIDS,new String[0]);
-  }
-
-  public final boolean run()
-  {
-    // Transfer the results in this Query node into the property expected by the originating node.
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-
-    String[] selectedNodeIds = (String[])propertyTable_.get(UDDIActionInputs.SELECTED_NODEIDS);
-    Node currentNode = getSelectedNavigatorNode();
-    TreeElement currentElement = currentNode.getTreeElement();
-    SubQueryTransferTarget target = (SubQueryTransferTarget)(currentElement.getPropertyAsObject(UDDIModelConstants.SUBQUERY_TRANSFER_TARGET));
-    String subQueryKey = target.getSubQueryKey();
-    String targetQueryKey;
-
-    int lastSeparatorPos = subQueryKey.lastIndexOf(':');
-    if (lastSeparatorPos == -1)
-      targetQueryKey = "";
-    else
-      targetQueryKey = subQueryKey.substring(0,lastSeparatorPos);
-
-    String targetProperty = subQueryKey.substring(lastSeparatorPos+1,subQueryKey.length());
-    FormTool targetFormTool = target.getTargetFormTool();
-    ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(subQueryKey);
-    FormToolPropertiesInterface targetQueryFormToolPI = ((MultipleFormToolPropertiesInterface)targetFormTool).getFormToolProperties(targetQueryKey);
-    Vector targetList = (Vector)targetQueryFormToolPI.getProperty(targetProperty);
-    if (targetList == null)
-      targetList = new Vector();
-
-    NodeManager nodeManager = currentNode.getNodeManager();
-    for (int i=0;i<selectedNodeIds.length;i++)
-    {
-      int selectedNodeId = Integer.parseInt(selectedNodeIds[i]);
-      Node selectedNode = nodeManager.getNode(selectedNodeId);
-      TreeElement treeElement = selectedNode.getTreeElement();
-      Object object;
-      if (treeElement instanceof BusinessElement)
-        object = ((BusinessElement)treeElement).getBusinessEntity();
-      else if (treeElement instanceof ServiceElement)
-        object = ((ServiceElement)treeElement).getBusinessService();
-      else
-      {
-        // Service interface
-        object = ((ServiceInterfaceElement)treeElement).getTModel();
-      }
-      ListElement targetListElement = new ListElement(object);
-      targetListElement.setTargetViewToolInfo(selectedNodeId,selectedNode.getToolManager().getSelectedToolId(),selectedNode.getViewId());
-      if (targetProperty.equals(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_BUSINESS) || targetProperty.equals(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE))
-      {
-        // Clear the manager so a replacement occurs.
-        targetList.removeAllElements();
-      }
-      targetList.addElement(targetListElement);
-    }
-    targetQueryFormToolPI.setProperty(targetProperty,targetList);
-    Hashtable savedParentQueryProperties = target.getParentQueryData();
-    Enumeration e = savedParentQueryProperties.keys();
-    while (e.hasMoreElements())
-    {
-      String key = (String)e.nextElement();
-      targetQueryFormToolPI.setProperty(key,savedParentQueryProperties.get(key));
-    }
-
-    // Select the node and the datastructure which is the target of the subquery.
-    int targetNodeId = target.getNodeId();
-    int targetToolId = target.getToolId();
-    int targetViewId = target.getViewId();
-    int targetViewToolId = target.getViewToolId();
-    nodeManager.setSelectedNodeId(targetNodeId);
-    targetNode_ = nodeManager.getSelectedNode();
-    targetNode_.getToolManager().setSelectedToolId(targetToolId);
-    targetNode_.setViewId(targetViewId);
-    if (targetViewId != ActionInputs.VIEWID_DEFAULT)
-      targetNode_.getViewToolManager().setSelectedToolId(targetViewToolId);
-    targetFormTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,targetQueryKey);
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,SelectFindToolAction.getActionLink(targetNodeId,targetToolId,targetViewId,targetViewToolId,targetQueryKey,true));
-    return true;
-  }
-
-  public final Node getTargetNode()
-  {
-    return targetNode_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
deleted file mode 100644
index 566b0b800..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/TransferToAddCategoryDataAction.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import javax.servlet.http.*;
-
-public class TransferToAddCategoryDataAction extends Action
-{
-  public TransferToAddCategoryDataAction()
-  {
-  }
-
-  // uddi/actions/TransferToAddCategoryDataActionJSP.jsp?sessionId=...&categoryTModelKey=...
-  public static final String getActionLink(String sessionId,String categoryTModelKey)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/TransferToAddCategoryDataActionJSP.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId).append('&').append(UDDIActionInputs.CATEGORY_TMODEL_KEY).append('=').append(categoryTModelKey);
-    return actionLink.toString();
-  }
-  
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
deleted file mode 100644
index 69160696e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*;
-
-import org.uddi4j.datatype.service.BusinessService;
-
-import javax.servlet.http.*;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-
-import java.util.*;
-import java.net.*;
-import java.io.*;
-
-public class UDDIAddToWSDLPerspectiveAction extends LinkAction
-{
-  public UDDIAddToWSDLPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-  {
-    StringBuffer actionLink = new StringBuffer("uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeId);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolId);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewId);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolId);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String nodeIdString = request.getParameter(ActionInputs.NODEID);
-    // Perform data validation.
-    try
-    {
-      Integer.parseInt(nodeIdString);
-    }
-    catch (NumberFormatException e)
-    {
-      // Validation failed!
-      return false;
-    }
-    propertyTable_.put(ActionInputs.NODEID,nodeIdString);
-    return true;
-  }
-
-  public boolean run()
-  {
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-    Node node = nodeManager.getNode(nodeId);
-    TreeElement element = node.getTreeElement();
-    if (element instanceof ServiceElement)
-    {
-      ServiceElement serviceElement = (ServiceElement)element;
-      BusinessService bs = serviceElement.getBusinessService();
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      String wsdlURL = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
-      if (wsdlURL == null)
-      {
-        try
-        {
-          Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-          File tempFile = File.createTempFile("temp",".wsdl");
-          UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
-          action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
-          wsdlURL = tempFile.toURL().toString();
-        }
-        catch (WSDLException e)
-        {
-          wsdlURL = null;
-        }
-        catch (MalformedURLException e)
-        {
-          wsdlURL = null;
-        }
-        catch (IOException e)
-        {
-          wsdlURL = null;
-        }
-      }
-        
-      if (wsdlURL != null)
-      {
-        OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-        Hashtable propertyTable = openWSDLAction.getPropertyTable();
-        propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL,wsdlURL);
-        boolean actionResult = openWSDLAction.run();
-        if (actionResult) {
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_WSDL_ADDED_TO_WSDL_PERSPECTIVE",wsdlURL));
-          return true;
-        }
-      }
-    }
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_WSDL_NOT_ADDED_TO_WSDL_PERSPECTIVE"));
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
deleted file mode 100644
index f0b281f16..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-
-import java.io.*;
-import javax.wsdl.Definition;
-
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
-  private NodeManager nodeManager_;
-  private Definition def_;
-  private String defaultWSDLFileName_;
-
-  public UDDIImportWSDLToFileSystemAction(Controller controller)
-  {
-    super(controller);
-    nodeManager_ = controller.getUDDIPerspective().getNavigatorManager();
-    def_ = null;
-    defaultWSDLFileName_ = "temp.wsdl";
-  }
-
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-  {
-    return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp");
-  }
-
-  public final boolean write(OutputStream os)
-  {
-    return writeWSDLDefinition(os,def_);
-  }
-
-  public final String getDefaultFileName()
-  {
-    return defaultWSDLFileName_;
-  }
-
-  public final boolean run()
-  {
-    MessageQueue messageQueue = controller_.getUDDIPerspective().getMessageQueue();
-    int nodeId = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node node = nodeManager_.getNode(nodeId);
-    Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-    String wsdlUrl = null;
-    if (node != null)
-    {
-      TreeElement element = node.getTreeElement();
-      if (element instanceof ServiceElement)
-      {
-        ServiceElement serviceElement = (ServiceElement)element;
-        BusinessService bs = serviceElement.getBusinessService();
-        wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
-      }
-      else if (element instanceof ServiceInterfaceElement)
-      {
-        TModel tModel = ((ServiceInterfaceElement)element).getTModel();
-        wsdlUrl = uddi4jHelper.getWSDL(tModel);
-      }
-    }
-    if (wsdlUrl != null)
-    {
-      try
-      {
-        def_ = uddi4jHelper.getWSDLDefinition(wsdlUrl);
-        if (def_ != null)
-        {
-          String wsdlPathname;
-          int index = wsdlUrl.indexOf('/');
-          if (index != -1)
-            wsdlPathname = wsdlUrl.substring(index+1, wsdlUrl.length());
-          else
-            wsdlPathname = wsdlUrl;
-          defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlPathname);
-        }
-        return true;
-      }
-      catch (Throwable t)
-      {
-        messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
-      }
-    }
-    return false;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getUDDIPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getUDDIPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
deleted file mode 100644
index 083435a37..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-import java.util.Hashtable;
-
-public class UDDIImportWSDLToWorkbenchAction extends ImportToWorkbenchAction
-{
-  public UDDIImportWSDLToWorkbenchAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-    public ImportToFileSystemAction newImportToFileSystemAction() {
-        UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
-        Hashtable table = action.getPropertyTable();
-
-        UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-        NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-
-        table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-
-        return action;
-    }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getUDDIPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getUDDIPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
deleted file mode 100644
index b290772f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDILaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import java.io.*;
-import javax.wsdl.Definition;
-
-public class UDDILaunchWebServiceWizardAction extends LaunchWebServiceWizardAction
-{
-  public UDDILaunchWebServiceWizardAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    return (FormTool)uddiPerspective.getNavigatorManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-  public boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager nodeManager = uddiPerspective.getNavigatorManager();
-    Node node = nodeManager.getSelectedNode();
-    TreeElement element = node.getTreeElement();
-    Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-    String wsdlUrl = null;
-    if (element instanceof ServiceElement)
-    {
-      ServiceElement serviceElement = (ServiceElement)element;
-      BusinessService bs = serviceElement.getBusinessService();
-      wsdlUrl = uddi4jHelper.getWSDL(bs, serviceElement.getRegistryElement().getProxy());
-    }
-    else if (element instanceof ServiceInterfaceElement)
-    {
-      TModel tModel = ((ServiceInterfaceElement)element).getTModel();
-      wsdlUrl = uddi4jHelper.getWSDL(tModel);
-    }
-
-    try
-    {
-      if (wsdlUrl != null)
-      {
-        Definition def = uddi4jHelper.getWSDLDefinition(wsdlUrl);
-        File tempFile = File.createTempFile("temp",".wsdl");
-        UDDIImportWSDLToFileSystemAction action = new UDDIImportWSDLToFileSystemAction(controller_);
-        action.writeWSDLDefinition(new FileOutputStream(tempFile),def);
-        wsdlUrl = tempFile.toURL().toString();
-        return launchWizard(wsdlUrl);
-      }
-    }
-    catch (Throwable t)
-    {
-      messageQueue.addMessage(controller_.getMessage("MSG_ERROR_RETRIEVING_WSDL_DOC"));
-    }
-    return false;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getUDDIPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getUDDIPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
deleted file mode 100644
index d21e58239..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDINodeAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-public abstract class UDDINodeAction extends NodeAction
-{
-  protected RegistryNode regNode_;
-  public UDDINodeAction(Controller controller)
-  {
-    super(controller,controller.getUDDIPerspective().getNavigatorManager());
-    regNode_ = getRegistryNode();
-  }
-
-  public final Node getSelectedNavigatorNode()
-  {
-    Node selectedNavigatorNode = nodeManager_.getSelectedNode();
-    return selectedNavigatorNode;
-  }
-
-  public final RegistryNode getRegistryNode()
-  {
-    UDDIMainNode uddiMainNode = (UDDIMainNode)nodeManager_.getRootNode();
-    return uddiMainNode.getRegistryNode(getSelectedNavigatorNode());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
deleted file mode 100644
index 4dd19b6bf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UDDIPropertiesFormAction.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-
-public abstract class UDDIPropertiesFormAction extends FormAction
-{
-  protected NodeManager navigatorManager_;
-  public UDDIPropertiesFormAction(Controller controller)
-  {
-    super(controller);
-    navigatorManager_ = controller.getUDDIPerspective().getNavigatorManager();
-  }
-
-  public final Node getSelectedNavigatorNode()
-  {
-    return navigatorManager_.getSelectedNode();
-  }
-
-  public final FormTool getSelectedFormTool()
-  {
-    return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
-  }
-
-  public final RegistryNode getRegistryNode()
-  {
-    return getRegistryNode(getSelectedNavigatorNode());
-  }
-
-  public final RegistryNode getRegistryNode(Node registryChildNode)
-  {
-    UDDIMainNode uddiMainNode = (UDDIMainNode)navigatorManager_.getRootNode();
-    return uddiMainNode.getRegistryNode(registryChildNode);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
deleted file mode 100644
index b3cca2804..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UnpublishAction.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.response.*;
-import org.uddi4j.*;
-import org.uddi4j.client.UDDIProxy;
-
-import java.net.*;
-
-public class UnpublishAction extends UDDIPropertiesFormAction
-{
-  protected RegistryNode registryNode_;
-  protected boolean isLoggedIn_;
-
-  public UnpublishAction(Controller controller)
-  {
-    super(controller);
-    registryNode_ = getRegistryNode();
-  }
-
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    RegistryElement regElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-
-    // if not yet logged in, validate the parameters needed to log in
-    if (!regElement.isLoggedIn())
-    {
-      String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-
-      boolean inputsValid = true;
-      if (publishURL != null)
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL, publishURL);
-        
-      if (!Validator.validateURL(publishURL))
-      {
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        inputsValid = false;
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-      }
-
-      if (userId != null)
-        propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-        
-      if (!Validator.validateString(userId))
-      {
-        formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        inputsValid = false;
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-      }
-
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD, password);
-      
-      formTool.updatePropertyTable(propertyTable_);
-
-      return inputsValid;
-    }
-
-    return true;
-  }
-
-  public boolean run()
-  {
-    RegistryElement registryElement = (RegistryElement)registryNode_.getTreeElement();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    NodeManager navigatorManager = uddiPerspective.getNavigatorManager();
-    Node selectedNode = navigatorManager.getSelectedNode();
-    TreeElement selectedElement = selectedNode.getTreeElement();
-
-    try
-    {
-      if (!registryElement.isLoggedIn())
-      {
-        // if not yet logged in, log in first
-        String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-        String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-        String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-        
-        registryElement.performLogin(publishURL,userId,password);
-      }
-
-      String selectedElementKey = selectedElement.getKey();
-      String unpublishTypeMessageKey = null;
-      UDDIProxy proxy = registryElement.getProxy();
-      String authInfo = registryElement.getAuthInfoString();
-      DispositionReport dr = null;
-      if (selectedElement instanceof BusinessElement)
-      {
-        unpublishTypeMessageKey = "MSG_INFO_BUSINESS_UNPUBLISHED";
-        dr = proxy.delete_business(authInfo,selectedElementKey);
-      }
-      else if (selectedElement instanceof ServiceElement)
-      {
-        unpublishTypeMessageKey = "MSG_INFO_SERVICE_UNPUBLISHED";
-        dr = proxy.delete_service(authInfo,selectedElementKey);
-      }
-      else if (selectedElement instanceof ServiceInterfaceElement)
-      {
-        unpublishTypeMessageKey = "MSG_INFO_SERVICE_INTERFACE_UNPUBLISHED";
-        dr = proxy.delete_tModel(authInfo,selectedElementKey);
-      }
-      if (!dr.success())
-        throw new Exception(dr.toString());
-      else
-      {
-        selectedElement.disconnectAll();
-        messageQueue.addMessage(uddiPerspective.getMessage(unpublishTypeMessageKey,selectedElement.getName()));
-        return true;
-      }
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-      return false;
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-      return false;
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-      return false;
-    }
-    catch (Exception e)
-    {
-      handleUnexpectedException(uddiPerspective, messageQueue, "Exception", e);
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
deleted file mode 100644
index 2bfbb9958..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateAction.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.MultipartFormDataParserTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import java.util.*;
-
-public abstract class UpdateAction extends UDDIPropertiesFormAction
-{
-  protected RegistryNode regNode_;
-  private boolean requiresAuthentication_;
-  public UpdateAction(Controller controller,boolean requiresAuthentication)
-  {
-    super(controller);
-    regNode_ = getRegistryNode();
-    requiresAuthentication_ = requiresAuthentication;
-  }
-  
-  protected abstract boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException;
-  
-  protected final boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    // Setup for MultipartFormDataParserTransformer
-    propertyTable_.put(ActionInputs.MULTIPART_FORM_DATA_PARSER, parser);
-
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    FormTool formTool = getSelectedFormTool();
-    FormToolPropertiesInterface formToolPI = formTool;
-    formToolPI.clearErrors();
-    boolean inputsValid = processOthers(parser,formToolPI);
-    for (int i=0;i<removedProperties_.size();i++)
-      formToolPI.removeProperty(removedProperties_.elementAt(i));
-    formToolPI.updatePropertyTable(propertyTable_);
-    
-    String publishURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-    String userId = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-    String password = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    
-    boolean validateAuthentication = !regElement.isLoggedIn() & requiresAuthentication_;
-    
-    if (publishURL != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    }
-    
-    if (validateAuthentication && !Validator.validateString(publishURL))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_PUBLISH_URL"));
-    }
-    
-    if (userId != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    }
-    
-    if (validateAuthentication && !Validator.validateString(userId))
-    {
-      inputsValid = false;
-      formTool.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USERID"));
-    }
-    
-    if (password != null)
-    {
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-      formTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    }
-    
-    return inputsValid;
-  }
-
-  public abstract boolean refreshFromRegistry();
-  
-  protected final void refreshNode(BusinessEntity be)
-  {
-    Node node = getSelectedNavigatorNode();
-    Node parentNode = node.getParent();
-    TreeElement element = node.getTreeElement();
-    element.disconnectAll();
-    BusinessElement newBusinessElement = new BusinessElement(be,regNode_.getTreeElement().getModel());
-    connectElements(parentNode,newBusinessElement);
-  }
-  
-  protected final void refreshNode(BusinessService bs)
-  {
-    Node node = getSelectedNavigatorNode();
-    Node parentNode = node.getParent();
-    TreeElement element = node.getTreeElement();
-    element.disconnectAll();
-    ServiceElement newServiceElement = new ServiceElement(bs,regNode_.getTreeElement().getModel());
-    connectElements(parentNode,newServiceElement);
-  }
-  
-  protected final void refreshNode(TModel tModel)
-  {
-    Node node = getSelectedNavigatorNode();
-    Node parentNode = node.getParent();
-    TreeElement element = node.getTreeElement();
-    element.disconnectAll();
-    ServiceInterfaceElement newServiceInterfaceElement = new ServiceInterfaceElement(tModel,regNode_.getTreeElement().getModel());
-    connectElements(parentNode,newServiceInterfaceElement);
-  }
-  
-  private final void connectElements(Node parentNode,TreeElement newElement)
-  {
-    TreeElement parentElement = parentNode.getTreeElement();
-    String rel = null;
-    if (parentNode instanceof PublishedItemsNode)
-      rel = UDDIModelConstants.REL_PUBLISHED_ITEMS;
-    else
-    {
-      // QueryNode
-      rel = UDDIModelConstants.REL_QUERY_RESULTS;
-    }
-    parentElement.connect(newElement,rel,ModelConstants.REL_OWNER);
-    Node newNode = parentNode.getChildNode(newElement);
-    int newNodeId = newNode.getNodeId();
-    NodeManager nodeManager = parentNode.getNodeManager();
-    nodeManager.setSelectedNodeId(newNodeId);
-    ToolManager toolManager = newNode.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    addToHistory(ActionInputs.PERSPECTIVE_UDDI,selectedTool.getSelectToolActionHref(true));
-  }
-    
-  protected final void reindexListElementVector(Vector v)
-  {
-    for (int i=0;i<v.size();i++)
-    {
-      ListElement listElement = (ListElement)v.elementAt(i);
-      listElement.setViewId(i);
-      // targetViewId determines whether or not a successfully validated list element remains in edit state.
-    }
-  }
-  
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new MultipartFormDataParserTransformer(controller_);
-    return transformers;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
deleted file mode 100644
index 64086bc4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateBusinessAction.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.*;
-import org.uddi4j.util.*;
-
-import java.util.*;
-import java.net.*;
-
-public class UpdateBusinessAction extends UpdateAction
-{
-  private boolean isUpdate_;
-  public UpdateBusinessAction(Controller controller)
-  {
-    super(controller,true);
-    isUpdate_ = true;
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-    String[] discoveryURLModifiedStates = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_MODIFIED);
-    String[] discoveryURLViewIds = parser.getParameterValues(UDDIActionInputs.DISCOVERYURL_VIEWID);
-    String[] discoveryURLs = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DISCOVERYURL);
-    String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
-    String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
-    String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
-    String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
-    String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidKey);
-    
-    
-    if (discoveryURLModifiedStates != null && discoveryURLViewIds != null && discoveryURLs != null)
-    {
-      Vector oldDiscoveryURLListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-      Vector newDiscoveryURLListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DISCOVERYURL");
-      for (int i=0;i<discoveryURLs.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        DiscoveryURL discoveryURL = new DiscoveryURL(discoveryURLs[i],"");
-        if (!Validator.validateURL(discoveryURLs[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int discoveryURLViewId = Integer.parseInt(discoveryURLViewIds[i]);
-        boolean isModified = Boolean.valueOf(discoveryURLModifiedStates[i]).booleanValue();
-        
-        if (discoveryURLViewId == -1 || isModified)
-          newDiscoveryURLListElementVector.addElement(new ListElement(discoveryURL));
-        else
-          newDiscoveryURLListElementVector.addElement(oldDiscoveryURLListElementVector.elementAt(discoveryURLViewId));     
-      }
-      reindexListElementVector(newDiscoveryURLListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,newDiscoveryURLListElementVector);       
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-    
-    Hashtable languageHash = new Hashtable();
-    if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
-    {
-      Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      Vector newNameListElementVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(names[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int nameViewId = Integer.parseInt(nameViewIds[i]);
-        boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-      
-        if (nameViewId == -1 || isModified)
-          newNameListElementVector.addElement(new ListElement(uddi4jName));
-        else
-          newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
-      }
-      reindexListElementVector(newNameListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,newNameListElementVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-    }
-    
-    if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
-    {
-      Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      Vector newDescriptionListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(descriptions[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
-        boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-      
-        if (descriptionViewId == -1 || isModified)
-          newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
-        else
-          newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
-      }
-      reindexListElementVector(newDescriptionListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,newDescriptionListElementVector);      
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      
-    if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      Vector newIdListElementVector = new Vector();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        int idViewId = Integer.parseInt(idViewIds[i]);
-        boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
-        if (idViewId == -1 || isModified)
-          newIdListElementVector.addElement(new ListElement(kr));
-        else
-          newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
-      }
-      reindexListElementVector(newIdListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,newIdListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      
-    if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      Vector newCatListElementVector = new Vector();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        int catViewId = Integer.parseInt(catViewIds[i]);
-        boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
-        if (catViewId == -1 || isModified)
-          newCatListElementVector.addElement(new ListElement(kr));
-        else
-          newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
-      }
-      reindexListElementVector(newCatListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,newCatListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);            
-    return inputsValid;
-  }
-
-  public final boolean refreshFromRegistry()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-    try
-    {
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      Vector beVector = proxy.get_businessDetail(uuidKey).getBusinessEntityVector();
-      BusinessEntity be;
-      if (beVector.size() > 0)
-        be = (BusinessEntity)beVector.get(0);
-      else
-        be = null;
-      if (be != null)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,be);
-        return true;
-      }
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    isUpdate_ = false;
-    return false;
-  }
-    
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_OBJECT);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      Vector discoveryURLListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS);
-      Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES);
-      Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS);
-      Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS);
-      Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES);
-      
-      Vector discoveryURLVector = new Vector();
-      if (discoveryURLListElementVector != null)
-      {
-        for (int i=0;i<discoveryURLListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)discoveryURLListElementVector.elementAt(i);
-          DiscoveryURL discoveryURL = (DiscoveryURL)listElement.getObject();
-          discoveryURLVector.addElement(discoveryURL);
-        }
-      }
-        
-      Vector nameVector = new Vector();
-      for (int i=0;i<nameListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
-        Name name = (Name)listElement.getObject();
-        nameVector.addElement(name);
-      }
-      
-      Vector descriptionVector = null;
-      if (descriptionListElementVector != null)
-      {
-        descriptionVector = new Vector();
-        for (int i=0;i<descriptionListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-          Description description = (Description)listElement.getObject();
-          descriptionVector.addElement(description);
-        }
-      }
-      
-      IdentifierBag idBag = null;
-      if (idListElementVector != null)
-      {
-        idBag = new IdentifierBag();
-        for (int i=0;i<idListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)idListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          idBag.add(kr);
-        }
-      }
-      
-      CategoryBag catBag = null;
-      if (catListElementVector != null)
-      {
-        catBag = new CategoryBag();
-        for (int i=0;i<catListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          catBag.add(kr);
-        }
-      }
-
-      if (discoveryURLVector.size() > 0)
-        be.setDiscoveryURLs(new DiscoveryURLs(discoveryURLVector));
-      else
-        be.setDiscoveryURLs(null);
-      be.setNameVector(nameVector);
-      be.setDescriptionVector(descriptionVector);
-      be.setIdentifierBag(idBag);
-      be.setCategoryBag(catBag);
-      
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-      Vector beVector = new Vector();
-      beVector.add(be);
-      be = (BusinessEntity)proxy.save_business(regElement.getAuthInfoString(), beVector).getBusinessEntityVector().get(0);
-      refreshNode(be);
-      if (isUpdate_)      
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_UPDATED",be.getDefaultNameString()));
-      else
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_BUSINESS_PUBLISHED",be.getDefaultNameString()));
-      return true;
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
deleted file mode 100644
index acc9a12f2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateRegistryAction.java
+++ /dev/null
@@ -1,122 +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.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import java.text.*;
-import java.io.*;
-
-public class UpdateRegistryAction extends UpdateAction
-{
-  public UpdateRegistryAction(Controller controller)
-  {
-    super(controller,false);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-    String[] userDefinedCategoryTModelKeys = parser.getParameterValues(UDDIActionInputs.CATEGORY_TMODEL_KEY);
-    String[] userDefinedCategoryData = parser.getParameterValues(UDDIActionInputs.CATEGORY_FILENAME);
-    
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (nameModifiedState != null && name != null)
-    {
-      boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
-      String newName;
-      if (isModified)
-        newName = name;
-      else
-        newName = (String)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,newName);
-      if (!Validator.validateString(name))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-    
-    if (userDefinedCategoryTModelKeys != null && userDefinedCategoryData != null)
-    {
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      for (int i=0;i<userDefinedCategoryTModelKeys.length;i++)
-      {
-        CategoryModel userDefinedCategory = regElement.getUserDefinedCategory(userDefinedCategoryTModelKeys[i]);
-//      TODO: Move UDDIPreferenceContext down to org.eclipse.wst.ws 
-//      UDDIPreferenceContext context = WebServicePlugin.getInstance().getUDDIPreferenceContext();        
-//      userDefinedCategory.setColumnDelimiter(context.getUddiCatDataColumnDelimiter());
-//      userDefinedCategory.setStringDelimiter(context.getUddiCatDataStringDelimiter());
-        userDefinedCategory.setColumnDelimiter("#");
-        userDefinedCategory.setStringDelimiter("\"");
-        String displayName = userDefinedCategory.getDisplayName();
-        if (userDefinedCategoryData[i] == null || userDefinedCategoryData[i].length() < 1)
-        {
-          inputsValid = false;
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE",displayName));
-          formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
-        }
-        else
-        {
-          byte rc = userDefinedCategory.loadData(new BufferedReader(new StringReader(userDefinedCategoryData[i])));
-          switch (rc)
-          {
-            case CategoryModel.OPERATION_SUCCESSFUL:
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_USER_DEFINED_CATEGORY_DATA_LOADED",displayName));
-              break;
-            case CategoryModel.ERROR_FILE:
-              inputsValid = false;
-              ParseException pe = (ParseException)userDefinedCategory.getErrorException();
-              String[] args1 = {String.valueOf(pe.getErrorOffset()),displayName,pe.getMessage(),userDefinedCategory.getCategoryKey()};
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_FORMAT",args1));
-              formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);
-              break;              
-            case CategoryModel.ERROR_CATEGORY_KEY:
-            default:
-              inputsValid = false;
-              String[] args2 = {displayName,userDefinedCategory.getErrorException().getMessage(),userDefinedCategory.getCategoryKey()};
-              messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_USER_DEFINED_CATEGORY_DATA_FILE_KEY",args2));
-              formToolPI.flagRowError(UDDIActionInputs.USER_DEFINED_CATEGORIES,userDefinedCategoryTModelKeys[i]);              
-          }
-        }
-      }
-    }
-    return inputsValid;
-  }
-
-  public final boolean refreshFromRegistry()
-  {
-    return true;
-  }
-  
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    String name = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME);
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-    regElement.setName(name);
-    regNode_.getTreeElement().setName(name);
-    messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_REGISTRY_UPDATED",name));
-    return true;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
deleted file mode 100644
index 9ee5dab54..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceAction.java
+++ /dev/null
@@ -1,483 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.*;
-import org.uddi4j.response.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.*;
-import org.uddi4j.UDDIException;
-
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import java.util.*;
-import java.net.*;
-
-public class UpdateServiceAction extends UpdateAction
-{
-  private boolean isUpdate_;
-  public UpdateServiceAction(Controller controller)
-  {
-    super(controller,true);
-    isUpdate_ = true;
-  }
-
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidBusinessKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-    String uuidServiceKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-    String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
-    String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-    String[] nameModifiedStates = parser.getParameterValues(UDDIActionInputs.NAME_MODIFIED);
-    String[] nameViewIds = parser.getParameterValues(UDDIActionInputs.NAME_VIEWID);
-    String[] nameLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME_LANGUAGE);
-    String[] names = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_NAME);
-    String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
-    String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
-    String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-
-    if (uuidBusinessKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,uuidBusinessKey);
-
-    if (uuidServiceKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,uuidServiceKey);
-
-    if (wsdlURLModifiedState != null && wsdlURL != null)
-    {
-      ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
-      if (isModified)
-        wsdlURLListElement = new ListElement(wsdlURL);
-      else
-        wsdlURL = (String)wsdlURLListElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,wsdlURLListElement);
-      if (!Validator.validateURL(wsdlURL))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-
-    Hashtable languageHash = new Hashtable();
-    if (nameModifiedStates != null && nameViewIds != null && nameLanguages != null && names != null)
-    {
-      Vector oldNameListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      Vector newNameListElementVector = new Vector();
-      // UDDI's save API (Appendix C of the UDDI V2 Programmers API Specification) requires the following:
-      // 1) Only the first row can have a blank language.
-      // 2) Only 1 name per language.
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_NAME");
-      for (int i=0;i<names.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Name uddi4jName;
-        if (nameLanguages[i].length() > 0)
-          uddi4jName = new Name(names[i],nameLanguages[i]);
-        else
-        {
-          uddi4jName = new Name(names[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(nameLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(nameLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(names[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-
-        int nameViewId = Integer.parseInt(nameViewIds[i]);
-        boolean isModified = Boolean.valueOf(nameModifiedStates[i]).booleanValue();
-
-        if (nameViewId == -1 || isModified)
-          newNameListElementVector.addElement(new ListElement(uddi4jName));
-        else
-          newNameListElementVector.addElement(oldNameListElementVector.elementAt(nameViewId));
-      }
-      reindexListElementVector(newNameListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,newNameListElementVector);
-    }
-    else
-    {
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      inputsValid = false;
-      formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_NO_NAMES"));
-    }
-
-    if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
-    {
-      Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-      Vector newDescriptionListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(descriptions[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-
-        int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
-        boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-
-        if (descriptionViewId == -1 || isModified)
-          newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
-        else
-          newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
-      }
-      reindexListElementVector(newDescriptionListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,newDescriptionListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-
-    if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-      Vector newCatListElementVector = new Vector();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        int catViewId = Integer.parseInt(catViewIds[i]);
-        boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
-        if (catViewId == -1 || isModified)
-          newCatListElementVector.addElement(new ListElement(kr));
-        else
-          newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
-      }
-      reindexListElementVector(newCatListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,newCatListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-    return inputsValid;
-  }
-
-  public final boolean refreshBusinessFromRegistry()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    uddiPerspective.getMessageQueue();
-    try
-    {
-      String uuidBusinessKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      Vector beVector = proxy.get_businessDetail(uuidBusinessKey).getBusinessEntityVector();
-      BusinessEntity be;
-      if (beVector.size() > 0)
-        be = (BusinessEntity)beVector.get(0);
-      else
-        be = null;
-      if (be != null)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_BUSINESS,be);
-        return true;
-      }
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    return false;
-  }
-  
-  public final boolean refreshFromRegistry()
-  {
-    controller_.getUDDIPerspective();
-    try
-    {
-      String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      ServiceDetail serviceDetail = proxy.get_serviceDetail(uuidServiceKey);
-      Vector businessServiceVector = serviceDetail.getBusinessServiceVector();
-      if (businessServiceVector.size() > 0)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,businessServiceVector.elementAt(0));
-        return true;
-      }
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    isUpdate_ = false;
-    return false;
-  }
-  
-  public final RegPublishTool setupRegPublishTool()
-  {
-    // Prepare for re-publishing a now-stale service whose business has also been eliminated.
-    RegPublishTool regPublishTool = regNode_.getRegPublishTool();
-    regPublishTool.setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,String.valueOf(UDDIActionInputs.QUERY_STYLE_ADVANCED));
-    
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL));
-    
-    Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-    Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-    Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-    
-    Vector nameVector = new Vector();
-    for (int i=0;i<nameListElementVector.size();i++)
-    {
-      ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
-      Name name = (Name)listElement.getObject();
-      nameVector.addElement(name);
-    }
-    
-    Vector descriptionVector = null;
-    if (descriptionListElementVector != null)
-    {
-      descriptionVector = new Vector();
-      for (int i=0;i<descriptionListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-        Description description = (Description)listElement.getObject();
-        descriptionVector.addElement(description);
-      }
-    }
-    else
-      regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-    
-    CategoryBag catBag = null;
-    if (catListElementVector != null)
-    {
-      catBag = new CategoryBag();
-      for (int i=0;i<catListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-        KeyedReference kr = (KeyedReference)listElement.getObject();
-        catBag.add(kr);
-      }
-    }
-    else
-      regPublishTool.removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-    
-    regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-    if (descriptionVector != null)
-      regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-    if (catBag != null)
-      regPublishTool.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catBag);
-    return regPublishTool;
-  }
-
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();    
-    try
-    {
-      BusinessEntity be = (BusinessEntity)propertyTable_.get(UDDIActionInputs.LATEST_BUSINESS);
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      String uuidServiceKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY);
-      ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-      Vector nameListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES);
-      Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS);
-      Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES);
-
-      String wsdlURL = (String)wsdlURLListElement.getObject();
-            
-      Vector nameVector = new Vector();
-      for (int i=0;i<nameListElementVector.size();i++)
-      {
-        ListElement listElement = (ListElement)nameListElementVector.elementAt(i);
-        Name name = (Name)listElement.getObject();
-        nameVector.addElement(name);
-      }
-
-      Vector descriptionVector = null;
-      if (descriptionListElementVector != null)
-      {
-        descriptionVector = new Vector();
-        for (int i=0;i<descriptionListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-          Description description = (Description)listElement.getObject();
-          descriptionVector.addElement(description);
-        }
-      }
-
-      CategoryBag catBag = null;
-      if (catListElementVector != null)
-      {
-        catBag = new CategoryBag();
-        for (int i=0;i<catListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          catBag.add(kr);
-        }
-      }
-
-      if (!regElement.isLoggedIn())
-      	regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-
-      // Note: The JSP will prevent this routine from executing if be is null.
-      Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-      Definition def = uddi4jHelper.getWSDLDefinition(wsdlURL);
-      
-      // Publish/update the service interfaces first.
-      RegPublishServiceInterfaceSimpleAction regPublishSIAction = new RegPublishServiceInterfaceSimpleAction(controller_);
-      int currentNodeId = getSelectedNavigatorNode().getNodeId();
-      NodeManager nodeManager = regNode_.getNodeManager();
-
-      Hashtable tModelsTable = new Hashtable();
-      TModel[] tModels = null;
-      if (uddi4jHelper.isMonolithicWSDL(def))
-      {
-      	tModels = new TModel[1];
-      	tModels[0] = uddi4jHelper.newTModel(wsdlURL, def);
-      }
-      else
-      {
-      	String[] imports = uddi4jHelper.getImports(def, wsdlURL);
-      	tModels = new TModel[imports.length];
-      	for (int i = 0; i < tModels.length; i++)
-      	  tModels[i] = uddi4jHelper.newTModel(imports[i]);
-      }
-      
-      if (tModels != null)
-      {
-      	for (int i=0;i<tModels.length;i++)
-      	{
-      	  boolean inputsValid = regPublishSIAction.populatePropertyTable(uddi4jHelper.getWSDL(tModels[i]), tModels[i]);
-      	  if (inputsValid)
-      	  {
-      	    regPublishSIAction.run();
-      	    Object savedTModel = regPublishSIAction.getPropertyTable().get(UDDIActionInputs.QUERY_OUTPUT_SAVED_TMODEL);
-      	    if (savedTModel != null)
-            {
-      	      tModelsTable.put(((TModel)savedTModel).getNameString(), savedTModel);
-      	    }
-            // Reselect the current node.
-      	    nodeManager.setSelectedNodeId(currentNodeId);
-          }
-      	}
-      }
-      
-      BusinessService busService = uddi4jHelper.newBusinessService(wsdlURL, def, tModelsTable);
-      if (isUpdate_)
-        busService.setServiceKey(uuidServiceKey);
-      busService.setBusinessKey(be.getBusinessKey());
-      busService.setNameVector(nameVector);
-      busService.setDescriptionVector(descriptionVector);
-      busService.setCategoryBag(catBag);
-      regElement.handlePreInvocation(busService);      
-      Vector bsVector = new Vector();
-      bsVector.add(busService);
-      busService = (BusinessService)proxy.save_service(regElement.getAuthInfoString(), bsVector).getBusinessServiceVector().get(0);
-      refreshNode(busService);
-      if (isUpdate_)
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_UPDATED",busService.getDefaultNameString()));
-      else
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_PUBLISHED",busService.getDefaultNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }    
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
deleted file mode 100644
index 70d78395b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/actions/UpdateServiceInterfaceAction.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.*;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.response.*;
-import org.uddi4j.util.*;
-import org.uddi4j.UDDIException;
-
-import javax.wsdl.WSDLException;
-import java.util.*;
-import java.net.*;
-
-public class UpdateServiceInterfaceAction extends UpdateAction
-{
-  private boolean isUpdate_;
-  public UpdateServiceInterfaceAction(Controller controller)
-  {
-    super(controller,true);
-    isUpdate_ = true;
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser,FormToolPropertiesInterface formToolPI) throws MultipartFormDataException
-  {
-    String uuidKey = parser.getParameter(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-    String wsdlURLModifiedState = parser.getParameter(UDDIActionInputs.WSDL_URL_MODIFIED);
-    String wsdlURL = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-    String nameModifiedState = parser.getParameter(UDDIActionInputs.NAME_MODIFIED);
-    String name = parser.getParameter(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-    String[] descriptionModifiedStates = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_MODIFIED);
-    String[] descriptionViewIds = parser.getParameterValues(UDDIActionInputs.DESCRIPTION_VIEWID);
-    String[] descriptionLanguages = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE);
-    String[] descriptions = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_DESCRIPTION);
-    String[] idModifiedStates = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_MODIFIED);
-    String[] idViewIds = parser.getParameterValues(UDDIActionInputs.IDENTIFIER_VIEWID);
-    String[] idTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE);
-    String[] idKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME);
-    String[] idKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE);
-    String[] catModifiedStates = parser.getParameterValues(UDDIActionInputs.CATEGORY_MODIFIED);
-    String[] catViewIds = parser.getParameterValues(UDDIActionInputs.CATEGORY_VIEWID);
-    String[] catTypes = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_TYPE);
-    String[] catKeyNames = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME);
-    String[] catKeyValues = parser.getParameterValues(UDDIActionInputs.QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE);
-    
-    boolean inputsValid = true;
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    
-    if (uuidKey != null)
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,uuidKey);
-    
-    if (wsdlURLModifiedState != null && wsdlURL != null)
-    {
-      ListElement wsdlURLListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);      
-      boolean isModified = Boolean.valueOf(wsdlURLModifiedState).booleanValue();
-      if (isModified)
-        wsdlURLListElement = new ListElement(wsdlURL);
-      else
-        wsdlURL = (String)wsdlURLListElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,wsdlURLListElement);
-      if (!Validator.validateURL(wsdlURL))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_WSDL_URL"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-    
-    if (nameModifiedState != null && name != null)
-    {
-      ListElement nameListElement = (ListElement)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      boolean isModified = Boolean.valueOf(nameModifiedState).booleanValue();
-      if (isModified)
-        nameListElement = new ListElement(name);
-      else
-        name = (String)nameListElement.getObject();
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
-      if (!Validator.validateString(name))
-      {
-        inputsValid = false;
-        formToolPI.flagError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_INVALID_NAME"));
-      }
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      
-    Hashtable languageHash = new Hashtable();
-    if (descriptionModifiedStates != null && descriptionViewIds != null && descriptionLanguages != null && descriptions != null)
-    {
-      Vector oldDescriptionListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      Vector newDescriptionListElementVector = new Vector();
-      String[] parameters = new String[2];
-      parameters[0] = uddiPerspective.getMessage("FORM_LABEL_DESCRIPTION");
-      languageHash.clear();
-      for (int i=0;i<descriptions.length;i++)
-      {
-        parameters[1] = String.valueOf(i+1);
-        Description uddi4jDescription;
-        if (descriptionLanguages[i].length() > 0)
-          uddi4jDescription = new Description(descriptions[i],descriptionLanguages[i]);
-        else
-        {
-          uddi4jDescription = new Description(descriptions[i]);
-          if (i != 0)
-          {
-            inputsValid = false;
-            formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-            messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_BLANK_LANGUAGE",parameters));
-          }
-        }
-        if (languageHash.get(descriptionLanguages[i]) != null)
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_DUPLICATE_LANGUAGE",parameters));
-        }
-        else
-          languageHash.put(descriptionLanguages[i],Boolean.TRUE);
-        if (!Validator.validateString(descriptions[i]))
-        {
-          inputsValid = false;
-          formToolPI.flagRowError(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,i);
-          messageQueue.addMessage(uddiPerspective.getMessage("MSG_ERROR_ROW_INVALID_TEXT",parameters));
-        }
-        
-        int descriptionViewId = Integer.parseInt(descriptionViewIds[i]);
-        boolean isModified = Boolean.valueOf(descriptionModifiedStates[i]).booleanValue();
-      
-        if (descriptionViewId == -1 || isModified)
-          newDescriptionListElementVector.addElement(new ListElement(uddi4jDescription));
-        else
-          newDescriptionListElementVector.addElement(oldDescriptionListElementVector.elementAt(descriptionViewId));
-      }
-      reindexListElementVector(newDescriptionListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,newDescriptionListElementVector);      
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      
-    if (idModifiedStates != null && idViewIds != null && idTypes != null && idKeyNames != null && idKeyValues != null)
-    {
-      Vector oldIdListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      Vector newIdListElementVector = new Vector();
-      for (int i=0;i<idKeyNames.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(idKeyNames[i],idKeyValues[i],idTypes[i]);
-        int idViewId = Integer.parseInt(idViewIds[i]);
-        boolean isModified = Boolean.valueOf(idModifiedStates[i]).booleanValue();
-        if (idViewId == -1 || isModified)
-          newIdListElementVector.addElement(new ListElement(kr));
-        else
-          newIdListElementVector.addElement(oldIdListElementVector.elementAt(idViewId));
-      }
-      reindexListElementVector(newIdListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,newIdListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      
-    if (catModifiedStates != null && catViewIds != null && catTypes != null && catKeyNames != null && catKeyValues != null)
-    {
-      Vector oldCatListElementVector = (Vector)formToolPI.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-      Vector newCatListElementVector = new Vector();
-      for (int i=0;i<catTypes.length;i++)
-      {
-        KeyedReference kr = new KeyedReference(catKeyNames[i],catKeyValues[i],catTypes[i]);
-        int catViewId = Integer.parseInt(catViewIds[i]);
-        boolean isModified = Boolean.valueOf(catModifiedStates[i]).booleanValue();
-        if (catViewId == -1 || isModified)
-          newCatListElementVector.addElement(new ListElement(kr));
-        else
-          newCatListElementVector.addElement(oldCatListElementVector.elementAt(catViewId));
-      }
-      reindexListElementVector(newCatListElementVector);
-      propertyTable_.put(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,newCatListElementVector);
-    }
-    else
-      removeProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);            
-    return inputsValid;
-  }
-
-  public final boolean refreshFromRegistry()
-  {
-    controller_.getUDDIPerspective();
-    try
-    {
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      UDDIProxy proxy = regElement.getProxy();
-      TModelDetail tModelDetail = proxy.get_tModelDetail(uuidKey);
-      Vector tModelVector = tModelDetail.getTModelVector();
-      if (tModelVector.size() > 0)
-      {
-        propertyTable_.put(UDDIActionInputs.LATEST_OBJECT,tModelVector.elementAt(0));
-        return true;
-      }
-    }
-    catch (UDDIException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    catch (TransportException e)
-    {
-      // Feedback via Javascript popups.
-    }
-    isUpdate_ = false;
-    return false;
-  }
-    
-  public final boolean run()
-  {
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    MessageQueue messageQueue = uddiPerspective.getMessageQueue();
-    try
-    {
-      String uuidKey = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY);      
-      String publishURL = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL);
-      String userId = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID);
-      String password = (String)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD);
-      ListElement wsdlURLListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-      ListElement nameListElement = (ListElement)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME);
-      Vector descriptionListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS);
-      Vector idListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS);
-      Vector catListElementVector = (Vector)propertyTable_.get(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES);
-      
-      String wsdlURL = (String)wsdlURLListElement.getObject();
-      
-      String name = (String)nameListElement.getObject();
-      
-      Vector descriptionVector = null;
-      if (descriptionListElementVector != null)
-      {
-        descriptionVector = new Vector();
-        for (int i=0;i<descriptionListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)descriptionListElementVector.elementAt(i);
-          Description description = (Description)listElement.getObject();
-          descriptionVector.addElement(description);
-        }
-      }
-      
-      IdentifierBag idBag = null;
-      if (idListElementVector != null)
-      {
-        idBag = new IdentifierBag();
-        for (int i=0;i<idListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)idListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          idBag.add(kr);
-        }
-      }
-      
-      CategoryBag catBag = null;
-      if (catListElementVector != null)
-      {
-        catBag = new CategoryBag();
-        for (int i=0;i<catListElementVector.size();i++)
-        {
-          ListElement listElement = (ListElement)catListElementVector.elementAt(i);
-          KeyedReference kr = (KeyedReference)listElement.getObject();
-          catBag.add(kr);
-        }
-      }
-
-      TModel tModel = (new Uddi4jHelper()).newTModel(wsdlURL);
-      if (isUpdate_)
-        tModel.setTModelKey(uuidKey);
-      tModel.setName(name);      
-      tModel.setDescriptionVector(descriptionVector);
-      tModel.setIdentifierBag(idBag);
-      tModel.setCategoryBag(catBag);
-      
-      RegistryElement regElement = (RegistryElement)regNode_.getTreeElement();
-      if (!regElement.isLoggedIn())
-        regElement.performLogin(publishURL,userId,password);
-      UDDIProxy proxy = regElement.getProxy();
-      Vector tModelVector = new Vector();
-      tModelVector.add(tModel);
-      tModel = (TModel)proxy.save_tModel(regElement.getAuthInfoString(), tModelVector).getTModelVector().get(0);
-      refreshNode(tModel);
-      if (isUpdate_)      
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_UPDATED",tModel.getNameString()));
-      else
-        messageQueue.addMessage(uddiPerspective.getMessage("MSG_INFO_SERVICE_INTERFACE_PUBLISHED",tModel.getNameString()));
-      return true;
-    }
-    catch (WSDLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"WSDLException",e);
-    }
-    catch (TransportException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"TransportException",e);
-    }
-    catch (UDDIException e)
-    {
-      messageQueue.addMessage(uddiPerspective.getController().getMessage("MSG_ERROR_UNEXPECTED"));
-      messageQueue.addMessage("UDDIException");
-      messageQueue.addMessage(e.toString());
-    }
-    catch (MalformedURLException e)
-    {
-      handleUnexpectedException(uddiPerspective,messageQueue,"MalformedURLException",e);
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
deleted file mode 100644
index 2ee6dde85..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIActionInputs.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIActionInputs
-{
-  // OpenRegistryAction
-  public static final String REGISTRY_NAME = "registryName";
-  public static final String INQUIRY_URL = "inquiryURL";
-  public static final String PUBLISH_URL = "publishURL";
-  public static final String REGISTRATION_URL = "registrationURL";
-  public static final String CHECK_USER_DEFINED_CATEGORIES = "checkUserDefinedCategories";
-  public static final String UDDI_USERNAME = "uddiUsername";
-  public static final String UDDI_PASSWORD = "uddiPassword";
-
-  // Fixed and user-defined categories
-  public static final String CATEGORIES_DIRECTORY = "categoriesDirectory";
-  public static final String CATEGORY_TMODEL_KEY = "categoryTModelKey";
-  public static final String CATEGORY_FILENAME = "categoryFileName";
-  public static final String USER_DEFINED_CATEGORIES = "userDefinedCategories";
-
-  // Discovery URL use type
-  public static final String DISCOVERY_URL_TYPE = "businessEntity";
-
-  // Results (NODEID)
-  public static final String NODEID_SERVICE_INTERFACE = "nodeId_ServiceInterface";
-  public static final String NODEID_SERVICE = "nodeId_Service";
-  public static final String NODEID_BUSINESS = "nodeId_Business";
-
-  // RegFind..Actions/RegPublish..Actions
-  public static final String QUERY_INPUT_OVERRIDE_ADD_QUERY_NODE = "overrideAddQueryNode";
-  public static final String QUERY_NAME = "queryName";
-  public static final String QUERY_ITEM = "queryItem";
-  public static final int QUERY_ITEM_QUERIES = -1;
-  public static final int QUERY_ITEM_BUSINESSES = 0;
-  public static final int QUERY_ITEM_SERVICES = 1;
-  public static final int QUERY_ITEM_SERVICE_INTERFACES = 2;
-  public static final int QUERY_STYLE_SIMPLE = 0;
-  public static final int QUERY_STYLE_ADVANCED = 1;
-  public static final int QUERY_STYLE_UUID = 2;
-  public static final String QUERY_INPUT_ADVANCED_OWNED = "advancedOwned";
-  public static final String QUERY_INPUT_ADVANCED_PUBLISH_URL = "advancedPublishURL";
-  public static final String QUERY_INPUT_ADVANCED_USERID = "advancedUserId";
-  public static final String QUERY_INPUT_ADVANCED_PASSWORD = "advancedPassword";
-  public static final String QUERY_INPUT_ADVANCED_NAME_LANGUAGE = "advancedNameLanguage";
-  public static final String QUERY_INPUT_ADVANCED_NAME = "advancedName";
-  public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_TYPE = "advancedIdentifierType";
-  public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_NAME = "advancedIdentifierKeyName";
-  public static final String QUERY_INPUT_ADVANCED_IDENTIFIER_KEY_VALUE = "advancedIdentifierKeyValue";
-  public static final String QUERY_INPUT_ADVANCED_CATEGORY_TYPE = "advancedCategoryType";
-  public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_NAME = "advancedCategoryKeyName";
-  public static final String QUERY_INPUT_ADVANCED_CATEGORY_KEY_VALUE = "advancedCategoryKeyValue";
-  public static final String QUERY_INPUT_ADVANCED_DISCOVERYURL = "advancedDiscoveryURL";
-  public static final String QUERY_INPUT_ADVANCED_FINDQUALIFIER = "advancedFindQualifier";
-  public static final String QUERY_INPUT_ADVANCED_SORT_BY_NAME = "advancedSortByName";
-  public static final String QUERY_INPUT_ADVANCED_SORT_BY_DATE = "advancedSortByDate";
-  public static final String QUERY_INPUT_ADVANCED_MAX_SEARCH_SET = "advancedMaxSearchSet";
-  public static final int QUERY_MAX_SEARCH_SET = 100;
-  public static final String QUERY_INPUT_ADVANCED_MAX_RESULTS = "advancedMaxResults";
-  public static final int QUERY_MAX_RESULTS = 10;
-
-  public static final String QUERY_STYLE_BUSINESSES = "queryStyleBusinesses";
-  public static final String QUERY_INPUT_SIMPLE_BUSINESS_NAME = "simpleBusinessName";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_OWNED = "advancedBusinessOwned";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_NAMES = "advancedBusinessNames";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS = "advancedBusinessIdentifiers";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES = "advancedBusinessCategories";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS = "advancedBusinessDiscoveryURLs";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES = "advancedBusinessServiceInterfaces";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_SERVICE_INTERFACES_COPY = "advancedBusinessServiceInterfacesCopy";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_TMODELBAG = "advancedBusinessTModelBag";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_FINDQUALIFIERS = "advancedBusinessFindQualifiers";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET = "advancedBusinessMaxSearchSet";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS = "advancedBusinessMaxResults";
-
-  public static final String QUERY_STYLE_SERVICES = "queryStyleServices";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_NAME = "simpleServiceName";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_OWNED = "advancedServiceOwned";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS = "advancedServiceBusiness";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_BUSINESS_COPY = "advancedServiceBusinessCopy";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_PROVIDER = "advancedServiceServiceProvider";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_NAMES = "advancedServiceNames";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES = "advancedServiceCategories";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES = "advancedServiceServiceInterfaces";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_SERVICE_INTERFACES_COPY = "advancedServiceServiceInterfacesCopy";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODEL = "advancedServiceTModel";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_TMODELBAG = "advancedServiceTModelBag";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_FINDQUALIFIERS = "advancedServiceFindQualifiers";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET = "advancedServiceMaxSearchSet";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS = "advancedServiceMaxResults";
-
-  public static final String QUERY_STYLE_SERVICE_INTERFACES = "queryStyleServiceInterfaces";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME = "simpleServiceInterfaceName";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_USE_SERVICE = "advancedUseService";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE = "advancedServiceInterfaceService";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_SERVICE_COPY = "advancedServiceInterfaceServiceCopy";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_BUSINESS_SERVICE = "advancedServiceInterfaceBusinessService";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_OWNED = "advancedServiceInterfaceOwned";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME = "advancedServiceInterfaceName";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS = "advancedServiceInterfaceIdentifiers";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES = "advancedServiceInterfaceCategories";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_FINDQUALIFIERS = "advancedServiceInterfaceFindQualifiers";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET = "advancedServiceInterfaceMaxSearchSet";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS = "advancedServiceInterfaceMaxResults";
-  
-  public static final String QUERY_INPUT_ADVANCED_REGISTRY_NAME = "advancedRegistryName";
-
-  public static final String QUERY_INPUT_UUID_KEY = "uuidKey";
-  public static final String QUERY_INPUT_UUID_BUSINESS_KEY = "uuidBusinessKey";
-  public static final String QUERY_INPUT_UUID_SERVICE_KEY = "uuidServiceKey";
-  public static final String QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY = "uuidServiceInterfaceKey";
-  
-  public static final String QUERY_OUTPUT_SAVED_TMODEL = "savedTModel";
-
-  // Sub Queries:
-  public static final String SUBQUERIES_PROPERTIES = "subQueriesProperties";
-  public static final String SUBQUERY_KEY = "subQueryKey";
-  public static final String NEW_SUBQUERY_INITIATED = "newSubQueryInitiated";
-  public static final String NEW_SUBQUERY_QUERY_ITEM = "newSubQueryQueryItem";
-  public static final String SELECTED_NODEIDS = "selectedNodeIds";
-  public static final String SUBQUERY_LIST_KEY = "subQueryListKey";
-  public static final String SUBQUERY_LIST_ITEMID = "subQueryListItemId";
-  public static final String SHOW_RESULTS_TARGET = "showResultsTarget";
-  public static final String SUBQUERY_GET = "subQueryGet";
-
-  // RegPublish..Actions (some constants from the RegFind...Actions will be reused.
-  public static final String QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION = "simpleBusinessDescription";
-
-  public static final String QUERY_INPUT_ADVANCED_DESCRIPTION_LANGUAGE = "advancedDescriptionLanguage";
-  public static final String QUERY_INPUT_ADVANCED_DESCRIPTION = "advancedDescription";
-  public static final String QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS = "advancedBusinessDescriptions";
-
-  public static final String QUERY_INPUT_WSDL_URL = "wsdlURL";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL = "simpleServiceInterfaceWSDLURL";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION = "simpleServiceInterfaceDescription";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL = "advancedServiceInterfaceWSDLURL";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS = "advancedServiceInterfaceDescriptions";
-
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS = "simpleServiceBusiness";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_BUSINESS_COPY = "simpleServiceBusinessCopy";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_SERVICE_PROVIDER = "simpleServiceServiceProvider";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL = "simpleServiceWSDLURL";
-  public static final String QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION = "simpleServiceDescription";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL = "advancedServiceWSDLURL";
-  public static final String QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS = "advancedServiceDescriptions";
-
-  // WSDL Browser
-  public static final String PROJECT = "project";
-  public static final String WSDL_TYPE = "wsdlType";
-  public static final int WSDL_TYPE_SERVICE_INTERFACE = 0;
-  public static final int WSDL_TYPE_SERVICE = 1;
-  public static final String QUERY_INPUT_WEBPROJECT_WSDL_URL = "webProjectWSDLURL";
-  public static final String QUERY_INPUT_FAVORITE_WSDL_URL = "favoriteWSDLURL";
-
-  // Details
-  public static final String LATEST_OBJECT = "latestObject";
-  public static final String DISCOVERYURL_MODIFIED = "discoveryURLModified";
-  public static final String DISCOVERYURL_VIEWID = "discoveryURLViewId";
-  public static final String NAME_MODIFIED = "nameModified";
-  public static final String NAME_VIEWID = "businessViewId";
-  public static final String DESCRIPTION_MODIFIED = "descriptionModified";
-  public static final String DESCRIPTION_VIEWID = "descriptionViewId";
-  public static final String IDENTIFIER_MODIFIED = "identifierModified";
-  public static final String IDENTIFIER_VIEWID = "identifierViewId";
-  public static final String CATEGORY_MODIFIED = "categoryModified";
-  public static final String CATEGORY_VIEWID = "categoryViewId";
-  public static final String WSDL_URL_MODIFIED = "wsdlURLModified";
-  public static final String PUBLISH_ACTION = "publishAction";
-  public static final String LATEST_BUSINESS = "latestBusiness";
-
-  // Refresh action
-  public static final String REFRESH_NODE = "refreshNode";
-
-  // Manage PublisherAssertions
-  // "To" means from another business to my owning business
-  public static final int DIRECTION_TO = 0;
-  // "From" means from my owning business to another business
-  public static final int DIRECTION_FROM = 1;
-  public static final String PUBLISHER_ASSERTIONS_VIEWID = "publisherAssertionsViewId";
-  public static final String PUBLISHER_ASSERTIONS_SELECTED_BUS_ID = "publisherAssertionsSelectedBusID";
-  public static final String PUBLISHER_ASSERTIONS_DIRECTION = "publisherAssertionsDirection";
-  public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS = "queryInputAddPublisherAssertions";
-  public static final String QUERY_INPUT_ADD_PUBLISHER_ASSERTIONS_COPY = "queryInputAddPublisherAssertionsCopy";
-  public static final String QUERY_INPUT_EXISTING_PUBLISHER_ASSERTIONS = "queryInputExistingPublisherAssertions";
-  public static final String PUBLISHER_ASSERTIONS_TYPE = "publisherAssertionsType";
-  public static final String PUBLISHER_ASSERTIONS_TYPE_PARENT_CHILD = "parent-child";
-  public static final String PUBLISHER_ASSERTIONS_TYPE_PEER_TO_PEER = "peer-peer";
-  public static final String PUBLISHER_ASSERTIONS_TYPE_IDENTITY = "identity";
-
-  // Manage Referenced Services
-  public static final String QUERY_INPUT_REFERENCED_SERVICES = "referencedServices";
-  public static final String QUERY_INPUT_SERVICES = "services";
-  public static final String MANAGE_REFERENCED_SERVICES_OPERATION = "managedReferencedServicesOperation";
-  public static final int MANAGE_REFERENCED_SERVICES_OPERATION_ADD = 0;
-  public static final int MANAGE_REFERENCED_SERVICES_OPERATION_REMOVE = 1;
-  public static final String REFERENCED_SERVICE_SELECT_STATE = "referencedServiceSelectState";
-  
-  // ResizeUDDIFrameAction
-  public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-  public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
deleted file mode 100644
index 970fff747..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIFrameNames
-{
-  public final static String NAVIGATOR_CONTAINER = "uddi_navigator_container";
-  public final static String NAVIGATOR_TOOLBAR = "uddi_navigator_toolbar";
-  public final static String NAVIGATOR_CONTENT = "uddi_navigator_content";
-  public final static String ACTIONS_CONTAINER = "uddi_actions_container";
-  public final static String PROPERTIES_CONTAINER = "uddi_properties_container";
-  public final static String PROPERTIES_TOOLBAR = "uddi_properties_toolbar";
-  public final static String PROPERTIES_CONTENT = "uddi_properties_content";
-  public final static String STATUS_CONTAINER = "uddi_status_container";
-  public final static String STATUS_TOOLBAR = "uddi_status_toolbar";
-  public final static String STATUS_CONTENT = "uddi_status_content";
-
-  public final static String CATEGORIES_WORKAREA = "categories_workarea";
-  public final static String CATEGORIES_TOOLBAR = "categories_toolbar";
-  public final static String CATEGORIES_CONTENT = "categories_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
deleted file mode 100644
index b344fe9c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/constants/UDDIModelConstants.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.constants;
-
-public class UDDIModelConstants
-{
-  // Registries under UDDIMain.
-  public static final String REL_REGISTRIES = "registries";
-
-  // Executed Queries folder under a registry.
-  public static final String REL_QUERIES_PARENT = "queriesParent";
-
-  // Published Businesses folder under a registry.
-  public static final String REL_PUBLISHED_BUSINESSES_PARENT = "publishedBusinessesParent";
-
-  // Published Services folder under a registry.
-  public static final String REL_PUBLISHED_SERVICES_PARENT = "publishedServicesParent";
-
-  // Published Service interfaces folder under a registry.
-  public static final String REL_PUBLISHED_SERVICE_INTERFACES_PARENT = "publishedServiceInterfacesParent";
-
-  // Queries under the Queries folder.
-  public static final String REL_QUERIES = "queries";
-  public static final String INITIAL_RESULTS = "initialResults";
-  public static final String QUERY_TYPE = "queryType";
-  public static final String SUBQUERY_TRANSFER_TARGET = "subQueryTransferTarget";
-
-  // Objects under a Query node.
-  public static final String REL_QUERY_RESULTS = "queryResults";
-
-  // Categories
-  public static final String REL_SUBCATEGORIES = "subCategories";
-
-  // Published items inside the Published items folder.
-  public static final String REL_PUBLISHED_ITEMS = "publishedItems";
-
-  // Businesses
-  public static final String IS_BUSINESS_OWNED = "isBusinessOwned";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
deleted file mode 100644
index 09562fd8e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/AbstractUDDIElement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-
-import java.util.Enumeration;
-
-public abstract class AbstractUDDIElement extends TreeElement
-{
-  public AbstractUDDIElement(String name, Model model)
-  {
-    super(name, model);
-  }
-
-  public final TreeElement getParentElement()
-  {
-    return getParentElement(this);
-  }
-
-  public final TreeElement getParentElement(TreeElement child)
-  {
-    Enumeration e = child.getElements(ModelConstants.REL_OWNER);
-    if (e.hasMoreElements())
-      return (TreeElement)e.nextElement();
-    else
-      return null;
-  }
-
-  public final RegistryElement getRegistryElement()
-  {
-    if (this instanceof RegistryElement)
-      return (RegistryElement)this;
-    else
-    {
-      TreeElement childElement = this;
-      TreeElement parentElement = getParentElement(childElement);
-      while (parentElement != null && parentElement != childElement)
-      {
-        if (parentElement instanceof RegistryElement)
-          return (RegistryElement)parentElement;
-        childElement = parentElement;
-        parentElement = getParentElement(childElement);
-      }
-      return null;
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java
deleted file mode 100644
index b1d4ed233..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/BusinessElement.java
+++ /dev/null
@@ -1,51 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-
-public class BusinessElement extends AbstractUDDIElement
-{
-  private BusinessEntity be_;
-  private ListManager publisherAssertions_;
-  
-  public BusinessElement(BusinessEntity be,Model model)
-  {
-    super(be.getDefaultNameString(),model);
-    be_ = be;
-    setKey(be_.getBusinessKey());
-    publisherAssertions_ = null;
-  }
-
-  public final BusinessEntity getBusinessEntity()
-  {
-    return be_;
-  }
-  
-  public final void setBusinessEntity(BusinessEntity be)
-  {
-    be_ = be;
-    setKey(be_.getBusinessKey());
-  }
-
-  public ListManager getPublisherAssertions()
-  {
-    return publisherAssertions_;
-  }
-
-  public void setPublisherAssertions(ListManager listManager)
-  {
-    publisherAssertions_ = listManager;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
deleted file mode 100644
index 478c87fa9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryElement.java
+++ /dev/null
@@ -1,57 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-
-import org.uddi4j.util.*;
-
-public class CategoryElement extends AbstractUDDIElement
-{
-  private KeyedReference category_;
-
-  public CategoryElement(String name,KeyedReference category,Model model)
-  {
-    super(name,model);
-    category_ = category;
-    saveCategoryProperties();
-  }
-
-  private final void saveCategoryProperties()
-  {
-    if (category_ != null)
-    {
-      String keyName = category_.getKeyName();
-      if (keyName != null)
-        setName(keyName);
-    }
-  }
-
-  public final KeyedReference getCategory()
-  {
-    return category_;
-  }
-
-  public final String getNameForTree()
-  {
-    StringBuffer nameForTree = new StringBuffer("[");
-    nameForTree.append(category_.getKeyValue()).append("] ").append(category_.getKeyName());
-    return nameForTree.toString();
-  }
-
-  public final void updateCategory(String keyName,String keyValue,String tModelKey)
-  {
-    category_.setKeyName(keyName);
-    category_.setKeyValue(keyValue);
-    category_.setTModelKey(tModelKey);
-    saveCategoryProperties();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
deleted file mode 100644
index b94351286..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/CategoryModel.java
+++ /dev/null
@@ -1,541 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.text.ParseException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-import javax.servlet.ServletContext;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils;
-import org.uddi4j.util.KeyedReference;
-
-public class CategoryModel extends BasicModel
-{
-  private ServletContext application_;
-  private String defaultDataFile_;
-  private Hashtable categoryElements_;
-  private String columnDelimiter_;
-  private String stringDelimiter_;
-  private String categoryKey_;
-  private boolean checked_;
-  private String displayName_;
-  private String tModelKey_;
-  private Throwable errorException_;
-  
-  // Return codes for loading and saving category data.
-  public static final byte OPERATION_SUCCESSFUL = 0x00;
-  public static final byte ERROR_FILE = 0x01;
-  public static final byte ERROR_SECURITY = 0x02;
-  public static final byte ERROR_ENCODING = 0x03;
-  public static final byte ERROR_IO = 0x04;
-  public static final byte ERROR_CATEGORY_KEY = 0x05;
-  
-  private final String defaultColumnDelimiter_ = "#";
-  private final String defaultStringDelimiter_ = "\"";
-  
-  public CategoryModel()
-  {
-    super("categories");
-    application_ = null;
-	defaultDataFile_ = null;
-    columnDelimiter_ = defaultColumnDelimiter_;
-    stringDelimiter_ = defaultStringDelimiter_;
-    categoryElements_ = null;
-    categoryKey_ = null;
-    checked_ = true;
-    displayName_ = null;
-    tModelKey_ = null;
-    errorException_ = null;
-  }
-  
-  /**
-   * CategoryModels load their data from the file named via the
-   * {@link #setDefaultDataFile(String)} method. The data file
-   * name is interpretted as either a physical pathname or a
-   * context-root relative pathname depending on whether the
-   * servlet context or "application" is null (default) or not.
-   * @param application The application context, null by default.
-   * Value can be the ServletContext of the WSExplorer or null.
-   */
-  public final void setServletContext(ServletContext application)
-  {
-	application_ = application;
-  }
-  
-  public final void setDefaultDataFile(String defaultDataFile)
-  {
-    defaultDataFile_ = defaultDataFile;
-  }
-
-  public final void setCategoryKey(String categoryKey)
-  {
-    categoryKey_ = categoryKey;
-  }
-  
-  public final String getCategoryKey()
-  {
-    return categoryKey_;
-  }
-  
-  public final void setColumnDelimiter(String columnDelimiter)
-  {
-    columnDelimiter_ = columnDelimiter;
-  }
-  
-  public final String getColumnDelimiter()
-  {
-    return columnDelimiter_;
-  }
-  
-  public final void setStringDelimiter(String stringDelimiter)
-  {
-    stringDelimiter_ = stringDelimiter;
-  }
-  
-  public final String getStringDelimiter()
-  {
-    return stringDelimiter_;
-  }
-  
-  public final void enableChecked(boolean isChecked)
-  {
-    checked_ = isChecked;
-  }
-  
-  public final boolean isChecked()
-  {
-    return checked_;
-  }
-  
-  public final void setDisplayName(String displayName)
-  {
-    displayName_ = displayName;
-  }
-  
-  public final String getDisplayName()
-  {
-    return displayName_;
-  }
-  
-  public final void setTModelKey(String tModelKey)
-  {
-    tModelKey_ = tModelKey;
-  }
-  
-  public final String getTModelKey()
-  {
-    return tModelKey_;
-  }
-  
-  public final boolean isDataLoaded()
-  {
-    return (categoryElements_ != null);
-  }
-  
-  public final Throwable getErrorException()
-  {
-    return errorException_;
-  }
-  
-  private final boolean isEnclosedInQuotes(String string)
-  {
-    return string.startsWith("\"") && string.endsWith("\"");
-  }
-
-  public final byte loadFromDefaultDataFile()
-  {
-    try
-    {
-      if (defaultDataFile_ == null)
-        throw new FileNotFoundException();
-	  BufferedReader br = null;
-	  if (application_ == null)
-		br = new BufferedReader(new InputStreamReader(new FileInputStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
-	  else
-	    br = new BufferedReader(new InputStreamReader(application_.getResourceAsStream(defaultDataFile_),HTMLUtils.UTF8_ENCODING));
-      return loadData(br);
-    }
-    catch (FileNotFoundException e)
-    {
-      errorException_ = e;
-      return ERROR_FILE;
-    }
-    catch (SecurityException e)
-    {
-      errorException_ = e;
-      return ERROR_SECURITY;
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      errorException_ = e;
-      return ERROR_ENCODING;
-    }
-  }
-  
-  public final byte loadFromDelimiterFile()
-  {
-    // Get the associated .properties file and set the delimiters. The defaultDataFile_ is set to the delimiter file in this case.
-    // The properties file contains the following keys:
-    // wsad.dataFile - location of the category data file.
-    // wsad.checked - whether or not the category is checked.
-    // wsad.name - the display name of the category.
-    // column.delimiter - the delimiter character used for separating columns.
-    // string.delimiter - the delimiter character used to encapsulate data such that column delimiter characters are treated as data.
-    try
-    {
-      Properties p = new Properties();
-      InputStream fin = null;
-	  if (application_ == null)
-	    fin = new FileInputStream(defaultDataFile_);
-	  else
-		fin = application_.getResourceAsStream(defaultDataFile_);
-      p.load(fin);
-      fin.close();
-      columnDelimiter_ = p.getProperty("column.delimiter");
-      stringDelimiter_ = p.getProperty("string.delimiter");
-      defaultDataFile_ = p.getProperty("wsad.dataFile");
-      return loadFromDefaultDataFile();
-    }
-    catch (FileNotFoundException e)
-    {
-      errorException_ = e;
-      return ERROR_FILE;
-    }
-    catch (SecurityException e)
-    {
-      errorException_ = e;
-      return ERROR_SECURITY;
-    }
-    catch (IOException e)
-    {
-      errorException_ = e;
-      return ERROR_IO;
-    }        
-  }
-  
-  public final byte loadData(BufferedReader br)
-  {
-    errorException_ = null;
-    CategoryElement rootElement = null;
-    categoryElements_ = new Hashtable();
-    byte returnCode = OPERATION_SUCCESSFUL;
-    String line = null;
-    int lineNumber = 0;
-    try
-    {
-      char columnDelimiterChar = columnDelimiter_.charAt(0);
-      char stringDelimiterChar = stringDelimiter_.charAt(0);
-      Vector values = new Vector();
-      while((line = br.readLine()) != null)
-      {
-        lineNumber++;
-        // Ignore blank lines.
-        if (line.trim().length() == 0)
-          continue;
-        int index = 0;
-        int length = line.length();
-        boolean inStringDelimiters = false;
-        values.removeAllElements();
-        StringBuffer currentToken = new StringBuffer();
-        while (index < length)
-        {
-          char currentChar = line.charAt(index);
-          if (inStringDelimiters)
-          {
-            // In quote so ignoring delimiters
-            if (currentChar == stringDelimiterChar)
-            {
-              if (index < length - 1)
-              {
-                // currentChar could be a closing string delimiter or escape
-                // Need to look ahead to be sure...
-                char followingChar = line.charAt(index + 1);
-                if (followingChar == stringDelimiterChar)
-                {
-                  // There is an escaped quote
-                  currentToken.append(stringDelimiterChar);
-                  // jump forward two characters.
-                  index += 2;
-                }
-                else
-                {
-                  // There was a closing string delimiter...jump forward to the next delimiter
-                  inStringDelimiters = false;
-                  //look for the next column delimiter character
-                  int nextDelimiter = line.indexOf(columnDelimiterChar, index);
-                  if (nextDelimiter == -1)
-                  {
-                    // There were no more delimiters so break out of the loop
-                    break;
-                  }
-                  else
-                  {
-                    values.addElement(currentToken.toString());
-                    //values[tokenCount++] = currentToken.toString();
-                    currentToken.setLength(0);
-                    inStringDelimiters = false;
-                    index = nextDelimiter + 1;
-                  }
-                }
-              }
-              else
-              {
-                // This is the last character and it's a closing string delimiter.
-                index++;
-                inStringDelimiters = false;
-              }
-            }
-            else
-            {
-              currentToken.append(currentChar);
-              index++;
-            }
-          }
-          else if (currentChar == columnDelimiterChar)
-          {
-            // There was a delimiter outside of quotes
-            values.addElement(currentToken.toString());
-            //values[tokenCount++] = currentToken.toString();
-            currentToken.setLength(0);
-            index++;
-          }
-          else if (currentChar == stringDelimiterChar)
-          {
-            // A quote appearing outside of quotes must be a opening quote
-            inStringDelimiters = true;
-            index++;
-          }
-          else
-          {
-            // There is a normal char outside of quotes
-            currentToken.append(currentChar);
-            index++;
-          }
-        }
-        // Expect token count to be values.length - 1 at this point if everything is ok
-        if (inStringDelimiters)
-        {
-          br.close();
-          throw new ParseException(line,lineNumber);
-        }
-        
-        // Add the final token.
-        values.addElement(currentToken.toString());
-
-        // 3 columns format. From left to right, these are:
-        // 1) category's key value
-        // 2) category's key name
-        // 3) category's parent key value
-        // Convert to 4 columns format.
-        if (values.size() == 3)
-        {
-          if (categoryKey_ != null)
-            values.insertElementAt(categoryKey_, 0);
-          else
-            values.insertElementAt(tModelKey_, 0);
-        }
-
-        // 4 columns format. From left to right, these are:
-        // 1) type of category (categoryKey)
-        // 2) category's key value
-        // 3) category's key name
-        // 4) category's parent key value
-        if (values.size() == 4)
-        {
-          String categoryKey = (String)values.elementAt(0);
-          if (categoryKey_ == null)
-            categoryKey_ = categoryKey;
-          else if (!categoryKey_.equals(categoryKey))
-            throw new Exception(categoryKey);
-          String keyValue = (String)values.elementAt(1);
-          String keyName = (String)values.elementAt(2);
-          String parentKeyValue = (String)values.elementAt(3);
-          if (rootElement == null)
-          {
-            rootElement = new CategoryElement(displayName_,null,this);
-            setRootElement(rootElement);
-          }
-          if (isEnclosedInQuotes(keyName))
-            keyName = keyName.substring(1,keyName.length()-1);
-          // Check if the CategoryElement already exists. If it does, refresh the Category.
-          CategoryElement categoryElement = (CategoryElement)categoryElements_.get(keyValue);
-          if (categoryElement != null)
-            categoryElement.updateCategory(keyName,keyValue,tModelKey_);
-          else
-            categoryElement = new CategoryElement(keyName,new KeyedReference(keyName,keyValue,tModelKey_),this);
-          Element parentElement;
-          if (parentKeyValue.equals(keyValue))
-            parentElement = rootElement;
-          else
-            parentElement = (Element)categoryElements_.get(parentKeyValue);
-          if (parentElement == null)
-          {
-            parentElement = new CategoryElement("temp",new KeyedReference("",parentKeyValue,tModelKey_),this);
-            categoryElements_.put(parentKeyValue,parentElement);
-          }
-          else
-            parentElement.connect(categoryElement,UDDIModelConstants.REL_SUBCATEGORIES,ModelConstants.REL_OWNER);
-          categoryElements_.put(keyValue,categoryElement);          
-        }
-        else
-        {
-          br.close();
-          throw new ParseException(line,lineNumber);
-        }
-      }
-      br.close();
-      return returnCode;
-    }
-    catch (IOException e)
-    {
-      errorException_ = e;
-      returnCode = ERROR_IO;
-    }
-    catch (ParseException e)
-    {
-      errorException_ = e;
-      returnCode = ERROR_FILE;
-    }
-    catch (Exception e)
-    {
-      errorException_ = e;
-      returnCode = ERROR_CATEGORY_KEY;
-    }
-    categoryElements_ = null;
-    return returnCode;
-  }
-  
-  private final void saveData(PrintWriter pw,CategoryElement categoryElement,CategoryElement parentElement,boolean isFirst)
-  {
-    // File format:
-    // <categoryKey>#<keyValue>#<keyName>#<parentKeyValue>
-    KeyedReference kr = categoryElement.getCategory();
-    // Check if this is not the root element.
-    if (kr != null)
-    {
-      String keyName = kr.getKeyName();
-      String keyValue = kr.getKeyValue();
-      String parentKeyValue;
-      if (parentElement == null)
-        parentKeyValue = keyValue;
-      else
-      {
-        KeyedReference parentKr = parentElement.getCategory();
-        // Check if the parent is the root element.
-        if (parentKr == null)
-          parentKeyValue = keyValue;
-        else
-          parentKeyValue = parentKr.getKeyValue();
-      }
-      if (!isFirst)
-        pw.println();
-      else
-        isFirst = false;
-      pw.print(mangle(categoryKey_));
-      pw.print(columnDelimiter_);
-      pw.print(mangle(keyValue));
-      pw.print(columnDelimiter_);
-      pw.print(mangle(keyName));
-      pw.print(columnDelimiter_);
-      pw.print(mangle(parentKeyValue));
-    }
-    Enumeration e = categoryElement.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
-    if (e != null)
-    {
-      while (e.hasMoreElements())
-        saveData(pw,(CategoryElement)e.nextElement(),categoryElement,isFirst);
-    }
-  }
-  
-  // Mangle an input string if it contains default column delimiter characters by surrounding it with the string delimiters.
-  private final String mangle(String input)
-  {
-    if (input != null && input.indexOf(columnDelimiter_) != -1)
-    {
-      StringBuffer s = new StringBuffer(input);
-      s.insert(0,stringDelimiter_).append(stringDelimiter_);
-      return s.toString();
-    }
-    return input;
-  }
-  
-  public final byte saveData(String fileName)
-  {
-    // The fileName should already be URLEncoded.
-    byte returnCode = OPERATION_SUCCESSFUL;
-    errorException_ = null;
-    if (isDataLoaded())
-    {
-      try
-      {
-        PrintWriter pw = new PrintWriter(new OutputStreamWriter(new FileOutputStream(fileName),HTMLUtils.UTF8_ENCODING),true);
-        CategoryElement rootElement = (CategoryElement)getRootElement();
-        saveData(pw,rootElement,null,true);
-        pw.flush();
-        pw.close();
-        // Save the properties file.
-        Properties p = new Properties();
-        p.setProperty("wsad.dataFile",fileName);
-        p.setProperty("wsad.checked",String.valueOf(checked_));
-        p.setProperty("wsad.name",displayName_);
-        p.setProperty("column.delimiter",columnDelimiter_);
-        p.setProperty("string.delimiter",stringDelimiter_);
-        StringBuffer propertiesFileName = new StringBuffer(fileName.substring(0,fileName.lastIndexOf('.')));
-        propertiesFileName.append(".properties");
-        FileOutputStream fout = new FileOutputStream(propertiesFileName.toString());
-        p.store(fout,null);
-        fout.close();
-      }
-      catch (FileNotFoundException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_FILE;
-      }
-      catch (SecurityException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_SECURITY;
-      }
-      catch (UnsupportedEncodingException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_ENCODING;
-      }
-      catch (IOException e)
-      {
-        errorException_ = e;
-        returnCode = ERROR_IO;
-      }
-    }
-    return returnCode;
-  }
-  
-  public String toString()
-  {
-    return displayName_;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java
deleted file mode 100644
index d49432492..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublishedItemsElement.java
+++ /dev/null
@@ -1,37 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import java.util.*;
-
-public class PublishedItemsElement extends AbstractUDDIElement
-{
-  public PublishedItemsElement(int type,String name,Model model)
-  {
-    super(name,model);
-    setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_PUBLISHED_ITEMS);
-    setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(type));
-  }
-
-  public final int getType()
-  {
-    return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
-  }
-
-  public Enumeration getItems()
-  {
-    return getElements(UDDIModelConstants.REL_PUBLISHED_ITEMS);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
deleted file mode 100644
index 8580dd6f1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/PublisherAssertionElement.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.uddi4j.datatype.assertion.PublisherAssertion;
-import org.uddi4j.util.KeyedReference;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.ListElement;
-
-public class PublisherAssertionElement {
-
-  // owningBusinessKey_ is the key of the business element that owns this
-  // publisherAssertionElement
-  private String fromKey_;
-  private String toKey_;
-  private String owningBusinessKey_;
-
-  // the other business that the containing business is asserted from or to
-  private ListElement sp_;
-  private int subQueryItemId_;
-
-  // status of this publisherAssertion
-  private String status_;
-  private KeyedReference keyedReference_;
-
-  public PublisherAssertionElement(String fromKey, String toKey, String owningBusinessKey, ListElement sp, int subQueryItemId, String status, KeyedReference keyedRef) {
-    fromKey_ = fromKey;
-    toKey_ = toKey;
-    owningBusinessKey_ = owningBusinessKey;
-    sp_ = sp;
-    subQueryItemId_ = subQueryItemId;
-    status_ = status;
-    keyedReference_ = keyedRef;
-  }
-
-  public void setFromKey(String fromKey) {
-    fromKey_ = fromKey;
-  }
-
-  public String getFromKey() {
-    return fromKey_;
-  }
-
-  public void setToKey(String toKey) {
-    toKey_ = toKey;
-  }
-
-  public String getToKey() {
-    return toKey_;
-  }
-
-  public void setOwningBusinessKey(String key) {
-    owningBusinessKey_ = key;
-  }
-
-  public String getOwningBusinessKey() {
-    return owningBusinessKey_;
-  }
-
-  public void setServiceProvider(ListElement sp) {
-    sp_ = sp;
-  }
-
-  public ListElement getServiceProvider() {
-    return sp_;
-  }
-
-  public void setSubQueryItemId(int id) {
-    subQueryItemId_ = id;
-  }
-
-  public int getSubQueryItemId() {
-    return subQueryItemId_;
-  }
-
-  public void setStatus(String status) {
-    status_ = status;
-  }
-
-  public String getStatus() {
-    return status_;
-  }
-
-  public void setKeyedRef(KeyedReference keyedRef) {
-    keyedReference_ = keyedRef;
-  }
-
-  public KeyedReference getKeyedRef() {
-    return keyedReference_;
-  }
-
-  public PublisherAssertion getPublisherAssertion() {
-    if (fromKey_ == null ||
-        toKey_ == null ||
-        keyedReference_ == null) {
-      return null;
-    }
-
-    PublisherAssertion pubAssertion = new PublisherAssertion(fromKey_, toKey_, keyedReference_);
-    return pubAssertion;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
deleted file mode 100644
index fdf824f48..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryElement.java
+++ /dev/null
@@ -1,62 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.*;
-
-import java.util.*;
-
-public class QueryElement extends AbstractUDDIElement
-{
-  private final void initQueryProperties(int itemType,Object[] results)
-  {
-    Vector resultsVector = new Vector();
-    for (int i=0;i<results.length;i++)
-      resultsVector.addElement(results[i]);
-    setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERY_RESULTS);
-    setPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS,resultsVector);
-    setPropertyAsString(UDDIModelConstants.QUERY_TYPE,String.valueOf(itemType));
-  }
-  
-  public QueryElement(BusinessEntity[] spList,String name,Model model)
-  {
-    super(name,model);
-    initQueryProperties(UDDIActionInputs.QUERY_ITEM_BUSINESSES,spList);
-  }
-
-  public QueryElement(BusinessService[] bsList,String name,Model model)
-  {
-    super(name,model);
-    initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICES,bsList);
-  }
-
-  public QueryElement(TModel[] tModelList,String name,Model model)
-  {
-    super(name,model);
-    initQueryProperties(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,tModelList);
-  }
-
-  public int getQueryType()
-  {
-    return Integer.parseInt(getPropertyAsString(UDDIModelConstants.QUERY_TYPE));
-  }
-
-  public QueryParentElement getQueryParentElement()
-  {
-    return (QueryParentElement)getParentElement();
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java
deleted file mode 100644
index 961485ba5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/QueryParentElement.java
+++ /dev/null
@@ -1,31 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import java.util.*;
-
-public class QueryParentElement extends AbstractUDDIElement
-{
-  public QueryParentElement(String name,Model model)
-  {
-    super(name,model);
-    setPropertyAsString(ModelConstants.REL_CHILDREN,UDDIModelConstants.REL_QUERIES);
-  }
-
-  public Enumeration getQueries()
-  {
-    return getElements(UDDIModelConstants.REL_QUERIES);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
deleted file mode 100644
index 2949762db..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/RegistryElement.java
+++ /dev/null
@@ -1,228 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.parser.discovery.*;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.response.AuthToken;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.datatype.service.*;
-import org.uddi4j.datatype.*;
-import java.util.*;
-import java.net.*;
-
-public class RegistryElement extends AbstractUDDIElement
-{
-  private final long AUTH_INFO_TIMEOUT = 3000000;
-  private UDDIProxy proxy_;
-  private long authTokenTimestamp_;
-  private AuthToken authToken_;
-  private String id_;
-  private String password_;
-  private String inquiryURL_;
-  private String publishURL_;
-  private String cachedPublishURL_;
-  private String registrationURL_;
-  private Hashtable userDefinedCategories_;
-  private boolean checkForUserDefinedCategories_;
-  private String categoriesDirectory_;
-
-  public RegistryElement(UDDIProxy proxy, String inquiryURL, String name, Model model)
-  {
-    super(name, model);
-    proxy_ = proxy;
-    inquiryURL_ = inquiryURL;
-    publishURL_ = null;
-    authTokenTimestamp_ = -1;
-    authToken_ = null;
-    id_ = null;
-    password_ = null;
-    cachedPublishURL_ = null;
-    registrationURL_ = null;
-    userDefinedCategories_ = null;
-    checkForUserDefinedCategories_ = false;
-    categoriesDirectory_ = null;
-  }
-
-  public final UDDIProxy getProxy()
-  {
-    return proxy_;
-  }
-
-  public final String getInquiryURL()
-  {
-    return inquiryURL_;
-  }
-
-  public final QueryParentElement getQueryParentElement()
-  {
-    return (QueryParentElement) (getElements(UDDIModelConstants.REL_QUERIES_PARENT).nextElement());
-  }
-
-  public final PublishedItemsElement getPublishedBusinessesElement()
-  {
-    return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT).nextElement());
-  }
-
-  public final PublishedItemsElement getPublishedServicesElement()
-  {
-    return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT).nextElement());
-  }
-
-  public final PublishedItemsElement getPublishedServiceInterfacesElement()
-  {
-    return (PublishedItemsElement) (getElements(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT).nextElement());
-  }
-
-  public final void performLogin(String publishURL, String userId, String password) throws TransportException, UDDIException, MalformedURLException
-  {
-    publishURL_ = publishURL;
-    proxy_.setPublishURL(NetUtils.createURL(publishURL));
-    authToken_ = proxy_.get_authToken(userId, password);
-    authTokenTimestamp_ = System.currentTimeMillis();
-    id_ = userId;
-    password_ = password;
-  }
-
-  public final String getAuthInfoString()
-  {
-    if (!isLoggedIn())
-      return null;
-    if ((System.currentTimeMillis() - authTokenTimestamp_) > AUTH_INFO_TIMEOUT)
-    {
-      try
-      {
-        authToken_ = proxy_.get_authToken(id_, password_);
-        authTokenTimestamp_ = System.currentTimeMillis();
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return authToken_.getAuthInfoString();
-  }
-
-  public final boolean isLoggedIn()
-  {
-    return authToken_ != null;
-  }
-
-  public final void setCachedPublishURL(String publishURL)
-  {
-    cachedPublishURL_ = publishURL;
-  }
-
-  public final String getPublishURL()
-  {
-    if (isLoggedIn() && publishURL_ != null)
-      return publishURL_;
-    return cachedPublishURL_;
-  }
-
-  public final void setRegistrationURL(String registrationURL)
-  {
-    registrationURL_ = registrationURL;
-  }
-
-  public final String getRegistrationURL()
-  {
-    return registrationURL_;
-  }
-
-  public final String getUserId()
-  {
-    return id_;
-  }
-
-  public final void setUserId(String userId)
-  {
-    id_ = userId;
-  }
-
-  public final String getCred()
-  {
-    return password_;
-  }
-
-  public final void setCred(String cred)
-  {
-    password_ = cred;
-  }
-
-  public final void setUserDefinedCategories(Hashtable userDefinedCategories)
-  {
-    userDefinedCategories_ = userDefinedCategories;
-  }
-
-  public final Enumeration getUserDefinedCategories()
-  {
-    if (userDefinedCategories_ != null)
-      return userDefinedCategories_.elements();
-    else
-      return null;
-  }
-
-  public final CategoryModel getUserDefinedCategory(String tModelKey)
-  {
-    return (CategoryModel) userDefinedCategories_.get(tModelKey);
-  }
-
-  // Special handler to be invoked before sending a message to the registry.
-  public final void handlePreInvocation(BusinessService busService)
-  {
-    // For XMethods, business services must contain a description of the form:
-    // IMPLEMENTATION: ibmws
-    if (getInquiryURL().equals("http://uddi.xmethods.net/inquire"))
-    {
-      Vector descriptionVector = busService.getDescriptionVector();
-      if (descriptionVector == null)
-        descriptionVector = new Vector();
-      boolean containsImplementationDescription = false;
-      for (int i = 0; i < descriptionVector.size(); i++)
-      {
-        Description description = (Description) descriptionVector.elementAt(i);
-        if (description.getText().startsWith("IMPLEMENTATION: "))
-        {
-          containsImplementationDescription = true;
-          break;
-        }
-      }
-      if (!containsImplementationDescription)
-      {
-        descriptionVector.addElement(new Description("IMPLEMENTATION: ibmws"));
-        busService.setDescriptionVector(descriptionVector);
-      }
-    }
-  }
-
-  public final void setCheckForUserDefinedCategories(boolean checkForUserDefinedCategories)
-  {
-    checkForUserDefinedCategories_ = checkForUserDefinedCategories;
-  }
-
-  public final boolean getCheckForUserDefinedCategories()
-  {
-    return checkForUserDefinedCategories_;
-  }
-
-  public final void setCategoriesDirectory(String directory)
-  {
-    categoriesDirectory_ = directory;
-  }
-
-  public final String getCategoriesDirectory()
-  {
-    return categoriesDirectory_;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
deleted file mode 100644
index 62f559fcc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceElement.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-
-import org.uddi4j.datatype.service.BusinessService;
-
-public class ServiceElement extends AbstractUDDIElement
-{
-  private BusinessService bs_;
-  
-  public ServiceElement(BusinessService bs,Model model)
-  {
-    super(bs.getDefaultNameString(),model);
-    setKey(bs.getServiceKey());
-    bs_ = bs;
-  }
-  
-  public final BusinessService getBusinessService()
-  {
-    return bs_;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
deleted file mode 100644
index 7eb9acfde..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/ServiceInterfaceElement.java
+++ /dev/null
@@ -1,32 +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.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class ServiceInterfaceElement extends AbstractUDDIElement
-{
-  private TModel tModel_;
-    
-  public ServiceInterfaceElement(TModel tModel,Model model)
-  {
-    super(tModel.getNameString(),model);
-    tModel_ = tModel;
-    setKey(tModel.getTModelKey());
-  }
-
-  public final TModel getTModel()
-  {
-    return tModel_;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
deleted file mode 100644
index 1ba793ab5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/datamodel/UDDIMainElement.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-
-import java.util.*;
-
-public class UDDIMainElement extends TreeElement
-{
-  private Hashtable registryNames_;
-
-  public UDDIMainElement(String name,Model model)
-  {
-    super(name,model);
-    registryNames_ = new Hashtable();
-  }
-
-  public final boolean containsRegistryName(String name)
-  {
-    return (registryNames_.get(name) != null);
-  }
-
-  public final void addRegistryName(String name)
-  {
-    registryNames_.put(name,Boolean.TRUE);
-  }
-
-  public final void removeRegistryName(String name)
-  {
-    registryNames_.remove(name);
-  }
-
-  public final void clearRegistryNames()
-  {
-    registryNames_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
deleted file mode 100644
index b94222ddd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/AddToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-
-public class AddToFavoritesTool extends ActionTool {
-    public AddToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId());
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
deleted file mode 100644
index aa2a61707..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusPublishServiceTool.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class BusPublishServiceTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  private RegFindTool regFindTool_;
-
-  public BusPublishServiceTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/publish_service_enabled.gif","uddi/images/publish_service_highlighted.gif",alt);
-    regFindTool_ = new RegFindTool(new ToolManager(toolManager.getNode()), "");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-
-    // RegPublishServiceSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
-    // RegPublishServiceAdvancedAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-      
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return "uddi/forms/BusPublishServiceForm.jsp";
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
deleted file mode 100644
index 97ed102f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessDetailsTool.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.util.*;
-
-import java.util.*;
-
-public class BusinessDetailsTool extends DetailsTool
-{
-  public BusinessDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/BusinessDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    BusinessElement busElement = (BusinessElement)(toolManager_.getNode().getTreeElement());
-    BusinessEntity be = busElement.getBusinessEntity();
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,be.getBusinessKey());
-
-    Vector nameVector = new Vector();
-    copyIndexVector(be.getNameVector(),nameVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_NAMES,nameVector);
-
-    Vector descriptionVector = new Vector();
-    copyIndexVector(be.getDescriptionVector(),descriptionVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DESCRIPTIONS,descriptionVector);
-
-    IdentifierBag idBag = be.getIdentifierBag();
-    if (idBag != null)
-    {
-      Vector idVector = new Vector();
-      copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_IDENTIFIERS,idVector);
-    }
-
-    CategoryBag catBag = be.getCategoryBag();
-    if (catBag != null)
-    {
-      Vector catVector = new Vector();
-      copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_CATEGORIES,catVector);
-    }
-
-    DiscoveryURLs discoveryURLs = be.getDiscoveryURLs();
-    if (discoveryURLs != null)
-    {
-      Vector discoveryURLVector = new Vector();
-      copyIndexVector(discoveryURLs.getDiscoveryURLVector(),discoveryURLVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_DISCOVERYURLS,discoveryURLVector);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
deleted file mode 100644
index 307ffde27..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/BusinessNode.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class BusinessNode extends UDDINavigatorNode
-{
-  private DetailsTool detailsTool_;
-  private BusPublishServiceTool publishServiceTool_;
-  private ManagePublisherAssertionsTool managePublisherAssertionsTool_;
-  private ManageReferencedServicesTool manageReferencedServicesTool_;
-  private UnpublishTool unpublishTool_;
-
-  public BusinessNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/business_highlighted.gif");
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    detailsTool_ = new BusinessDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_BUSINESS_DETAILS"));
-    new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),BusinessGetServicesAction.getActionLink(nodeId_));    
-    publishServiceTool_ = new BusPublishServiceTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH_SERVICE"));
-    manageReferencedServicesTool_ = new ManageReferencedServicesTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_REFERENCED_SERVICES"));
-    managePublisherAssertionsTool_ = new ManagePublisherAssertionsTool(toolManager_,uddiPerspective.getMessage("ALT_MANAGE_PUBLISHER_ASSERTIONS"));
-    new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_bus_enabled.gif","uddi/images/unpublish_bus_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_BUSINESS"));
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    detailsTool_.addAuthenticationProperties(regElement);
-    publishServiceTool_.addAuthenticationProperties(regElement);
-    manageReferencedServicesTool_.addAuthenticationProperties(regElement);
-    managePublisherAssertionsTool_.addAuthenticationProperties(regElement);
-    unpublishTool_.addAuthenticationProperties(regElement);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
deleted file mode 100644
index dea0df097..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/CategoryNode.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import java.util.*;
-
-public class CategoryNode extends Node
-{
-  public CategoryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/category.gif");
-    setVisibilityOfChildren(false);
-  }
-
-  public final void createChildren()
-  {
-    Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
-    if (children != null)
-    {
-      while (children.hasMoreElements())
-      {
-        CategoryElement categoryElement = (CategoryElement)children.nextElement();
-        CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
-        addChild(categoryNode);
-        categoryNode.createChildren();
-      }
-    }
-  }
-
-  public final String getNodeName()
-  {
-    CategoryElement categoryElement = (CategoryElement)element_;
-    return categoryElement.getNameForTree();
-  }
-
-  protected final String getToggleNodeActionHref()
-  {
-    return ToggleCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_,isOpen_);
-  }
-
-  protected final String getLinkActionHref()
-  {
-    return SelectCategoryNodeAction.getActionLink(getNodeManager().getController().getSessionId(),nodeId_);
-  }
-
-  protected final String getToggleNodeActionTarget()
-  {
-    return UDDIFrameNames.CATEGORIES_WORKAREA;
-  }
-
-  protected final String getLinkActionTarget()
-  {
-    return UDDIFrameNames.CATEGORIES_WORKAREA;
-  }
-
-  protected final void initTools()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
deleted file mode 100644
index 2f8cfcd63..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/DetailsTool.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import java.util.*;
-
-public class DetailsTool extends FormTool
-{
-  private String formLink_;
-
-  public DetailsTool(ToolManager toolManager,String alt,String formLink)
-  {
-    super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
-    formLink_ = formLink;
-  }
-
-  public void initDefaultProperties()
-  {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return formLink_;
-  }
-
-  protected final void copyIndexVector(Vector source,Vector destination)
-  {
-    destination.removeAllElements();
-    for (int i=0;i<source.size();i++)
-    {
-      ListElement listElement = new ListElement(source.elementAt(i));
-      listElement.setViewId(i);
-      // The next item indicates that this element is to be in non-edit state.
-      listElement.setTargetViewToolInfo(-1,-1,i);
-      destination.addElement(listElement);
-    }
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
deleted file mode 100644
index 4f4f3cf2e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetBusinessesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class GetBusinessesTool extends ActionTool
-{
-  private String actionLink_;
-  public GetBusinessesTool(ToolManager toolManager,String enabledImagePath,String highlightedImagePath,String alt,String actionLink)
-  {
-    super(toolManager,enabledImagePath,highlightedImagePath,alt);
-    actionLink_ = actionLink;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return actionLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
deleted file mode 100644
index 7ea5ac0d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServiceInterfacesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class GetServiceInterfacesTool extends ActionTool
-{
-  private String actionLink_;
-  public GetServiceInterfacesTool(ToolManager toolManager,String alt,String actionLink)
-  {
-    super(toolManager,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",alt);
-    actionLink_ = actionLink;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return actionLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
deleted file mode 100644
index f2f034a3c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/GetServicesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class GetServicesTool extends ActionTool
-{
-  private String actionLink_;
-  public GetServicesTool(ToolManager toolManager,String alt,String actionLink)
-  {
-    super(toolManager,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",alt);
-    actionLink_ = actionLink;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return actionLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
deleted file mode 100644
index e8ef3ee1a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ItemsSummaryTool.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-public class ItemsSummaryTool extends FormTool
-{
-  private String formLink_;
-
-  public ItemsSummaryTool(ToolManager toolManager,String enabledImage,String highlightedImage,String alt,int queryItem)
-  {
-    super(toolManager,enabledImage,highlightedImage,alt);
-    StringBuffer formLink = new StringBuffer("uddi/forms/ItemsSummaryForm.jsp?");
-    formLink.append(UDDIActionInputs.QUERY_ITEM).append('=').append(queryItem);
-	String encodedFormLink = URLUtils.encode(formLink.toString());
-    formLink_ = ProxyLoadPageAction.getActionLink(encodedFormLink);
-  }
-
-  public final void initDefaultProperties()
-  {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return formLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
deleted file mode 100644
index ec551e6d2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManagePublisherAssertionsTool.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ProxyLoadPageAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManagePublisherAssertionsTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  ToolManager invisibleToolManager_;
-  private RegFindTool regFindTool_;
-
-  public ManagePublisherAssertionsTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, "uddi/images/publisher_assertions_enabled.gif", "uddi/images/publisher_assertions_highlighted.gif", alt);
-    invisibleToolManager_ = new ToolManager(toolManager.getNode());
-    regFindTool_ = new RegFindTool(invisibleToolManager_,"");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return ProxyLoadPageAction.getActionLink("uddi/forms/ManagePublisherAssertionsForm.jsp");
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
deleted file mode 100644
index 17f2c650d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ManageReferencedServicesTool.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class ManageReferencedServicesTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  ToolManager invisibleToolManager_;
-  private RegFindTool regFindTool_;
-
-  public ManageReferencedServicesTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, "uddi/images/referenced_services_enabled.gif", "uddi/images/referenced_services_highlighted.gif", alt);
-    invisibleToolManager_ = new ToolManager(toolManager.getNode());
-    regFindTool_ = new RegFindTool(invisibleToolManager_,"");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_SERVICES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-  
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-    
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-      
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return "uddi/forms/ManageReferencedServicesForm.jsp";
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
deleted file mode 100644
index e3507e2c2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/MultipleFormToolPropertiesInterface.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public abstract interface MultipleFormToolPropertiesInterface
-{
-  public abstract FormToolPropertiesInterface getFormToolProperties(Object key);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
deleted file mode 100644
index 1c3885877..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/OpenRegistryTool.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-
-import java.util.*;
-
-public class OpenRegistryTool extends FormTool
-{
-  private Controller controller_;
-  
-  public OpenRegistryTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/open_registry_enabled.gif","uddi/images/open_registry_highlighted.gif",alt);
-  }
-
-  protected final void initDefaultProperties()
-  {
-    controller_ = toolManager_.getNode().getNodeManager().getController();
-    UDDIPerspective uddiPerspective = controller_.getUDDIPerspective();
-    setProperty(UDDIActionInputs.REGISTRY_NAME,uddiPerspective.getMessage("DEFAULT_REGISTRY_NAME"));
-    setProperty(UDDIActionInputs.INQUIRY_URL,uddiPerspective.getIBMPublicUDDITestRegistry().getInquiryURL());
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return "uddi/forms/OpenRegistryForm.jsp";
-  }
-  
-  public final Enumeration getFavoriteRegistryElements()
-  {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favoritesNodeManager = favPerspective.getNodeManager();
-    TreeElement favoritesMainElement = favoritesNodeManager.getRootNode().getTreeElement();
-    TreeElement favoriteRegistriesElement = (TreeElement)(favoritesMainElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_FOLDER_NODE).nextElement());
-    return favoriteRegistriesElement.getElements(FavoritesModelConstants.REL_UDDI_REGISTRY_NODE);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
deleted file mode 100644
index c43146192..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/PublishedItemsNode.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class PublishedItemsNode extends UDDINavigatorFolderNode
-{
-  public PublishedItemsNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth);
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
-        {
-          TreeElement treeElement = (TreeElement)event.getParentElement();
-          createChildNode(treeElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement treeElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
-          treeElement = (TreeElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_PUBLISHED_ITEMS))
-          treeElement = (TreeElement)event.getOutBoundElement();
-
-        if (treeElement != null)
-          removeChildNode(treeElement);
-      }
-    });
-  }
-
-  private final void createChildNode(TreeElement element)
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    Node childNode = null;
-    switch (publishedItemsElement.getType())
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-        childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
-    }
-    if (childNode != null)
-      addChild(childNode);
-  }
-  
-  protected final void initTools()
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    int publishedItemsType = publishedItemsElement.getType();
-    switch (publishedItemsType)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),publishedItemsType);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),publishedItemsType);
-        break;
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-      default:
-        new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),publishedItemsType);
-    }
-  }
-  
-  public String getOpenImagePath()
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    int publishedItemsType = publishedItemsElement.getType();
-    switch (publishedItemsType)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        return "uddi/images/businesses_open_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        return "uddi/images/services_open_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-        return "uddi/images/service_interfaces_open_highlighted.gif";
-    }
-    return super.getOpenImagePath();
-  }
-  
-  public String getClosedImagePath()
-  {
-    PublishedItemsElement publishedItemsElement = (PublishedItemsElement)element_;
-    int publishedItemsType = publishedItemsElement.getType();
-    switch (publishedItemsType)
-    {
-      case UDDIActionInputs.QUERY_ITEM_BUSINESSES:
-        return "uddi/images/businesses_closed_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICES:
-        return "uddi/images/services_closed_highlighted.gif";
-      case UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES:
-        return "uddi/images/service_interfaces_closed_highlighted.gif";
-    }
-    return super.getClosedImagePath();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
deleted file mode 100644
index 435046aa5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryNode.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-
-import java.util.*;
-
-public class QueryNode extends UDDINavigatorNode
-{
-  private FormTool regFindTool_;
-  private FindAction findAction_;
-  public QueryNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/query.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_QUERY_RESULTS))
-        {
-          TreeElement treeElement = (TreeElement)event.getParentElement();
-          createChildNode(treeElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement treeElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
-          treeElement = (TreeElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERY_RESULTS))
-          treeElement = (TreeElement)event.getOutBoundElement();
-
-        if (treeElement != null)
-          removeChildNode(treeElement);
-      }
-    });
-    createChildren();
-    setVisibilityOfChildren(false);
-    findAction_ = null;
-  }
-
-  private final void createChildren()
-  {
-    Vector initialResults = (Vector)element_.getPropertyAsObject(UDDIModelConstants.INITIAL_RESULTS);
-    for (int i=0;i<initialResults.size();i++)
-    {
-      Object object = initialResults.elementAt(i);
-      TreeElement childElement = null;
-      if (object instanceof BusinessEntity)
-        childElement = new BusinessElement((BusinessEntity)object,element_.getModel());
-      else if (object instanceof BusinessService)
-        childElement = new ServiceElement((BusinessService)object,element_.getModel());
-      else if (object instanceof TModel)
-        childElement = new ServiceInterfaceElement((TModel)object,element_.getModel());
-      if (childElement != null)
-        element_.connect(childElement,UDDIModelConstants.REL_QUERY_RESULTS,ModelConstants.REL_OWNER);
-    }
-  }
-
-  private final void createChildNode(TreeElement element)
-  {
-    Node childNode = null;
-    if (element instanceof BusinessElement)
-      childNode = new BusinessNode(element,nodeManager_,nodeDepth_+1);
-    else if (element instanceof ServiceElement)
-      childNode = new ServiceNode(element,nodeManager_,nodeDepth_+1);
-    else if (element instanceof ServiceInterfaceElement)
-      childNode = new ServiceInterfaceNode(element,nodeManager_,nodeDepth_+1);
-    if (childNode != null)
-      addChild(childNode);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    new ResultsTool(toolManager_,controller.getMessage("ALT_RESULTS"));
-    regFindTool_ = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
-  }
-
-  public final void setFindToolProperties(FindAction findAction)
-  {
-    findAction_ = findAction;
-    regFindTool_.updatePropertyTable(findAction.getPropertyTable());
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    ((RegFindTool)regFindTool_).addAuthenticationProperties(regElement);
-    Vector childNodes = getChildNodes();
-    for (int i=0;i<childNodes.size();i++)
-    {
-      UDDINavigatorNode navigatorNode = (UDDINavigatorNode)childNodes.elementAt(i);
-      navigatorNode.addAuthenticationProperties(regElement);
-    }
-  }
-
-  public final FindAction getFindAction()
-  {
-    return findAction_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
deleted file mode 100644
index 177189639..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/QueryParentNode.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class QueryParentNode extends UDDINavigatorFolderNode
-{
-  public QueryParentNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth);
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_QUERIES))
-        {
-          QueryElement queryElement = (QueryElement)event.getParentElement();
-          createChildNode(queryElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        QueryElement queryElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
-          queryElement = (QueryElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_QUERIES))
-          queryElement = (QueryElement)event.getOutBoundElement();
-
-        if (queryElement != null)
-          removeChildNode(queryElement);
-      }
-    });
-  }
-
-  private final void createChildNode(QueryElement element)
-  {
-    QueryNode queryNode = new QueryNode(element,nodeManager_,nodeDepth_+1);
-    // Add registry authentication properties.
-    RegistryElement regElement = (RegistryElement)(getParent().getTreeElement());
-    queryNode.addAuthenticationProperties(regElement);
-    addChild(queryNode);
-  }
-  
-  protected final void initTools()
-  {
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    new ItemsSummaryTool(toolManager_,"uddi/images/queries_closed_enabled.gif","uddi/images/queries_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_QUERIES"),UDDIActionInputs.QUERY_ITEM_QUERIES);
-    new ItemsSummaryTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_BUSINESSES"),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
-    new ItemsSummaryTool(toolManager_,"uddi/images/services_closed_enabled.gif","uddi/images/services_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICES"),UDDIActionInputs.QUERY_ITEM_SERVICES);
-    new ItemsSummaryTool(toolManager_,"uddi/images/service_interfaces_closed_enabled.gif","uddi/images/service_interfaces_closed_highlighted.gif",uddiPerspective.getMessage("ALT_SUMMARY_SERVICE_INTERFACES"),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
-  }
-  
-  public String getOpenImagePath()
-  {
-    return "uddi/images/queries_open_highlighted.gif";
-  }
-  
-  public String getClosedImagePath()
-  {
-    return "uddi/images/queries_closed_highlighted.gif";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
deleted file mode 100644
index f37d64d69..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RefreshTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class RefreshTool extends ActionTool
-{
-  public RefreshTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"images/refresh_enabled.gif","images/refresh_highlighted.gif",alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getActionLink()
-  {
-    return RefreshUDDINodeAction.getActionLink(toolManager_.getNode().getNodeId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
deleted file mode 100644
index 7dc9ae806..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegFindTool.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.util.Hashtable;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolProperties;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegFindTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  public RegFindTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/find_enabled.gif","uddi/images/find_highlighted.gif",alt);
-  }
-
-  protected final void initDefaultProperties()
-  {
-    initDefaultProperties(this);
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-    setProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES,new Hashtable());
-    UDDIPerspective uddiPerspective = toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-    setProperty(UDDIActionInputs.QUERY_NAME,uddiPerspective.getMessage("DEFAULT_QUERY_NAME"));
-  }
-
-  private final void initDefaultProperties(FormToolPropertiesInterface formToolPI)
-  {
-    toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
-    formToolPI.setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
-    String maxSearchSet = String.valueOf(UDDIActionInputs.QUERY_MAX_SEARCH_SET);
-    String maxResults = String.valueOf(UDDIActionInputs.QUERY_MAX_RESULTS);
-
-    // RegFindBusinessesSimpleAction inputs
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
-
-    // RegFindBusinessesAdvancedAction inputs
-    // The authentication inputs must be added later as this method is called before we can get a valid handle
-    // to the RegistryElement in the case of a query node.
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_SEARCH_SET,maxSearchSet);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_BUSINESS_MAX_RESULTS,maxResults);
-
-    // RegFindServicesSimpleAction inputs
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-
-    // RegFindServicesAdvancedAction inputs
-    // The authentication inputs must be added later as this method is called before we can get a valid handle
-    // to the RegistryElement in the case of a query node.
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_SEARCH_SET,maxSearchSet);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_MAX_RESULTS,maxResults);
-
-    // RegFindServiceInterfacesSimpleAction inputs
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
-
-    // RegFindServiceInterfacesAdvancedAction inputs
-    // The authentication inputs must be added later as this method is called before we can get a valid handle
-    // to the RegistryElement in the case of a query node.
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_SEARCH_SET,maxSearchSet);
-    formToolPI.setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_MAX_RESULTS,maxResults);
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    Hashtable subQueriesProperties = (Hashtable)getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-    FormToolPropertiesInterface subQueryProperties = (FormToolPropertiesInterface)subQueriesProperties.get(subQueryKey);
-    if (subQueryProperties == null)
-    {
-      subQueryProperties = new FormToolProperties();
-      initDefaultProperties(subQueryProperties);
-      subQueriesProperties.put(subQueryKey,subQueryProperties);
-    }
-    return subQueryProperties;
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-    }
-    return "uddi/forms/RegFindForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
deleted file mode 100644
index fc9ac2029..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegPublishTool.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormToolPropertiesInterface;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SelectFindToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-
-public class RegPublishTool extends FormTool implements MultipleFormToolPropertiesInterface
-{
-  ToolManager invisibleToolManager_;
-  private RegFindTool regFindTool_;
-  public RegPublishTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"uddi/images/publish_enabled.gif","uddi/images/publish_highlighted.gif",alt);
-    invisibleToolManager_ = new ToolManager(toolManager.getNode());
-    regFindTool_ = new RegFindTool(invisibleToolManager_,"");
-  }
-
-  protected final void initDefaultProperties()
-  {
-    toolManager_.getNode().getNodeManager().getController().getUDDIPerspective();
-
-    setProperty(UDDIActionInputs.SUBQUERY_KEY,"");
-
-    setProperty(UDDIActionInputs.QUERY_ITEM,String.valueOf(UDDIActionInputs.QUERY_ITEM_BUSINESSES));
-    String simpleStyleString = String.valueOf(UDDIActionInputs.QUERY_STYLE_SIMPLE);
-    setProperty(UDDIActionInputs.QUERY_STYLE_BUSINESSES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICES,simpleStyleString);
-    setProperty(UDDIActionInputs.QUERY_STYLE_SERVICE_INTERFACES,simpleStyleString);
-
-    // RegPublishBusinessSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_BUSINESS_DESCRIPTION,"");
-
-    // RegPublishServiceSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_DESCRIPTION,"");
-
-    // RegPublishServiceAdvancedAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL,"");
-
-    // RegPublishServiceInterfaceSimpleAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_NAME,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_SIMPLE_SERVICE_INTERFACE_DESCRIPTION,"");
-
-    // RegPublishServiceInterfaceAdvancedAction inputs
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL,"");
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,"");
-  }
-
-  public final void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-    regFindTool_.addAuthenticationProperties(regElement);
-  }
-
-  public final FormToolPropertiesInterface getFormToolProperties(Object subQueryKeyObject)
-  {
-    // Empty/Non-existent subquerykey implies publish form. All else implies query form.
-    String subQueryKey = (String)subQueryKeyObject;
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return this;
-    else
-      return regFindTool_.getFormToolProperties(subQueryKeyObject);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    String subQueryKey = (String)getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    return SelectFindToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),subQueryKey,forHistory);
-  }
-
-  public String getFormLink()
-  {
-    Object subQueryKeyObject = getProperty(UDDIActionInputs.SUBQUERY_KEY);
-    String subQueryKey = null;
-    if (subQueryKeyObject != null)
-    {
-      getProperty(UDDIActionInputs.SUBQUERIES_PROPERTIES);
-      FormToolPropertiesInterface subQueryProperties = getFormToolProperties(subQueryKeyObject);
-      Object subQueryGetObject = subQueryProperties.getProperty(UDDIActionInputs.SUBQUERY_GET);
-      if (subQueryGetObject != null)
-      {
-        boolean isSubQueryGet = ((Boolean)subQueryGetObject).booleanValue();
-        if (isSubQueryGet)
-          return "uddi/forms/GetForm.jsp";
-      }
-      subQueryKey = (String)subQueryKeyObject;
-    }
-      
-    if (subQueryKey == null || subQueryKey.length() < 1)
-      return "uddi/forms/RegPublishForm.jsp";
-    else
-      return regFindTool_.getFormLink();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
deleted file mode 100644
index e7a33a5c8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class RegistryDetailsTool extends DetailsTool
-{
-  public RegistryDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/RegDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    toolManager_.getNode().getNodeManager().getController();
-    RegistryElement regElement = (RegistryElement)(toolManager_.getNode().getTreeElement());
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_REGISTRY_NAME,regElement.getName());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
deleted file mode 100644
index f3e233f2c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RegistryNode.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import java.util.*;
-
-public class RegistryNode extends UDDINavigatorNode
-{
-  private RegistryDetailsTool regDetailsTool_;
-  private RegPublishTool regPublishTool_;
-  
-  public static final String IMAGE_PATH_STANDARD = "uddi/images/registry.gif";
-  public static final String IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES = "uddi/images/regstrycat_obj.gif";
-  
-  public RegistryNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    super(element,nodeManager,nodeDepth,imagePath);
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_QUERIES_PARENT))
-        {
-          QueryParentElement queryParentElement = (QueryParentElement)event.getParentElement();
-          createChildNode(queryParentElement);
-        }
-        else if (isPublishedItemsRel(rel))
-        {
-          PublishedItemsElement publishedItemsElement = (PublishedItemsElement)event.getParentElement();
-          createChildNode(publishedItemsElement);
-        }
-      }
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        String inBoundRelName = event.getInBoundRelName();
-        String outBoundRelName = event.getOutBoundRelName();
-        if (inBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(inBoundRelName))
-          childElement = (TreeElement)event.getInboundElement();
-        else if (outBoundRelName.equals(UDDIModelConstants.REL_QUERIES_PARENT) || isPublishedItemsRel(outBoundRelName))
-          childElement = (TreeElement)event.getOutBoundElement();
-
-        if (childElement != null)
-          removeChildNode(childElement);
-      }
-    });
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    element.connect(new QueryParentElement(uddiPerspective.getMessage("NODE_NAME_QUERIES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_QUERIES_PARENT,ModelConstants.REL_OWNER);
-    element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_BUSINESSES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_BUSINESSES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT,ModelConstants.REL_OWNER);
-    element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT,ModelConstants.REL_OWNER);
-    element.connect(new PublishedItemsElement(UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES,uddiPerspective.getMessage("NODE_NAME_PUBLISHED_SERVICE_INTERFACES_FOLDER"),element_.getModel()),UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT,ModelConstants.REL_OWNER);
-    setVisibilityOfChildren(false);
-  }
-
-  private final boolean isPublishedItemsRel(String rel)
-  {
-    return rel.equals(UDDIModelConstants.REL_PUBLISHED_BUSINESSES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICES_PARENT) || rel.equals(UDDIModelConstants.REL_PUBLISHED_SERVICE_INTERFACES_PARENT);
-  }
-
-  private final void createChildNode(QueryParentElement queryParentElement)
-  {
-    QueryParentNode queryParentNode = new QueryParentNode(queryParentElement,nodeManager_,nodeDepth_+1);
-    addChild(queryParentNode);
-  }
-
-  private final void createChildNode(PublishedItemsElement publishedItemsElement)
-  {
-    PublishedItemsNode publishedItemsNode = new PublishedItemsNode(publishedItemsElement,nodeManager_,nodeDepth_+1);
-    addChild(publishedItemsNode);
-  }
-
-  protected final void initTools()
-  {
-    nodeManager_.getController();
-    UDDIPerspective uddiPerspective = nodeManager_.getController().getUDDIPerspective();
-    regDetailsTool_ = new RegistryDetailsTool(toolManager_ ,uddiPerspective.getMessage("ALT_REGISTRY_DETAILS"));
-    RegFindTool regFindTool = new RegFindTool(toolManager_,uddiPerspective.getMessage("ALT_FIND"));
-    regPublishTool_ = new RegPublishTool(toolManager_,uddiPerspective.getMessage("ALT_PUBLISH"));
-    new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    regFindTool.addAuthenticationProperties((RegistryElement)element_);
-    regPublishTool_.addAuthenticationProperties((RegistryElement)element_);
-  }
-  
-  public final RegistryDetailsTool getRegDetailsTool()
-  {
-    return regDetailsTool_;
-  }
-
-  public final RegPublishTool getRegPublishTool()
-  {
-    return regPublishTool_;
-  }
-
-  private final void addDiscoveredNodes(Vector allNodes,Node queryParentNode,int queryType)
-  {
-    Vector queryNodes = queryParentNode.getChildNodes();
-    for (int i=0;i<queryNodes.size();i++)
-    {
-      QueryNode queryNode = (QueryNode)queryNodes.elementAt(i);
-      QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
-      if (queryType == UDDIActionInputs.QUERY_ITEM_QUERIES)
-        allNodes.addElement(queryNode);
-      else if (queryElement.getQueryType() == queryType)
-      {
-        Vector discoveredNodes = queryNode.getChildNodes();
-        for (int j=0;j<discoveredNodes.size();j++)
-          allNodes.addElement(discoveredNodes.elementAt(j));
-      }
-    }
-  }
-
-  private final void addPublishedNodes(Vector allNodes,Node publishedItemsNode)
-  {
-    Vector itemNodes = publishedItemsNode.getChildNodes();
-    for (int i=0;i<itemNodes.size();i++)
-      allNodes.addElement(itemNodes.elementAt(i));
-  }
-
-  public final void getAllBusinessNodes(Vector allBusinessNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
-    addDiscoveredNodes(allBusinessNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_BUSINESSES);
-    addPublishedNodes(allBusinessNodes,publishedBusinessesNode);
-  }
-
-  public final void getAllServiceNodes(Vector allServicesNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
-    addDiscoveredNodes(allServicesNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICES);
-    addPublishedNodes(allServicesNodes,publishedServicesNode);
-  }
-
-  public final void getAllServiceInterfaceNodes(Vector allServiceInterfaceNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
-    addDiscoveredNodes(allServiceInterfaceNodes,queryParentNode,UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
-    addPublishedNodes(allServiceInterfaceNodes,publishedServiceInterfacesNode);
-  }
-
-  public final void getPublishedBusinessNodes(Vector publishedBusinessNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
-    addPublishedNodes(publishedBusinessNodes,publishedBusinessesNode);
-  }
-
-  public final void getPublishedServiceNodes(Vector publishedServiceNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
-    addPublishedNodes(publishedServiceNodes,publishedServicesNode);
-  }
-
-  public final void getPublishedServiceInterfaceNodes(Vector publishedServiceInterfaceNodes)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
-    addPublishedNodes(publishedServiceInterfaceNodes,publishedServiceInterfacesNode);
-  }
-
-  public final void getDiscoveredNodes(Vector discoveredNodes,int queryItem)
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node queryParentNode = getChildNode(regElement.getQueryParentElement());
-    addDiscoveredNodes(discoveredNodes,queryParentNode,queryItem);
-  }
-
-  private final boolean hasQueryResults(Node queryParentNode,int queryType)
-  {
-    Vector queries = queryParentNode.getChildNodes();
-    for (int i=0;i<queries.size();i++)
-    {
-      QueryNode queryNode = (QueryNode)queries.elementAt(i);
-      if (queryNode.getChildNodes().size() > 0)
-      {
-        QueryElement queryElement = (QueryElement)queryNode.getTreeElement();
-        if (queryElement.getQueryType() == queryType)
-          return true;
-      }
-    }
-    return false;
-  }
-
-  public final boolean hasBusiness()
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedBusinessesNode = getChildNode(regElement.getPublishedBusinessesElement());
-    if (publishedBusinessesNode.getChildNodes().size() > 0)
-      return true;
-    return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_BUSINESSES);
-  }
-
-  public final boolean hasService()
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServicesNode = getChildNode(regElement.getPublishedServicesElement());
-    if (publishedServicesNode.getChildNodes().size() > 0)
-      return true;
-    return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICES);
-  }
-
-  public final boolean hasServiceInterface()
-  {
-    RegistryElement regElement = (RegistryElement)element_;
-    Node publishedServiceInterfacesNode = getChildNode(regElement.getPublishedServiceInterfacesElement());
-    if (publishedServiceInterfacesNode.getChildNodes().size() > 0)
-      return true;
-    return hasQueryResults(getChildNode(regElement.getQueryParentElement()),UDDIActionInputs.QUERY_ITEM_SERVICE_INTERFACES);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
deleted file mode 100644
index a6340d0f2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ResultsTool.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class ResultsTool extends FormTool
-{
-  private String formLink_;
-
-  public ResultsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,"images/details_enabled.gif","images/details_highlighted.gif",alt);
-    formLink_ = ProxyLoadPageAction.getActionLink("uddi/forms/ResultsForm.jsp");
-  }
-
-  public final void initDefaultProperties()
-  {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public String getFormLink()
-  {
-    return formLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
deleted file mode 100644
index 5726ee673..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/RootCategoryNode.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import java.util.*;
-
-public class RootCategoryNode extends Node
-{
-  public RootCategoryNode(TreeElement element,NodeManager nodeManager)
-  {
-    super(element,nodeManager,1,"images/root_main.gif");
-    setVisibilityOfChildren(true);
-  }
-
-  public final void createChildren()
-  {
-    Enumeration children = element_.getElements(UDDIModelConstants.REL_SUBCATEGORIES);
-    if (children != null)
-    {
-      while (children.hasMoreElements())
-      {
-        CategoryElement categoryElement = (CategoryElement)children.nextElement();
-        CategoryNode categoryNode = new CategoryNode(categoryElement,nodeManager_,nodeDepth_+1);
-        addChild(categoryNode);
-        categoryNode.createChildren();
-      }
-    }
-  }
-
-  // Root node: no need for toggle action.
-  protected final String getToggleNodeActionHref()
-  {
-    return null;
-  }
-  
-  // Text only node.
-  protected final String getLinkActionHref()
-  {
-    return null;
-  }
-  
-  protected final void initTools()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
deleted file mode 100644
index 807b79d65..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceDetailsTool.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import org.uddi4j.datatype.service.*;
-import org.uddi4j.util.*;
-
-import java.util.*;
-
-public class ServiceDetailsTool extends DetailsTool
-{
-  public ServiceDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    toolManager_.getNode().getNodeManager().getController();
-    ServiceElement serviceElement = (ServiceElement)(toolManager_.getNode().getTreeElement());
-    BusinessService busService = serviceElement.getBusinessService();
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,busService.getServiceKey());
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY,busService.getBusinessKey());
-
-    Vector nameVector = new Vector();
-    copyIndexVector(busService.getNameVector(),nameVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_NAMES,nameVector);
-
-    Vector descriptionVector = new Vector();
-    copyIndexVector(busService.getDescriptionVector(),descriptionVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_DESCRIPTIONS,descriptionVector);
-
-    CategoryBag catBag = busService.getCategoryBag();
-    if (catBag != null)
-    {
-      Vector catVector = new Vector();
-      copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_CATEGORIES,catVector);
-    }
-  }
-  
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
deleted file mode 100644
index 0f8968b8b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceDetailsTool.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import org.uddi4j.datatype.tmodel.*;
-import org.uddi4j.util.*;
-
-import java.util.*;
-
-public class ServiceInterfaceDetailsTool extends DetailsTool
-{
-  public ServiceInterfaceDetailsTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt,ProxyLoadPageAction.getActionLink("uddi/forms/ServiceInterfaceDetailsForm.jsp"));
-  }
-
-  public final void initDefaultProperties()
-  {
-    clearPropertyTable();
-    toolManager_.getNode().getNodeManager().getController();
-    ServiceInterfaceElement siElement = (ServiceInterfaceElement)(toolManager_.getNode().getTreeElement());
-    TModel tModel = siElement.getTModel();
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_INTERFACE_KEY,tModel.getTModelKey());
-    ListElement nameListElement = new ListElement(tModel.getNameString());
-    nameListElement.setTargetViewToolInfo(-1,-1,0);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_NAME,nameListElement);
-
-    Vector descriptionVector = new Vector();
-    copyIndexVector(tModel.getDescriptionVector(),descriptionVector);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_DESCRIPTIONS,descriptionVector);
-
-    IdentifierBag idBag = tModel.getIdentifierBag();
-    if (idBag != null)
-    {
-      Vector idVector = new Vector();
-      copyIndexVector(idBag.getKeyedReferenceVector(),idVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_IDENTIFIERS,idVector);
-    }
-
-    CategoryBag catBag = tModel.getCategoryBag();
-    if (catBag != null)
-    {
-      Vector catVector = new Vector();
-      copyIndexVector(catBag.getKeyedReferenceVector(),catVector);
-      setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_CATEGORIES,catVector);
-    }
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }  
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
deleted file mode 100644
index bddcad28d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceInterfaceNode.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class ServiceInterfaceNode extends UDDINavigatorNode
-{
-  private DetailsTool detailsTool_;
-  private UnpublishTool unpublishTool_;
-  public ServiceInterfaceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/service_interface_highlighted.gif");
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    detailsTool_ = new ServiceInterfaceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_INTERFACE_DETAILS"));
-    new GetServicesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICES"),ServiceInterfaceGetServicesAction.getActionLink(nodeId_));
-    new GetBusinessesTool(toolManager_,"uddi/images/businesses_closed_enabled.gif","uddi/images/businesses_closed_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESSES"),ServiceInterfaceGetBusinessesAction.getActionLink(nodeId_));
-    new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-    new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-    new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-    new AddToFavoritesTool(toolManager_, uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_interface_enabled.gif","uddi/images/unpublish_service_interface_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE_INTERFACE"));
-  }
-  
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    detailsTool_.addAuthenticationProperties(regElement);
-    unpublishTool_.addAuthenticationProperties(regElement);
-  }
-  
-  public String getWSDLURLFromDetailsTool()
-  {
-    ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_INTERFACE_WSDL_URL);
-    if (wsdlURLListElement != null)
-      return (String)wsdlURLListElement.getObject();
-    else
-      return "temp.wsdl";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
deleted file mode 100644
index d732b078d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/ServiceNode.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class ServiceNode extends UDDINavigatorNode
-{
-  private DetailsTool detailsTool_;
-  private UnpublishTool unpublishTool_;
-  public ServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"uddi/images/service_highlighted.gif");
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    detailsTool_ = new ServiceDetailsTool(toolManager_,uddiPerspective.getMessage("ALT_SERVICE_DETAILS"));
-    new GetBusinessesTool(toolManager_,"uddi/images/business_enabled.gif","uddi/images/business_highlighted.gif",uddiPerspective.getMessage("ALT_GET_BUSINESS"),ServiceGetBusinessAction.getActionLink(nodeId_));
-    new GetServiceInterfacesTool(toolManager_,uddiPerspective.getMessage("ALT_GET_SERVICE_INTERFACES"),ServiceGetServiceInterfacesAction.getActionLink(nodeId_));
-    new UDDIImportWSDLToWorkbenchTool(toolManager_,controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-    new UDDIImportWSDLToFileSystemTool(toolManager_,controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-    new UDDILaunchWebServiceWizardTool(toolManager_,controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-    new UDDIAddToWSDLPerspectiveTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_WSDL_PERSPECTIVE"));
-    new AddToFavoritesTool(toolManager_,uddiPerspective.getMessage("ALT_ADD_TO_FAVORITES"));
-    unpublishTool_ = new UnpublishTool(toolManager_,"uddi/images/unpublish_service_enabled.gif","uddi/images/unpublish_service_highlighted.gif",uddiPerspective.getMessage("ALT_UNPUBLISH_SERVICE"));
-  }
-  
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    detailsTool_.addAuthenticationProperties(regElement);
-    unpublishTool_.addAuthenticationProperties(regElement);
-  }
-
-  public String getWSDLURLFromDetailsTool()
-  {
-    ListElement wsdlURLListElement = (ListElement)detailsTool_.getProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_SERVICE_WSDL_URL);
-    if (wsdlURLListElement != null)
-      return (String)wsdlURLListElement.getObject();
-    else
-      return "temp.wsdl";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
deleted file mode 100644
index 1c1154f26..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryKeyProperty.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-public class SubQueryKeyProperty
-{
-  private String subQueryKey_;
-
-  public SubQueryKeyProperty()
-  {
-    subQueryKey_ = "";
-  }
-
-  public final void setSubQueryKey(String subQueryKey)
-  {
-    subQueryKey_ = subQueryKey;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
deleted file mode 100644
index 74a8fac08..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/SubQueryTransferTarget.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.*;
-
-public class SubQueryTransferTarget
-{
-  private int nodeId_;
-  private int toolId_;
-  private int viewId_;
-  private int viewToolId_;
-  private String subQueryKey_;
-  private NodeManager nodeManager_;
-  Hashtable parentQueryData_;
-
-  public SubQueryTransferTarget(Node node,String subQueryKey,Hashtable parentQueryData)
-  {
-    nodeId_ = node.getNodeId();
-    toolId_ = node.getToolManager().getSelectedToolId();
-    viewId_ = node.getViewId();
-    viewToolId_ = node.getViewToolId();
-    subQueryKey_ = subQueryKey;
-    nodeManager_ = node.getNodeManager();
-    parentQueryData_ = parentQueryData;
-  }
-
-  public final int getNodeId()
-  {
-    return nodeId_;
-  }
-
-  public final int getToolId()
-  {
-    return toolId_;
-  }
-
-  public final int getViewId()
-  {
-    return viewId_;
-  }
-
-  public final int getViewToolId()
-  {
-    return viewToolId_;
-  }
-
-  public final String getSubQueryKey()
-  {
-    return subQueryKey_;
-  }
-
-  public final FormTool getTargetFormTool()
-  {
-    Node node = nodeManager_.getNode(nodeId_);
-    if (node == null)
-      return null;
-
-    Tool tool = node.getToolManager().getTool(toolId_);
-
-    if (viewId_ != ActionInputs.VIEWID_DEFAULT)
-    {
-      ViewTool viewTool = (ViewTool)tool;
-      ToolManager viewToolManager = viewTool.getToolManager(viewId_);
-      if (viewToolManager != null)
-        tool = viewToolManager.getTool(viewToolId_);
-      else
-        tool = null;
-    }
-    return (FormTool)tool;
-  }
-  
-  public final Hashtable getParentQueryData()
-  {
-    return parentQueryData_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
deleted file mode 100644
index d621f8e28..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class UDDIAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-  public UDDIAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return UDDIAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
deleted file mode 100644
index fe9f7f802..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class UDDIImportWSDLToFileSystemTool extends ImportToFileSystemTool
-{
-  public UDDIImportWSDLToFileSystemTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt);
-  }
-
-  public final String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getActionLink()
-  {
-    Node node = toolManager_.getNode();
-    return UDDIImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 2752ad811..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class UDDIImportWSDLToWorkbenchTool extends ImportToWorkbenchTool
-{
-  public UDDIImportWSDLToWorkbenchTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
deleted file mode 100644
index ee99d18f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDILaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public class UDDILaunchWebServiceWizardTool extends LaunchWebServiceWizardTool
-{
-  public UDDILaunchWebServiceWizardTool(ToolManager toolManager,String alt)
-  {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "uddi/forms/UDDILaunchWebServiceWizardForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
deleted file mode 100644
index a8773d3ee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIMainNode.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-import java.util.*;
-
-// Root node for the UDDI Navigator Tree View
-public class UDDIMainNode extends UDDINavigatorNode
-{
-  public UDDIMainNode(TreeElement element,NodeManager nodeManager)
-  {
-    super(element,nodeManager,1,"images/root_main.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(UDDIModelConstants.REL_REGISTRIES))
-        {
-          RegistryElement registryElement = (RegistryElement)event.getParentElement();
-          UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
-          uddiMainElement.addRegistryName(registryElement.getName());
-          createChildNode(registryElement);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        RegistryElement childElement = null;
-        if (event.getInBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
-          childElement = (RegistryElement)event.getInboundElement();
-        else if (event.getOutBoundRelName().equals(UDDIModelConstants.REL_REGISTRIES))
-          childElement = (RegistryElement)event.getOutBoundElement();
-
-        if (childElement != null)
-        {
-          UDDIMainElement uddiMainElement = (UDDIMainElement)element_;
-          uddiMainElement.removeRegistryName(childElement.getName());
-          removeChildNode(childElement);
-        }
-      }
-    });
-  }
-
-  private final void createChildNode(TreeElement element)
-  {
-    RegistryElement regElement = (RegistryElement)element;
-    Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
-    String imagePath;
-    if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
-      imagePath = RegistryNode.IMAGE_PATH_WITH_USER_DEFINED_CATEGORIES;
-    else
-      imagePath = RegistryNode.IMAGE_PATH_STANDARD;
-    
-    RegistryNode regNode = new RegistryNode(element,nodeManager_,nodeDepth_+1,imagePath);
-    addChild(regNode);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    UDDIPerspective uddiPerspective = controller.getUDDIPerspective();
-    new OpenRegistryTool(toolManager_,uddiPerspective.getMessage("ALT_OPEN_REGISTRY"));
-  }
-  
-  // Given a node under a particular registry node, obtain the registry node.
-  public final RegistryNode getRegistryNode(Node currentNode)
-  {
-    RegistryNode regNode = null;
-    if (currentNode instanceof RegistryNode)
-    {
-      regNode = (RegistryNode)currentNode;
-    }
-    else if (currentNode instanceof QueryNode)
-    {
-      // Query -> Query folder -> Registry
-      regNode = (RegistryNode)(currentNode.getParent().getParent());
-    }
-    else if (currentNode instanceof QueryParentNode || currentNode instanceof PublishedItemsNode)
-    {
-      // Query folder -> Registry
-      regNode = (RegistryNode)(currentNode.getParent());
-    }
-    else if (currentNode instanceof BusinessNode || currentNode instanceof ServiceNode || currentNode instanceof ServiceInterfaceNode)
-    {
-      // itemNode -> Published Items folder -> Registry
-      // OR:
-      // itemNode -> QueryNode -> Query folder -> Registry
-      Node parentNode = currentNode.getParent();
-      if (parentNode instanceof QueryNode)
-        regNode = (RegistryNode)(parentNode.getParent().getParent());
-      else
-        regNode = (RegistryNode)parentNode.getParent();
-    }
-    return regNode;    
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
deleted file mode 100644
index 63f6a2bd8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorFolderNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-
-public abstract class UDDINavigatorFolderNode extends FolderNode
-{
-  public UDDINavigatorFolderNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth);
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
-  public final String getToggleNodeActionHref()
-  {
-    return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
-  }
-
-  // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
-  public final String getLinkActionHref()
-  {
-    return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
deleted file mode 100644
index 2490287f7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDINavigatorNode.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public abstract class UDDINavigatorNode extends Node
-{
-  public UDDINavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    super(element,nodeManager,nodeDepth,imagePath);
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...
-  public final String getToggleNodeActionHref()
-  {
-    return ToggleNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
-  }
-
-  // uddi/actions/SelectNavigatorNodeAction.jsp?nodeId=...
-  public final String getLinkActionHref()
-  {
-    return SelectNavigatorNodeAction.getActionLink(nodeId_,false);
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
deleted file mode 100644
index ba5e87085..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UDDIPerspective.java
+++ /dev/null
@@ -1,510 +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.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Properties;
-import java.util.Vector;
-
-import javax.servlet.ServletContext;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.favorites.FavoritesRegistryTypeDefault;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.actions.AddRegistryToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesUDDIRegistryFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.SwitchPerspectiveFromUDDIAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.CategoryModel;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.UDDIMainElement;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.parser.favorites.IFavoritesUDDIRegistry;
-import org.uddi4j.datatype.tmodel.TModel;
-
-public class UDDIPerspective extends Perspective
-{
-  private Hashtable knownRegistries_;
-  private IFavoritesUDDIRegistry ibmPublicUDDITestRegistry_;
-  private Model navigatorModel_;
-  private NodeManager navigatorManager_;
-  private int wsdlType_;
-  private Hashtable categoryManagers_;
-  String categoryTModelKey_;
-  
-  // Window sizes
-  private String perspectiveContentFramesetCols_;
-  private String savedPerspectiveContentFramesetCols_;
-  private String actionsContainerFramesetRows_;
-  private String savedActionsContainerFramesetRows_;
-
-  private final String IBM_TEST_REG_INQUIRY_URL = "http://uddi.ibm.com/testregistry/inquiryapi";
-  private final String IBM_TEST_REG_PUBLISH_URL = "https://uddi.ibm.com/testregistry/publishapi";
-
-  public UDDIPerspective(Controller controller)
-  {
-    super("uddi",controller);
-  }
-
-  public final void initPerspective(ServletContext application)
-  {
-    String defaultFavorites = controller_.getDefaultFavoritesLocation();
-	FavoritesRegistryTypeDefault favRegTypeDefault = new FavoritesRegistryTypeDefault(defaultFavorites);
-    IFavoritesUDDIRegistry[] favRegistriesDefault = favRegTypeDefault.getFavoritesUDDIRegistries();
-    knownRegistries_ = new Hashtable();
-    for (int i=0;i<favRegistriesDefault.length;i++)
-    {
-      if (favRegistriesDefault[i].getInquiryURL().equals(IBM_TEST_REG_INQUIRY_URL) && favRegistriesDefault[i].getPublishURL().equals(IBM_TEST_REG_PUBLISH_URL))
-        ibmPublicUDDITestRegistry_ = favRegistriesDefault[i];
-      knownRegistries_.put(favRegistriesDefault[i].getInquiryURL(),favRegistriesDefault[i]);
-    }
-    if (ibmPublicUDDITestRegistry_ == null && favRegistriesDefault.length > 0)
-      ibmPublicUDDITestRegistry_ = favRegistriesDefault[0];
-    
-    navigatorModel_ = new BasicModel("uddiModel");
-    UDDIMainElement uddiMainElement = new UDDIMainElement(getMessage("NODE_NAME_UDDI_MAIN"),navigatorModel_);
-    navigatorModel_.setRootElement(uddiMainElement);
-    navigatorManager_ = new NodeManager(controller_);
-    UDDIMainNode uddiMainNode = new UDDIMainNode(uddiMainElement,navigatorManager_);
-    navigatorManager_.setRootNode(uddiMainNode);
-
-    wsdlType_ = UDDIActionInputs.WSDL_TYPE_SERVICE_INTERFACE;
-    categoryManagers_ = new Hashtable();
-    
-    // Initialize the default category models.
-    if (application.getAttribute("commonCategoryModels") == null)
-    {
-      synchronized (application)
-      {
-        if (application.getAttribute("commonCategoryModels") == null)
-        {
-          Hashtable commonCategoryModels = new Hashtable();
-		  
-          CategoryModel naicsModel = new CategoryModel();
-          naicsModel.setServletContext(application);
-          naicsModel.setDefaultDataFile("/uddi/data/naics-data.txt");
-          naicsModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_NAICS"));
-          naicsModel.setTModelKey(TModel.NAICS_TMODEL_KEY);
-          commonCategoryModels.put(TModel.NAICS_TMODEL_KEY,naicsModel);
-          
-          CategoryModel unspscModel = new CategoryModel();
-		  unspscModel.setServletContext(application);
-          unspscModel.setDefaultDataFile("/uddi/data/unspsc-data.txt");
-          unspscModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_UNSPSC_73"));
-          unspscModel.setTModelKey(TModel.UNSPSC_73_TMODEL_KEY);
-          commonCategoryModels.put(TModel.UNSPSC_73_TMODEL_KEY,unspscModel);
-          
-          CategoryModel geoModel = new CategoryModel();
-		  geoModel.setServletContext(application);
-          geoModel.setDefaultDataFile("/uddi/data/geo-data.txt");
-          geoModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_GEO"));
-          geoModel.setTModelKey(TModel.ISO_CH_TMODEL_KEY);
-          commonCategoryModels.put(TModel.ISO_CH_TMODEL_KEY,geoModel);
-          
-          CategoryModel dWCommunityModel = new CategoryModel();
-          dWCommunityModel.setServletContext(application);
-          dWCommunityModel.setDefaultDataFile("/uddi/data/dWCommunity-data.txt");
-          dWCommunityModel.setDisplayName(getMessage("FORM_OPTION_CATEGORY_DWCOMMUNITY"));
-          dWCommunityModel.setTModelKey("UUID:8F497C50-EB05-11D6-B618-000629DC0A53");
-          commonCategoryModels.put("UUID:8F497C50-EB05-11D6-B618-000629DC0A53",dWCommunityModel);
-          
-          application.setAttribute("commonCategoryModels",commonCategoryModels);
-        }
-      }
-    }
-    categoryTModelKey_ = null;
-    
-    // Starting frameset sizes.
-    if (!DirUtils.isRTL())
-      perspectiveContentFramesetCols_ = "30%,*";
-    else
-      perspectiveContentFramesetCols_ = "*,30%";
-    savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-    actionsContainerFramesetRows_ = "75%,*";
-    savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-  }
-  
-  public final Hashtable getKnownRegistries()
-  {
-    // We must always query the favorites to see if additional registries were added over time. This property cannot be cached.
-    FavoritesMainElement favMainElement = (FavoritesMainElement)(controller_.getFavoritesPerspective().getNodeManager().getRootNode().getTreeElement());
-    FavoritesUDDIRegistryFolderElement favRegFolderElement = favMainElement.getFavoritesUDDIRegistryFolderElement();
-    Enumeration e = favRegFolderElement.getAllFavorites();
-    while (e.hasMoreElements())
-    {
-      FavoritesUDDIRegistryElement favRegElement = (FavoritesUDDIRegistryElement)e.nextElement();
-      String inquiryURL = favRegElement.getInquiryURL();
-      if (knownRegistries_.get(inquiryURL) == null)
-        knownRegistries_.put(inquiryURL,favRegElement.getIFavoritesUDDIRegistryInterface());
-    }
-    return knownRegistries_;
-  }
-
-  public final String getKnownRegistryPublishURL(String inquiryURL)
-  {
-    IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
-    if (knownRegistry != null)
-    {
-      String publishURL = knownRegistry.getPublishURL();
-      if (Validator.validateURL(publishURL))
-        return publishURL;
-    }
-    return null;
-  }
-
-  public final String getKnownRegistryRegistrationURL(String inquiryURL)
-  {
-    IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)getKnownRegistries().get(inquiryURL);
-    if (knownRegistry != null)
-    {
-      String registrationURL = knownRegistry.getRegistrationURL();
-      if (Validator.validateURL(registrationURL))
-        return registrationURL;
-    }
-    return null;    
-  }
-
-  public final IFavoritesUDDIRegistry getIBMPublicUDDITestRegistry()
-  {
-    return ibmPublicUDDITestRegistry_;
-  }
-  
-  public final void preloadUDDIRegistries(String[] inquiryURLs, String[] publishURLs)
-  {
-    if (inquiryURLs != null)
-    {
-      Hashtable knownRegistries = getKnownRegistries();
-      StringBuffer directoryBuffer = new StringBuffer();
-      for (int i = 0; i < inquiryURLs.length; i++)
-      {
-		String inquiryURL = URLUtils.decode(inquiryURLs[i]);
-        String publishURL = null;
-        String regName = null;
-        String registrationURL = null;
-        // continue to the next registry if inquiryURL does not exist
-        if (!Validator.validateURL(inquiryURL))
-          continue;
-        // populate and run an OpenRegistryAction
-        OpenRegistryAction action = new OpenRegistryAction(controller_);
-        Hashtable propertyTable = action.getPropertyTable();
-        IFavoritesUDDIRegistry knownRegistry = (IFavoritesUDDIRegistry)knownRegistries.get(inquiryURL);
-        boolean checkForUserDefinedCategories = false;
-        File directoryFile = null;
-        if (knownRegistry != null)
-        {
-          publishURL = knownRegistry.getPublishURL();
-          regName = knownRegistry.getName();
-          registrationURL = knownRegistry.getRegistrationURL();
-          directoryBuffer.setLength(0);
-          FavoritesUDDIRegistryFolderElement.formCategoriesDirectory(directoryBuffer,controller_.getServletEngineStateLocation(),regName);
-          directoryFile = new File(directoryBuffer.toString());
-          if (directoryFile.exists() && directoryFile.listFiles().length > 0)
-            checkForUserDefinedCategories = true;
-        }
-        if (regName == null)
-          regName = inquiryURL;
-        if (publishURL == null && publishURLs != null && i < publishURLs.length && publishURLs[i] != null) {
-          publishURL = URLUtils.decode(publishURLs[i]);
-        }  
-        // populate the action
-        propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryURL);
-        propertyTable.put(UDDIActionInputs.REGISTRY_NAME, regName);
-        if (Validator.validateURL(publishURL))
-          propertyTable.put(UDDIActionInputs.PUBLISH_URL, publishURL);
-        if (Validator.validateURL(registrationURL))
-          propertyTable.put(UDDIActionInputs.REGISTRATION_URL, registrationURL);
-          
-        // Check if private registry category information is available for this registry.
-        directoryBuffer.setLength(0);
-        String encodedInquiryURL = URLUtils.encode(inquiryURL);
-        directoryBuffer.append(controller_.getServletEngineStateLocation()).append(encodedInquiryURL).append(".properties");
-        directoryFile = new File(directoryBuffer.toString());
-        if (directoryFile.exists())
-        {
-          try
-          {
-            Properties p = new Properties();
-            FileInputStream fin = new FileInputStream(directoryFile);
-            p.load(fin);
-            fin.close();
-            directoryFile.delete();
-            String dataDirectory = p.getProperty(UDDIActionInputs.CATEGORIES_DIRECTORY);
-            if (dataDirectory != null)
-              propertyTable.put(UDDIActionInputs.CATEGORIES_DIRECTORY,dataDirectory);
-            checkForUserDefinedCategories = true;
-          }
-          catch (IOException e)
-          {
-            checkForUserDefinedCategories = false;
-          }
-        }
-
-        if (checkForUserDefinedCategories)
-          propertyTable.put(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES,Boolean.TRUE);
-        else
-          propertyTable.remove(UDDIActionInputs.CHECK_USER_DEFINED_CATEGORIES);
-                
-        // run the action
-        action.run();
-        
-        RegistryElement regElement = (RegistryElement)(navigatorManager_.getSelectedNode().getTreeElement());
-        Enumeration userDefinedCategories = regElement.getUserDefinedCategories();
-        if (userDefinedCategories != null && userDefinedCategories.hasMoreElements())
-        {
-          AddRegistryToUDDIPerspectiveAction action2 = new AddRegistryToUDDIPerspectiveAction(controller_);
-          String categoriesDirectory = regElement.getCategoriesDirectory();
-          if (categoriesDirectory != null)
-            action2.linkCategoryModelsWithSavedData(userDefinedCategories,categoriesDirectory);
-          else
-            action2.linkCategoryModelsWithSavedData(regElement.getName(),userDefinedCategories);
-        }
-      }
-      if (inquiryURLs.length > 0)
-        controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_UDDI);
-    }
-  }
-  
-  // Preconditions: 
-  // serviceNames and serviceKeys have length >= 1.
-  // regNode != null
-  private final void preloadServicesForRegistry(RegistryNode regNode,String[] serviceNames,String[] serviceKeys)
-  {
-    int regNodeId = regNode.getNodeId();
-    for (int i=0;i<serviceKeys.length;i++)
-    {
-      navigatorManager_.setSelectedNodeId(regNodeId);
-      RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
-      Hashtable propertyTable = action.getPropertyTable();
-      propertyTable.put(UDDIActionInputs.QUERY_NAME,serviceNames[i]);
-      propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY,serviceKeys[i]);
-      action.run();
-      navigatorManager_.makeSelectedNodeVisible();
-    }
-  }
-  
-  public final void preloadServices(String[] inquiryURLs,String[] serviceNames,String[] serviceKeys)
-  {
-    // The algorithm will search for each service key in each inquiry URL.
-    if (serviceKeys != null && serviceNames != null && serviceNames.length == serviceKeys.length)
-    {
-      for (int i=0;i<serviceKeys.length;i++)
-      {
-        if (inquiryURLs != null)
-        {
-          // Eliminate duplicate inquiry URLs.
-          Hashtable inquiryURLsHash = new Hashtable();
-          for (int j=0;j<inquiryURLs.length;j++)
-            inquiryURLsHash.put(inquiryURLs[j],Boolean.TRUE);
-          // Loop through all the available registries and use them if possible.
-          Node uddiMainNode = navigatorManager_.getRootNode();
-          Vector registryNodes = uddiMainNode.getChildNodes();
-          for (int k=0;k<registryNodes.size();k++)
-          {
-            RegistryNode regNode = (RegistryNode)registryNodes.elementAt(k);
-            RegistryElement regElement = (RegistryElement)regNode.getTreeElement();
-            String existingRegistryInquiryURL = regElement.getInquiryURL();
-            if (inquiryURLsHash.get(existingRegistryInquiryURL) != null)
-            {
-              preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
-              inquiryURLsHash.remove(existingRegistryInquiryURL);
-            }
-          }
-          Enumeration inquiryURLsEnum = inquiryURLsHash.keys();
-          while (inquiryURLsEnum.hasMoreElements())
-          {
-            String inquiryURL = (String)inquiryURLsEnum.nextElement();
-            preloadUDDIRegistries(new String[] {inquiryURL},null);
-            RegistryNode regNode = (RegistryNode)navigatorManager_.getSelectedNode();
-            preloadServicesForRegistry(regNode,serviceNames,serviceKeys);
-          }
-        }
-      }
-    }
-  }
-
-  public final void setCategoryTModelKey(String categoryTModelKey)
-  {
-    categoryTModelKey_ = categoryTModelKey;
-  }
-  
-  public final String getCategoryTModelKey()
-  {
-    return categoryTModelKey_;
-  }
-  
-  private final void initCategoryBrowser(CategoryModel categoryModel,NodeManager nodeManager)
-  {
-    TreeElement categoryRootElement = (TreeElement)categoryModel.getRootElement();
-    RootCategoryNode rootCategoryNode = new RootCategoryNode(categoryRootElement,nodeManager);
-    nodeManager.setRootNode(rootCategoryNode);
-    rootCategoryNode.createChildren();
-  }
-  
-  public final NodeManager getCategoryManager()
-  {
-    return (NodeManager)categoryManagers_.get(categoryTModelKey_);
-  }
-  
-  public final NodeManager getCategoryManager(CategoryModel categoryModel)
-  {
-    String tModelKey = categoryModel.getTModelKey();
-    NodeManager categoryManager = (NodeManager)categoryManagers_.get(tModelKey);
-    if (categoryManager == null)
-    {
-      categoryManager = new NodeManager(controller_);
-      initCategoryBrowser(categoryModel,categoryManager);
-      categoryManagers_.put(tModelKey,categoryManager);      
-    }
-    return categoryManager;
-  }
-
-  public final NodeManager getNavigatorManager()
-  {
-    return navigatorManager_;
-  }
-  
-  public final NodeManager getNodeManager()
-  {
-    return getNavigatorManager();
-  }
-
-  public final void setWSDLType(int wsdlType)
-  {
-    wsdlType_ = wsdlType;
-  }
-
-  public final int getWSDLType()
-  {
-    return wsdlType_;
-  }
-
-  public final String getPerspectiveContentPage()
-  {
-    return "uddi/uddi_perspective_content.jsp";
-  }
-
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_UDDI;
-  }
-  
-  public final String getFramesetsFile()
-  {
-    return "uddi/scripts/uddiframesets.jsp";
-  }
-  
-  public final String getProcessFramesetsForm()
-  {
-    return "uddi/forms/ProcessUDDIFramesetsForm.jsp";
-  }
-
-  public final String getPanesFile()
-  {
-    return "uddi/scripts/uddipanes.jsp";
-  }
-  
-  public final String getTreeContentVar()
-  {
-    return "navigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "uddi/navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "propertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "uddi/properties_container.jsp";
-  }
-
-  public final String getStatusContentVar()
-  {
-    return "statusContent";
-  }
-
-  public final String getStatusContentPage()
-  {
-    return "uddi/status_content.jsp";
-  }
-  
-  public final String getSavePerspectiveActionLink()
-  {
-    //return SaveUDDIPerspectiveAction.getActionLink();
-    return "";
-  }
-  
-  public final String getPerspectiveContentFramesetCols()
-  {
-    return perspectiveContentFramesetCols_;
-  }
-  
-  public final void setPerspectiveContentFramesetCols(String cols)
-  {
-    perspectiveContentFramesetCols_ = cols;
-  }
-  
-  public final void setSavedPerspectiveContentFramesetCols(String cols)
-  {
-    savedPerspectiveContentFramesetCols_ = cols;
-  }
-  
-  public final String getSavedPerspectiveContentFramesetCols()
-  {
-    return savedPerspectiveContentFramesetCols_;
-  }
-  
-  public final String getActionsContainerFramesetRows()
-  {
-    return actionsContainerFramesetRows_;
-  }
-  
-  public final void setActionsContainerFramesetRows(String rows)
-  {
-    actionsContainerFramesetRows_ = rows;
-  }
-  
-  public final void setSavedActionsContainerFramesetRows(String rows)
-  {
-    savedActionsContainerFramesetRows_ = rows;
-  }
-  
-  public final String getSavedActionsContainerFramesetRows()
-  {
-    return savedActionsContainerFramesetRows_;
-  }
-  
-  public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    return SwitchPerspectiveFromUDDIAction.getFormActionLink(targetPerspectiveId,forHistory);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
deleted file mode 100644
index a0dd6ae3e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/perspective/UnpublishTool.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.*;
-
-public class UnpublishTool extends FormTool
-{
-  public UnpublishTool(ToolManager toolManager, String enableImage, String highlightImage, String alt)
-  {
-    super(toolManager, enableImage, highlightImage, alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node node = toolManager_.getNode();
-    return SelectPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public void addAuthenticationProperties(RegistryElement regElement)
-  {
-    String publishURL = regElement.getPublishURL();
-    String userId = regElement.getUserId();
-    String password = regElement.getCred();
-
-    if (publishURL == null)
-      publishURL = "";
-    if (userId == null)
-      userId = "";
-    if (password == null)
-      password = "";
-
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PUBLISH_URL,publishURL);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_USERID,userId);
-    setProperty(UDDIActionInputs.QUERY_INPUT_ADVANCED_PASSWORD,password);
-  }
-
-  public String getFormLink()
-  {
-    return "uddi/forms/UnpublishForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
deleted file mode 100644
index 5dfca9ebe..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/uddi/util/Uddi4jHelper.java
+++ /dev/null
@@ -1,398 +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.wst.ws.internal.explorer.platform.uddi.util;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import java.util.List;
-import java.util.Iterator;
-import javax.wsdl.Definition;
-import javax.wsdl.Service;
-import javax.wsdl.Port;
-import javax.wsdl.Binding;
-import javax.wsdl.PortType;
-import javax.wsdl.Message;
-import javax.wsdl.Import;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.http.HTTPAddress;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.CharacterData;
-import org.uddi4j.UDDIException;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.binding.AccessPoint;
-import org.uddi4j.datatype.binding.BindingTemplate;
-import org.uddi4j.datatype.binding.BindingTemplates;
-import org.uddi4j.datatype.binding.InstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceDetails;
-import org.uddi4j.datatype.binding.TModelInstanceInfo;
-import org.uddi4j.datatype.service.BusinessService;
-import org.uddi4j.datatype.tmodel.TModel;
-import org.uddi4j.datatype.OverviewDoc;
-import org.uddi4j.datatype.OverviewURL;
-import org.uddi4j.response.TModelDetail;
-import org.uddi4j.transport.TransportException;
-import org.uddi4j.util.CategoryBag;
-import org.uddi4j.util.KeyedReference;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-
-public class Uddi4jHelper
-{
-  public final KeyedReference getWSDLKeyedReference()
-  {
-    KeyedReference keyRef = new KeyedReference("types", "wsdlSpec");
-    keyRef.setTModelKey("UUID:C1ACF26D-9672-4404-9D70-39B756E62AB4");
-    return keyRef;
-  }
-
-  public final TModel newTModel(String wsdlUrl) throws WSDLException
-  {
-    return newTModel(wsdlUrl, getWSDLDefinition(wsdlUrl));
-  }
-
-  public final TModel newTModel(String wsdlUrl, Definition def) throws WSDLException
-  {
-    TModel tModel = new TModel();
-    tModel.setTModelKey("");
-    tModel.setName(def.getTargetNamespace());
-    tModel.setDefaultDescriptionString("");
-    OverviewDoc overviewDoc = new OverviewDoc();
-    overviewDoc.setOverviewURL(wsdlUrl);
-    tModel.setOverviewDoc(overviewDoc);
-    CategoryBag catBag = new CategoryBag();
-    Vector keyRefVector = new Vector();
-    keyRefVector.add(getWSDLKeyedReference());
-    catBag.setKeyedReferenceVector(keyRefVector);
-    tModel.setCategoryBag(catBag);
-    return tModel;
-  }
-
-  public final BusinessService newBusinessService(String wsdlUrl, Hashtable tModelsTable) throws WSDLException
-  {
-    return newBusinessService(wsdlUrl, getWSDLDefinition(wsdlUrl), tModelsTable);
-  }
-
-  public final BusinessService newBusinessService(String wsdlUrl, Definition def, Hashtable tModelsTable) throws WSDLException
-  {
-    BusinessService bs = new BusinessService();
-    bs.setServiceKey("");
-    BindingTemplates bindingTemplates = new BindingTemplates();
-    Vector bindingTemplateVector = new Vector();
-    Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
-    if (services.length > 0)
-    {
-      Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
-      for (int i = 0; i < ports.length; i++)
-      {
-        TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
-        Vector tModelInfoVector = new Vector();
-        TModel tModel = (TModel)tModelsTable.get(ports[i].getBinding().getPortType().getQName().getNamespaceURI());
-        tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModel.getTModelKey()));
-        tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
-        BindingTemplate bindingTemplate = new BindingTemplate();
-        bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
-        bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
-        bindingTemplate.setTModelInstanceDetails(tModelDetails);
-        bindingTemplate.setBindingKey("");
-        bindingTemplateVector.add(bindingTemplate);
-      }
-    }
-    bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
-    bs.setBindingTemplates(bindingTemplates);
-    return bs;
-  }
-  
-  public final BusinessService newBusinessService(String wsdlUrl, Definition def, TModel[] tModels) throws WSDLException
-  {
-    BusinessService bs = new BusinessService();
-    bs.setServiceKey("");
-    BindingTemplates bindingTemplates = new BindingTemplates();
-    Vector bindingTemplateVector = new Vector();
-    Service[] services = (Service[])def.getServices().values().toArray(new Service[0]);
-    if (services.length > 0)
-    {
-      Port[] ports = (Port[])services[0].getPorts().values().toArray(new Port[0]);
-      for (int i = 0; i < ports.length; i++)
-      {
-        for (int j = 0; j < tModels.length; j++)
-        {
-          TModelInstanceDetails tModelDetails = new TModelInstanceDetails();
-          Vector tModelInfoVector = new Vector();
-          tModelInfoVector.add(createTModelInstanceInfo(wsdlUrl, ports[i], tModels[j].getTModelKey()));
-          tModelDetails.setTModelInstanceInfoVector(tModelInfoVector);
-          BindingTemplate bindingTemplate = new BindingTemplate();
-          bindingTemplate.setDefaultDescriptionString(createDescription(ports[i]));
-          bindingTemplate.setAccessPoint(createAccessPoint(ports[i]));
-          bindingTemplate.setTModelInstanceDetails(tModelDetails);
-          bindingTemplate.setBindingKey("");
-          bindingTemplateVector.add(bindingTemplate);
-        }
-      }
-    }
-    bindingTemplates.setBindingTemplateVector(bindingTemplateVector);
-    bs.setBindingTemplates(bindingTemplates);
-    return bs;
-  }
-
-  public Definition getWSDLDefinition(String wsdlUrl) throws WSDLException
-  {
-    try
-    {
-      WebServicesParserExt parser = new WebServicesParserExt();
-      String proxySet = System.getProperty("http.proxySet");
-      if (proxySet != null && proxySet.equals("true"))
-      {
-        parser.setHTTPBasicAuthUsername(System.getProperty("http.proxyUserName"));
-        parser.setHTTPBasicAuthPassword(System.getProperty("http.proxyPassword"));
-      }
-      return parser.getWSDLDefinitionVerbose(wsdlUrl);
-    }
-    catch (Exception e)
-    {
-      throw new WSDLException(WSDLException.PARSER_ERROR, e.getMessage(), e);
-    }
-  }
-
-  private final String createDescription(Port port)
-  {
-    String desc = null;
-    Element e = port.getDocumentationElement();
-    if (e != null)
-    {
-      Node node = e.getFirstChild();
-      StringBuffer sb = new StringBuffer();
-      while (node != null)
-      {
-        switch (node.getNodeType())
-        {
-          case Node.TEXT_NODE:
-          case Node.CDATA_SECTION_NODE:
-            sb.append(((CharacterData)node).getData());
-          default:
-            node = node.getNextSibling();
-            break;
-        }
-      }
-      desc = sb.toString();
-    }
-    return desc;
-  }
-  
-  private final TModelInstanceInfo createTModelInstanceInfo(String wsdlUrl, Port port, String tModelKey)
-  {
-    InstanceDetails details = new InstanceDetails();
-    OverviewDoc overviewDoc = new OverviewDoc();
-    TModelInstanceInfo tModelInfo = new TModelInstanceInfo();
-    StringBuffer overviewURLString = new StringBuffer(wsdlUrl);
-    String portName = port.getName();
-    if (portName != null)
-    {  
-      overviewURLString.append("#");
-      overviewURLString.append(portName);
-    }
-    overviewDoc.setOverviewURL(new OverviewURL(overviewURLString.toString()));
-    details.setOverviewDoc(overviewDoc);
-    tModelInfo.setInstanceDetails(details);
-    if (tModelKey != null)
-      tModelInfo.setTModelKey(tModelKey);
-    return tModelInfo;
-  }
-  
-  private final AccessPoint createAccessPoint(Port port)
-  {
-    AccessPoint accessPoint = null;
-    List list = port.getExtensibilityElements();
-    for (int j = 0; j < list.size(); j++)
-     {
-      ExtensibilityElement extElement = (ExtensibilityElement)list.get(j);
-      if (extElement instanceof SOAPAddress)
-       {  
-        String locationURI = ((SOAPAddress)extElement).getLocationURI();
-        accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
-        break;
-      }
-      else if (extElement instanceof HTTPAddress)
-       {
-        String locationURI = ((HTTPAddress)extElement).getLocationURI();
-        accessPoint = new AccessPoint(locationURI, getURLType(locationURI));
-        break;
-      }
-    }
-    return accessPoint;
-  }
-  
-  private final String URL_TYPE_OTHER = "other";
-  private final String URL_TYPES = "http https mail ftp fax phone other";
-  
-  private final String getURLType(String url)
-  {
-    int i = url.indexOf(":");
-    String type;
-    if (i == -1)
-      type = URL_TYPE_OTHER;
-    else
-    {
-      type = url.substring(0, i);
-      if (type.equals("") || URL_TYPES.indexOf(type) == -1)
-        type = URL_TYPE_OTHER;
-    }
-    return type;
-  }
-  
-  public boolean isMonolithicWSDL(Definition def)
-  {
-    return hasMessage(def) && hasPortType(def) && hasBinding(def) && hasService(def);
-  }
-  
-  public boolean isServiceImplement(Definition def)
-  {
-    return hasImport(def) && hasService(def);
-  }
-  
-  public boolean isServiceInterface(Definition def)
-  {
-    return hasMessage(def) && hasPortType(def) && hasBinding(def);
-  }
-  
-  public boolean isServiceInterfaceWithBindingsOnly(Definition def)
-  {
-    return !hasService(def) && hasBinding(def);
-  }
-
-  private boolean hasMessage(Definition def)
-  {
-    for(Iterator it = def.getMessages().values().iterator(); it.hasNext();)
-      if (!((Message)it.next()).isUndefined())
-        return true;
-    return false;
-  }
-  
-  private boolean hasPortType(Definition def)
-  {
-    for(Iterator it = def.getPortTypes().values().iterator(); it.hasNext();)
-      if (!((PortType)it.next()).isUndefined())
-        return true;
-    return false;
-  }
-  
-  private boolean hasBinding(Definition def)
-  {
-    for(Iterator it = def.getBindings().values().iterator(); it.hasNext();)
-      if (!((Binding)it.next()).isUndefined())
-        return true;
-    return false;
-  }
-  
-  private boolean hasService(Definition def)
-  {
-    return !def.getServices().isEmpty();
-  }
-
-  private boolean hasImport(Definition def)
-  {
-    return !def.getImports().isEmpty();
-  }
-  
-  public String[] getImports(Definition def, String wsdlUrl)
-  {
-    Import[] imports = (Import [])def.getImports().values().toArray(new Import[0]);
-    String[] importStrings = new String[imports.length];
-    String s;
-    if (wsdlUrl != null && wsdlUrl.indexOf('/') != -1)
-      s = wsdlUrl.substring(0, wsdlUrl.lastIndexOf('/')+1);
-    else
-      s = "";
-    for (int i = 0; i < importStrings.length; i++)
-    {
-      StringBuffer sb = new StringBuffer();
-      String locationURI = imports[i].getLocationURI();
-      if (locationURI.indexOf(':') != -1)
-        sb.append(locationURI);
-      else
-        sb.append(s).append(locationURI);
-      importStrings[i] = sb.toString();
-    }
-    return importStrings;
-  }
-
-  public String getWSDL(BusinessService bs, UDDIProxy proxy)
-  {
-    Vector bindingTemplateVector = bs.getBindingTemplates().getBindingTemplateVector();
-    if (bindingTemplateVector.size() > 0)
-    {
-      BindingTemplate bt = (BindingTemplate)bindingTemplateVector.get(0);
-      TModelInstanceDetails tModelDetails = bt.getTModelInstanceDetails();
-      if (tModelDetails != null)
-      {
-        Vector tModelInfoVector = tModelDetails.getTModelInstanceInfoVector();
-        if (tModelInfoVector.size() > 0)
-        {
-          TModelInstanceInfo tModelInfo = (TModelInstanceInfo)tModelInfoVector.get(0);
-          InstanceDetails details = tModelInfo.getInstanceDetails();
-          if (details != null)
-          {
-            OverviewDoc overviewDoc = details.getOverviewDoc();
-            if (overviewDoc != null)
-              return parse(overviewDoc.getOverviewURLString());
-          }
-          else if (proxy != null)
-          {
-          	String tModelKey = tModelInfo.getTModelKey();
-          	if (tModelKey != null)
-          	{
-          	  try
-			  {
-          	    TModelDetail t = proxy.get_tModelDetail(tModelKey);
-          	    if (t != null)
-          	    {
-                  Vector tModelVector = t.getTModelVector();
-                  if (tModelVector != null && tModelVector.size() > 0)
-                    return getWSDL((TModel)tModelVector.get(0));
-          	    }
-              }
-          	  catch (UDDIException uddie)
-			  {
-          	  }
-          	  catch (TransportException te)
-			  {
-          	  }
-          	}
-          }
-        }
-      }
-    }
-    return null;
-  }
-  
-  public String getWSDL(TModel tModel)
-  {
-    OverviewDoc overviewDoc = tModel.getOverviewDoc();
-    if (overviewDoc != null)
-      return parse(overviewDoc.getOverviewURLString());
-    else
-      return null;
-  }
-  
-  private String parse(String s)
-  {
-    if (s != null && s.length() > 0)
-    {
-      int index = s.indexOf('#');
-      if (index != -1)
-        return s.substring(0, index);
-    }
-    return s;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
deleted file mode 100644
index ff74f6717..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/CharArrayWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import javax.servlet.http.*;
-
-import java.io.*;
-
-public class CharArrayWrapper extends HttpServletResponseWrapper
-{
-	private CharArrayWriter charArrayWriter_;
-	
-	public CharArrayWrapper(HttpServletResponse response)
-	{
-		super(response);
-	  charArrayWriter_ = new CharArrayWriter();
-	}
-	
-	public PrintWriter getWriter()
-	{
-		return new PrintWriter(charArrayWriter_);
-	}
-	
-	public String toString()
-	{
-		return charArrayWriter_.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
deleted file mode 100644
index b4dc81a31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/DirUtils.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.util.Locale;
-import org.eclipse.core.runtime.Platform;
-
-public final class DirUtils
-{
-  public static boolean isRTL()
-  {
-    return "rtl".equals(getDir());
-  }
-
-  public static String getDir()
-  {
-    String rtl = "rtl";
-    String ltr = "ltr";
-
-    // from system property
-    String orientation = System.getProperty("eclipse.orientation"); //$NON-NLS-1$
-    if (rtl.equals(orientation)) //$NON-NLS-1$
-      return rtl;
-    else if (ltr.equals(orientation)) //$NON-NLS-1$
-      return ltr;
-
-    // from command line
-    String[] args = Platform.getCommandLineArgs();
-    for (int i = 0; i < args.length; i++)
-    {
-      if ("-dir".equalsIgnoreCase(args[i])) //$NON-NLS-1$
-      {
-        if ((i + 1) < args.length && "rtl".equalsIgnoreCase(args[i + 1])) //$NON-NLS-1$
-        {
-          return rtl;
-        }
-        return ltr;
-      }
-    }
-
-    // Check if the user property is set. If not do not
-    // rely on the vm.
-    if (System.getProperty("osgi.nl.user") == null) //$NON-NLS-1$
-      return ltr;
-
-    // guess from default locale
-    String locale = Platform.getNL();
-    if (locale == null)
-    {
-      locale = Locale.getDefault().toString();
-    }
-    if (locale.startsWith("ar") || locale.startsWith("fa") //$NON-NLS-1$//$NON-NLS-2$
-        || locale.startsWith("he") || locale.startsWith("iw") //$NON-NLS-1$//$NON-NLS-2$
-        || locale.startsWith("ur")) //$NON-NLS-1$
-    {
-      return rtl;
-    }
-    return ltr;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
deleted file mode 100644
index f084d3cbf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/HTMLUtils.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import javax.servlet.http.*;
-import java.util.*;
-
-public final class HTMLUtils
-{
-  public static final String UTF8_ENCODING = "UTF-8";
-  public static final String LINE_BREAK = "<br>";
-  public static final String LINE_SEPARATOR = System.getProperties().getProperty("line.separator");
-
-  /**
-  * Get the HTML tag for an image.
-  * @return String The HTML tag for this image.
-  * @param HttpServletResponse To encode the src attribute.
-  * @param String src attribute defining the path to the image file. This must include the context path.
-  * @param String Optional alt text to be displayed with the image. Set this to null to disable the attribute.
-  * @param String Optional width of the rendered image. Set this to null to disable the attribute.
-  * @param String Optional height of the rendered imag. Set this to null to disable the attribute.
-  * @param Hashtable Optional key-value pairs of additional strings to be added as-is to the tag. Set this to null to disable.
-  * @return String The image tag.
-  */
-  public static final String getHTMLImageTag(HttpServletResponse response,String src,String alt,String width,String height,Hashtable additionalAttributes)
-  {
-    StringBuffer tag = new StringBuffer("<img src=\"");
-    tag.append(response.encodeURL(src)).append('\"');
-    if (alt != null)
-    {
-      tag.append(" alt=\"").append(alt).append('\"');
-      tag.append(" title=\"").append(alt).append('\"');
-    }
-    if (width != null)
-      tag.append(" width=").append(width);
-    if (height != null)
-      tag.append(" height=").append(height);
-    tag.append(" border=0");
-    if (additionalAttributes != null)
-    {
-      Enumeration keys = additionalAttributes.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
-      }
-    }
-    tag.append('>');
-    return tag.toString();
-  }
-
-  /**
-  * Get the HTML tag for this link. The complete tag consists of the open tag <a> followed by a subelement and, finally, by an end tag </a>.
-  * @return String The HTML tag of the link.
-  * @param HttpServletResponse To encode the href attribute.
-  * @param String The href attribute of the link. This must include the context path.
-  * @param String target Optional target attribute for the link. Set this to null to disable the attribute.
-  * @param String Optional name for the link. Set this to null to disable the attribute.
-  * @param String The label which acts as the subelement. i.e. <a>label</a>.
-  * @param Hashtable Optional key-value pairs of additional string attributes to be added as-is to the open tag. Set this to null to disable.
-  */
-  public static final String getHTMLLinkTag(HttpServletResponse response,String href,String target,String name,String label,Hashtable additionalAttributes)
-  {
-    StringBuffer tag = new StringBuffer("<a href=\"");
-    tag.append(response.encodeURL(href)).append('\"');
-    if (target != null)
-      tag.append(" target=\"").append(target).append('\"');
-    if (name != null)
-      tag.append(" name=\"").append(name).append('\"');
-    if (additionalAttributes != null)
-    {
-      Enumeration keys = additionalAttributes.keys();
-      while (keys.hasMoreElements())
-      {
-        String key = (String)keys.nextElement();
-        tag.append(' ').append(key).append("=\"").append((String)additionalAttributes.get(key)).append('\"');
-      }
-    }
-    tag.append('>');
-    tag.append(label);
-    tag.append("</a>");
-    return tag.toString();
-  }
-
-  /**
-  * Get the HTML tag for a red asterist.
-  * @return String The HTML tag for the red asterisk.
-  */
-  public static final String redAsterisk()
-  {
-    return "<font color=\"#ff0000\">*</font>";
-  }
-
-  /**
-  * Get the Javascript mangled version of a given input String.
-  * @return String The Javascript mangled String.
-  */
-  public static final String JSMangle(String input)
-  {
-    if (input == null)
-      return "";
-
-    StringBuffer mangledOutput = new StringBuffer();
-    for (int i=0;i<input.length();i++)
-    {
-      char c = input.charAt(i);
-      switch (c)
-      {
-        case '\n':
-          mangledOutput.append("\\n");
-          break;
-        case '\r':
-          mangledOutput.append("\\r");
-          break;
-        case '\\':
-        case '\"':
-        case '\'':
-          mangledOutput.append('\\');
-        default:
-          mangledOutput.append(c);
-      }
-    }
-    return mangledOutput.toString();
-  }
-
-  private static final String LESS_THAN = "<";
-  private static final String LESS_THAN_HTML_ENTITY = "&lt;";
-  private static final String GREATER_THAN = ">";
-  private static final String GREATER_THAN_HTML_ENTITY = "&gt;";
-  private static final String SPACE = " ";
-  private static final String SPACE_HTML_ENTITY = "&nbsp;";
-  private static final String AMPERSAND = "&";
-  private static final String AMPERSAND_HTML_ENTITY = "&amp;";
-  private static final String QUOTATION = "\"";
-  private static final String QUOTATION_HTML_ENTITY = "&quot;";
-
-  /**
-  * Replace special characters with HTML entities representing these characters.
-  * @return String The converted String. Note: Order is important so that corrected entity references are not re-mangled.
-  */
-  public static final String charactersToHTMLEntities(String s) {
-    s = stringReplace(s, AMPERSAND, AMPERSAND_HTML_ENTITY);
-    s = stringReplace(s, LESS_THAN, LESS_THAN_HTML_ENTITY);
-    s = stringReplace(s, GREATER_THAN, GREATER_THAN_HTML_ENTITY);
-    s = stringReplace(s, SPACE, SPACE_HTML_ENTITY);
-    s = stringReplace(s, QUOTATION, QUOTATION_HTML_ENTITY);
-    return s;
-  }
-
-  /**
-  * Replace HTML character entities with their associated characters.
-  * @return String The converted String.
-  */
-  public static final String htmlEntitiesToCharacters(String s) {
-    s = stringReplace(s, LESS_THAN_HTML_ENTITY, LESS_THAN);
-    s = stringReplace(s, GREATER_THAN_HTML_ENTITY, GREATER_THAN);
-    s = stringReplace(s, SPACE_HTML_ENTITY, SPACE);
-    s = stringReplace(s, AMPERSAND_HTML_ENTITY, AMPERSAND);
-    s = stringReplace(s, QUOTATION_HTML_ENTITY, QUOTATION);
-    return s;
-  }
-
-  private static final String stringReplace(String s, String oldString, String newString) {
-    String sCopy = s;
-    int fromIndex = 0;
-    int oldStringIndex = sCopy.indexOf(oldString, fromIndex);
-    StringBuffer sb = new StringBuffer();
-    while (oldStringIndex != -1) {
-      sb.setLength(0);
-      sb.append(sCopy.substring(0, oldStringIndex));
-      sb.append(newString);
-      sb.append(sCopy.substring(oldStringIndex + oldString.length(), sCopy.length()));
-      sCopy = sb.toString();
-      fromIndex = oldStringIndex + newString.length();
-      oldStringIndex = sCopy.indexOf(oldString, fromIndex);
-    }
-    return sCopy;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
deleted file mode 100644
index 39008b18c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-public final class MultipartFormDataException extends Throwable
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3257845472227110961L;
-
-public MultipartFormDataException(String message)
-  {
-    super(message);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
deleted file mode 100644
index d442218ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/MultipartFormDataParser.java
+++ /dev/null
@@ -1,243 +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.wst.ws.internal.explorer.platform.util;
-
-import java.io.*;
-import java.util.*;
-
-import javax.servlet.http.*;
-
-public final class MultipartFormDataParser
-{
-  private Hashtable paramTable_;
-
-  private static final String HEADER_CONTENT_TYPE        = "Content-Type";
-  private static final String HEADER_MULTIPART           = "multipart";
-  private static final String HEADER_BOUNDARY            = "boundary=";
-  private static final String HEADER_CONTENT_DISPOSITION = "Content-Disposition: form-data";
-  private static final String HEADER_NAME                = "name=\"";
-
-  private static final byte PARSER_STATE_INITIAL         = 0;
-  private static final byte PARSER_STATE_BOUNDARY        = 1;
-  private static final byte PARSER_STATE_PARAMETER       = 2;
-  private static final byte PARSER_STATE_BLANK           = 3;
-  private static final byte PARSER_STATE_DATA            = 4;
-
-  private static String parserStates[] = {"initial","boundary","parameter name","blank line","data"};
-
-  public MultipartFormDataParser()
-  {
-  }
-  
-  public MultipartFormDataParser(Hashtable parameters)
-  {
-    paramTable_ = new Hashtable();
-    for (Iterator it = parameters.keySet().iterator(); it.hasNext();)
-    {
-      Object key = it.next();
-      Object value = parameters.get(key);
-      if (value instanceof List)
-      {
-        List list = (List)value;
-        for (Iterator it2 = list.iterator(); it2.hasNext();)
-          saveData(key.toString(), it2.next().toString());
-      }
-      else if (value.getClass().isArray())
-      {
-        Object[] array = (Object[])value;
-        for (int i = 0; i < array.length; i++)
-          saveData(key.toString(), array[i].toString());
-      }
-      else
-      {
-        saveData(key.toString(), value.toString());
-      }
-    }
-  }
-
-  /**
-   * Parse a multipart/form-data encoded post request with a given encoding.
-   * If the encoding is null, use the system default encoding. utf-8 is not a
-   * bad choice for the encoding.
-   */
-  public final void parseRequest(HttpServletRequest request,String encoding) throws MultipartFormDataException
-  {
-    // Content-Type header should have the form:
-    // multipart/form-data; boundary=...
-    //
-    // RFC2046 5.1.1 page 19, paragraph 2:
-    // The Content-Type field for multipart entities requires one parameter, "boundary" (no quotes)
-    String contentType = request.getHeader(HEADER_CONTENT_TYPE);
-    if (contentType == null || !contentType.startsWith(HEADER_MULTIPART) || contentType.indexOf(HEADER_BOUNDARY) == -1)
-      throw new MultipartFormDataException("Content-Type is not multipart/form-data");
-
-    // RFC2046 5.1.1 page 19, paragraph 4:
-    // The boundary value may be enclosed in double quotes. Strip these if they are present.
-    String boundary = contentType.substring(contentType.indexOf(HEADER_BOUNDARY)+HEADER_BOUNDARY.length(),contentType.length());
-    if (boundary.charAt(0) == '\"' && boundary.charAt(boundary.length()-1) == '\"')
-      boundary = boundary.substring(1,boundary.length()-1);
-
-    // RFC2046 5.1.1 page 19, paragraph 2:
-    // The boundary delimiter line is then defined as a line consisting entirely
-    // of two hyphen characters.
-    String delimiter = "--"+boundary;
-
-    if (paramTable_ == null)
-      paramTable_ = new Hashtable();
-    else
-      paramTable_.clear();
-
-    try
-    {
-      BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),encoding));
-      String line = null;
-      String parameterName = null;
-      StringBuffer parameterValue = new StringBuffer();
-      byte currentParserState = PARSER_STATE_INITIAL;
-      while ((line = br.readLine()) != null)
-      {
-        // Lines appear in the following sequence.
-        // 1) boundary indicating the start of a new parameter and end of a data segment.
-        // 2) Content-Disposition: form-data; name="..." - the name of a new parameter.
-        // 3) a blank line
-        // 4) data
-        //
-        // For each parameter, the sequence is repeated.
-        if (line.startsWith(delimiter))
-        {
-          byte[] expectedParserStates = {PARSER_STATE_INITIAL,PARSER_STATE_DATA};
-          if (isValidParserState(currentParserState,expectedParserStates))
-          {
-            // Save any current data and prepare for a new parameter name.
-            if (parameterName != null)
-            {
-              saveData(parameterName,parameterValue.toString());
-              parameterName = null;
-              parameterValue.setLength(0);
-            }
-            currentParserState = PARSER_STATE_BOUNDARY;
-          }
-          else
-            throw new MultipartFormDataException(getParserExceptionMessage(currentParserState,expectedParserStates));
-        }
-        else if (line.startsWith(HEADER_CONTENT_DISPOSITION))
-        {
-          byte[] expectedParserStates = {PARSER_STATE_BOUNDARY};
-          if (isValidParserState(currentParserState,expectedParserStates))
-          {
-            // Obtain the parameter name without the surrounding double quotes. Accounts for RFC 1867 too.
-            int parameterNameStartingPosition = line.indexOf(HEADER_NAME)+HEADER_NAME.length();
-            parameterName = line.substring(parameterNameStartingPosition,+parameterNameStartingPosition+line.substring(parameterNameStartingPosition).indexOf('\"'));
-            currentParserState = PARSER_STATE_PARAMETER;
-          }
-        }
-        else if (currentParserState == PARSER_STATE_PARAMETER)
-        {
-          // A blank line should follow the PARAMETER. Discard the line and move on.
-          currentParserState = PARSER_STATE_BLANK;
-        }
-        else
-        {
-          // Expect the line to contain data.
-          if (parameterValue.length() > 0)
-            parameterValue.append('\n');
-          parameterValue.append(line);
-          currentParserState = PARSER_STATE_DATA;
-        }
-      }
-    }
-    catch (Throwable t)
-    {
-      throw new MultipartFormDataException(t.getMessage());
-    }
-    //dumpParamTable();
-  }
-
-  /**
-   * Returns the value of a request parameter as a String, or null if the parameter does not exist.
-   * If the parameter has multiple values, only the first value is returned. Use getParameterValues()
-   * for parameters with multiple values.
-   */
-  public final String getParameter(String parameter) throws MultipartFormDataException
-  {
-    if (paramTable_ == null)
-      throw new MultipartFormDataException("Parser contains no parsed data");
-    Vector values = (Vector)paramTable_.get(parameter);
-    return ((values != null)?((String)values.elementAt(0)):null);
-  }
-
-  public final String[] getParameterValues(String parameter) throws MultipartFormDataException
-  {
-    if (paramTable_ == null)
-      throw new MultipartFormDataException("Parser contains no parsed data");
-    Vector valuesVector = (Vector)paramTable_.get(parameter);
-    if (valuesVector == null)
-      return null;
-    String[] valuesArray = new String[valuesVector.size()];
-    for (int i=0;i<valuesArray.length;i++)
-      valuesArray[i] = (String)valuesVector.elementAt(i);
-    return valuesArray;
-  }
-
-  public final String[] getParameterNames() throws MultipartFormDataException
-  {
-    if (paramTable_ == null)
-      throw new MultipartFormDataException("Parser contains no parsed data");
-
-    int size = paramTable_.size();
-    if (size == 0)
-      return null;
-    String[] names = new String[size];
-    Enumeration keys = paramTable_.keys();
-    for (int i=0;i<size;i++)
-      names[i] = (String)keys.nextElement();
-    return names;
-  }
-
-  private final void saveData(String parameterName,String parameterValue)
-  {
-    Vector values = (Vector)paramTable_.get(parameterName);
-    if (values == null)
-      values = new Vector();
-    values.addElement(parameterValue);
-    paramTable_.put(parameterName,values);
-  }
-
-  private final boolean isValidParserState(byte currentState,byte[] expectedStates)
-  {
-    boolean validity = false;
-    for (int i=0;i<expectedStates.length;i++)
-    {
-      if (currentState == expectedStates[i])
-      {
-        validity = true;
-        break;
-      }
-    }
-    return validity;
-  }
-
-  private final String getParserExceptionMessage(byte currentState,byte[] expectedStates)
-  {
-    StringBuffer msg = new StringBuffer("Parser state inconsistency!");
-    msg.append('\n');
-    msg.append("Current state    : ").append(parserStates[currentState]).append('\n');
-    msg.append("Expected state(s): ");
-    for (int i=0;i<expectedStates.length;i++)
-    {
-      msg.append(parserStates[expectedStates[i]]);
-      if (i != expectedStates.length-1)
-        msg.append(", ");
-    }
-    msg.append('\n');
-    return msg.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
deleted file mode 100644
index 085151316..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/QuickSort.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import java.text.*;
-import java.util.Vector;
-
-public class QuickSort
-{
-  public static final void sort(Object[] a,int lo,int hi)
-  {
-    Object tmp;
-    int i = lo;
-    int j = hi;
-    Object x = a[(lo+hi)/2];
-    Collator collator = Collator.getInstance();
-
-    do
-    {
-      while (collator.compare(a[i].toString(),x.toString()) < 0) i++;
-      while (collator.compare(a[j].toString(),x.toString()) > 0) j--;
-      if (i <= j)
-      {
-        tmp = a[i];
-        a[i] = a[j];
-        a[j] = tmp;
-        i++;
-        j--;
-      }
-    } while (i <= j);
-
-    if (lo < j)
-      sort(a,lo,j);
-    if (i < hi)
-      sort(a,i,hi);
-  }
-
-  /*
-  * This method will use the same algorithm as above
-  * with the exception that any nulls will be attached
-  * at the end
-  */
-  public static final void sort(Vector v)
-  {
-    // do not sort if vector contains less than 2 elements
-    if (v.size() < 2)
-        return;
-  
-    // pulls out the nulls
-    Vector nulls = new Vector();
-    for (int i = 0; i < v.size(); i++) {
-      Object obj = v.elementAt(i);
-      if (obj == null || obj.toString() == null) {
-        nulls.add(obj);
-        v.remove(i);
-        i--;
-      }
-    }
-
-    // sort the not null objects
-    Object[] objs = v.toArray();
-    // do not sort if array contains less than 2 objects
-    if (objs.length >= 2)
-        sort(objs, 0, objs.length-1);
-
-    // re-construct the vector from the sorted objects, then the nulls
-    v.clear();
-    for (int j = 0; j < objs.length; j++) {
-        v.add(objs[j]);
-    }
-    v.addAll(nulls);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
deleted file mode 100644
index 3f3fc03d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/TrimFilter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-import javax.servlet.http.*;
-import javax.servlet.*;
-
-import java.io.*;
-
-public class TrimFilter implements Filter
-{
-
-  /* (non-Javadoc)
-   * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
-   */
-  public void init(FilterConfig arg0) throws ServletException
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-  /* (non-Javadoc)
-   * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet.FilterChain)
-   */
-  public void doFilter(ServletRequest req, ServletResponse resp, FilterChain fc) throws IOException, ServletException
-  {
-    // TODO Auto-generated method stub
-    CharArrayWrapper responseWrapper = new CharArrayWrapper((HttpServletResponse)resp);
-    // Hack for Tomcat performance problem with filters.
-    OutputStreamWriter osw = new OutputStreamWriter(resp.getOutputStream(),HTMLUtils.UTF8_ENCODING);
-    fc.doFilter(req,responseWrapper);
-    String responseString = responseWrapper.toString();
-    osw.write(responseString.trim());
-    osw.close();
-  }
-
-  /* (non-Javadoc)
-   * @see javax.servlet.Filter#destroy()
-   */
-  public void destroy()
-  {
-    // TODO Auto-generated method stub
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.java
deleted file mode 100644
index b7070b348..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/URLUtils.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.wst.ws.internal.explorer.platform.util;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * This class contains utility methods for managing URLs
- * as used by the Web Services Explorer Web application.
- * @author cbrealey@ca.ibm.com
- */
-public final class URLUtils
-{
-	/**
-	 * Objects of this class should not be constructed.
-	 */
-	private URLUtils ()
-	{
-	}
-
-	/**
-	 * UTF-8
-	 */
-	public static final String UTF8 = "UTF-8";
-
-	/**
-	 * Equivalent to {@link #encode(String,String)}
-	 * with second parameter set to the "UTF-8" encoding.
-	 * @param s The string to encode.
-	 * @return The encoded string.
-	 */
-	public static String encode(String s)
-	{
-		return encode(s,UTF8);
-	}
-	
-	/**
-	 * Equivalent to {@link URLEncoder#encode(String,String)},
-	 * only throws an unchecked {@link RuntimeException} wrapped
-	 * around an {@link UnsupportedEncodingException} instead of
-	 * an {@link UnsupportedEncodingException}.
-	 * @param s The string to encode.
-	 * @param enc The encoding to use.
-	 * @return The encoded string.
-	 */
-	public static String encode(String s, String enc)
-	{
-		try
-		{
-			return URLEncoder.encode(s,enc);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			// TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
-			throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
-		}
-	}
-	
-	/**
-	 * Equivalent to {@link #decode(String,String)}
-	 * with second parameter set to the "UTF-8" encoding.
-	 * @param s The string to decode.
-	 * @return The decoded string.
-	 */
-	public static String decode(String s)
-	{
-		return decode(s,UTF8);
-	}
-	
-	/**
-	 * Equivalent to {@link URLEncoder#decode(String,String)},
-	 * only throws an unchecked {@link RuntimeException} wrapped
-	 * around an {@link UnsupportedEncodingException} instead of
-	 * an {@link UnsupportedEncodingException}.
-	 * @param s The string to decode.
-	 * @param enc The encoding to use.
-	 * @return The decoded string.
-	 */
-	public static String decode(String s, String enc)
-	{
-		try
-		{
-			return URLDecoder.decode(s,enc);
-		}
-		catch (UnsupportedEncodingException e)
-		{
-			// TODO: MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8
-			throw new RuntimeException("%MSG_BROKEN_VM_DOES_NOT_SUPPORT_UTF-8",e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
deleted file mode 100644
index 6a6de221f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/Validator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.util;
-
-public class Validator
-{
-  public static final boolean validateString(String input)
-  {
-    return ((input != null) && (input.trim().length() > 0));
-  }
-
-  public static final boolean validateURL(String input)
-  {
-    return ((input != null) && (input.indexOf("://") != -1));
-  }
-  
-  public static final boolean validateInteger(String input)
-  {
-    try
-    {
-      Integer.parseInt(input);
-      return true;
-    }
-    catch (NumberFormatException e)
-    {
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
deleted file mode 100644
index bcbe4d487..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/util/XMLUtils.java
+++ /dev/null
@@ -1,140 +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.wst.ws.internal.explorer.platform.util;
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
-
-import javax.xml.parsers.*;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import java.io.*;
-
-public final class XMLUtils
-{
-  /**
-   * Serialize an XML Element into a String.
-   * @param e Element to be serialized.
-   * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
-   * @return String representation of the XML document fragment.
-   */
-  public static final String serialize(Element e,boolean omitXMLDeclaration)
-  {
-    if (e != null)
-    {
-      try
-      {
-		DOMSource domSource = new DOMSource(e);
-		Transformer serializer = TransformerFactory.newInstance().newTransformer();
-		serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
-		serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-		serializer.setOutputProperty(OutputKeys.ENCODING, HTMLUtils.UTF8_ENCODING);
-		serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		serializer.transform(domSource, new	StreamResult(baos));
-		baos.close();
-		return new String(baos.toByteArray(), HTMLUtils.UTF8_ENCODING);
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return null;
-  }
-    
-  /**
-   * Serialize an XML Element into a String.
-   * @param df DocumentFragment to be serialized.
-   * @param omitXMLDeclaration boolean representing whether or not to omit the XML declaration.
-   * @return String representation of the XML document fragment.
-   */  
-  public static final String serialize(DocumentFragment df,boolean omitXMLDeclaration)
-  {
-    if (df != null)
-    {
-      try
-      {
-		DOMSource domSource = new DOMSource(df);
-		Transformer serializer = TransformerFactory.newInstance().newTransformer();
-		serializer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, ((omitXMLDeclaration) ? "yes" : "no"));
-		serializer.setOutputProperty(OutputKeys.INDENT, "yes");
-		serializer.setOutputProperty(OutputKeys.ENCODING, HTMLUtils.UTF8_ENCODING);
-		serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		serializer.transform(domSource, new	StreamResult(baos));
-		baos.close();
-		return new String(baos.toByteArray(), HTMLUtils.UTF8_ENCODING);
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return null;
-  }
-  
-  /**
-   * Create a new XML Document.
-   * @param docBuilder DocumentBuilder. Setting this to null will create a new DocumentBuilder.
-   * @return Document
-   */
-  public static final Document createNewDocument(DocumentBuilder docBuilder) throws ParserConfigurationException
-  {
-    if (docBuilder == null)
-    {
-      DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-      factory.setNamespaceAware(false);
-      factory.setValidating(false);
-      docBuilder = factory.newDocumentBuilder();
-    }
-    Document doc = docBuilder.newDocument();
-    return doc;
-  }
-
-  /**
-   * Convert the String representation of an Element into an Element
-   * @param String representation of an Element.
-   * @return Element
-   */
-  public static Element stringToElement(String s) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException {
-    return stringToElement(s, false);
-  }
-
-  /**
-   * Convert the String representation of an Element into an Element
-   * @param String representation of an Element.
-   * @param boolean set whether the return Element should be namespace aware.
-   * @return Element
-   */
-  public static Element stringToElement(String s, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
-  {
-    return byteArrayToElement(s.getBytes(HTMLUtils.UTF8_ENCODING), namespaceAware);
-  }
-
-  /**
-   * Convert the byte array representation of an Element into an Element
-   * @param byte[] representation of an Element.
-   * @param boolean set whether the return Element should be namespace aware.
-   * @return Element
-   */
-  public static Element byteArrayToElement(byte[] b, boolean namespaceAware) throws ParserConfigurationException, SAXException, UnsupportedEncodingException, IOException
-  {
-    DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
-    docBuilderFactory.setNamespaceAware(namespaceAware);
-    docBuilderFactory.setValidating(false);
-    DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
-    Document doc = docBuilder.parse(new ByteArrayInputStream(b));
-    return doc.getDocumentElement();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
deleted file mode 100644
index 4c16789d0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ClearWSDLAction.java
+++ /dev/null
@@ -1,96 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLNode;
-
-import javax.servlet.http.*;
-
-public class ClearWSDLAction extends ClearNodeAction {
-
-  public ClearWSDLAction(Controller controller) {
-    super(controller, controller.getWSDLPerspective().getNodeManager());
-  }
-
-  public static String getActionLink(int nodeID) {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/ClearWSDLActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request) {
-    String nodeIDString = request.getParameter(ActionInputs.NODEID);
-    int nodeID;
-    try {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe) {
-      nodeID = nodeManager_.getSelectedNodeId();
-    }
-    boolean paramValid = false;
-    Node node = nodeManager_.getNode(nodeID);
-    if (node instanceof WSDLMainNode)
-      paramValid = true;
-    else if (node instanceof WSDLNode)
-      paramValid = true;
-    else {
-      while (node != null && !(node instanceof WSDLMainNode)) {
-        node = node.getParent();
-        if (node instanceof WSDLNode) {
-          nodeID = node.getNodeId();
-          paramValid = true;
-          break;
-        }
-      }
-    }
-    propertyTable_.put(ActionInputs.NODEID, String.valueOf(nodeID));
-    return paramValid;
-  }
-
-  public boolean run() {
-    if (super.run()) {
-      nodeManager_.setSelectedNodeId(nodeManager_.getRootNode().getNodeId());
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public String getTreeContentVar() {
-    return "wsdlNavigatorContent";
-  }
-
-  public String getTreeContentPage() {
-    return "wsdl/wsdl_navigator_content.jsp";
-  }
-
-  public String getPropertiesContainerVar() {
-    return "wsdlPropertiesContainer";
-  }
-
-  public String getPropertiesContainerPage() {
-    return "wsdl/wsdl_properties_container.jsp";
-  }
-
-  public String getStatusContentVar() {
-    return "wsdlStatusContent";
-  }
-
-  public String getStatusContentPage() {
-    return "wsdl/wsdl_status_content.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
deleted file mode 100644
index abca81e9d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/CreateInstanceAction.java
+++ /dev/null
@@ -1,87 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-import javax.wsdl.Part;
-import java.util.Iterator;
-
-public class CreateInstanceAction extends WSDLPropertiesFormAction
-{
-  public CreateInstanceAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    boolean resultsValid = true;
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = operElement.getFragment(part);
-      if (!frag.processParameterValues(parser))
-        resultsValid = false;
-    }
-    String fragmentID = parser.getParameter(FragmentConstants.FRAGMENT_ID);
-    if (fragmentID != null && fragmentID.length() > 0)
-      propertyTable_.put(FragmentConstants.FRAGMENT_ID, fragmentID);
-    else
-    {
-      propertyTable_.remove(FragmentConstants.FRAGMENT_ID);
-      resultsValid = false;
-    }
-    String nameAnchorID = parser.getParameter(FragmentConstants.NAME_ANCHOR_ID);
-    invokeWSDLOperationTool.setFragmentNameAnchorID(nameAnchorID);
-    return resultsValid;
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-  }
-
-  public boolean run()
-  {
-    String fragmentID = (String)propertyTable_.get(FragmentConstants.FRAGMENT_ID);
-    if (fragmentID != null && fragmentID.length() > 0)
-    {
-      WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-      NodeManager nodeManager = wsdlPerspective.getNodeManager();
-      Node selectedNode = nodeManager.getSelectedNode();
-      WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-      IXSDFragment frag = operElement.getFragmentByID(fragmentID);
-      if ((frag instanceof IXSDMapFragment) && ((IXSDMapFragment)frag).createInstance() != null)
-        return true;
-      else
-        return false;
-    }
-    else
-      return false;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
deleted file mode 100644
index d069e4312..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpGetOperationFormAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.net.URLConnection;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpGetOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
-  public InvokeWSDLHttpGetOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-    
-  public boolean run()
-  {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    StringBuffer endPoint = new StringBuffer(getEndPoint());
-    endPoint.append('?');
-    addParameters(endPoint);
-    String endPointString = endPoint.toString();
-    boolean result = false;
-    try
-    {
-      URLConnection conn = NetUtils.getURLConnection(endPointString);
-      if (conn != null)
-      {
-        recordHttpResponse(conn,messageQueue);
-        wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
-        result = true;
-      }
-      else
-        throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString));
-    }
-    catch (IOException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
deleted file mode 100644
index d85832a19..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpOperationFormAction.java
+++ /dev/null
@@ -1,109 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-
-import javax.wsdl.*;
-
-import java.util.*;
-import java.net.*;
-import java.io.*;
-
-public abstract class InvokeWSDLHttpOperationFormAction extends WSDLPropertiesFormAction
-{
-  private static final String CONTENT_TYPE_CHARSETEQ = "charset=";
-  
-  public InvokeWSDLHttpOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
-    Node selectedNode = getSelectedNavigatorNode();
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    invokeWSDLOperationTool.setEndPoint(endPoint);
-    WSDLOperationElement operElement = (WSDLOperationElement)(selectedNode.getTreeElement());
-    propertyTable_.put(WSDLActionInputs.OPERATION_ELEMENT,operElement);
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    boolean resultsValid = true;
-    while (it.hasNext()) {
-      Part part = (Part)it.next();
-      IFragment frag = operElement.getFragment(part);
-      if (!frag.processParameterValues(parser))
-        resultsValid = false;
-    }
-    return resultsValid;
-  }  
-  
-  protected String getEndPoint()
-  {
-    StringBuffer endPoint = new StringBuffer((String)propertyTable_.get(WSDLActionInputs.END_POINT));
-    WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
-    if (endPoint.charAt(endPoint.length()-1) != '/')
-      endPoint.append('/');
-    endPoint.append(operElement.getName());
-    return endPoint.toString();    
-  }
-  
-  protected void addParameters(StringBuffer buffer)
-  {
-    WSDLOperationElement operElement = (WSDLOperationElement)propertyTable_.get(WSDLActionInputs.OPERATION_ELEMENT);
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = operElement.getFragment(part);
-      buffer.append(HTTPUtil.genURLEncodedParameters(frag));
-      if (it.hasNext())
-        buffer.append('&');
-    }
-  }
-  
-  protected void recordHttpResponse(URLConnection conn,MessageQueue messageQueue) throws IOException
-  {
-    BufferedReader br = null;
-    try
-    {
-      InputStreamReader in = null;
-      String contentType = conn.getContentType();
-      if (contentType != null)
-      {
-        int charsetEqPos = contentType.indexOf(CONTENT_TYPE_CHARSETEQ);
-        if (charsetEqPos != -1)
-          in = new InputStreamReader(conn.getInputStream(),contentType.substring(charsetEqPos+CONTENT_TYPE_CHARSETEQ.length()));
-      }
-      if (in == null)
-        in = new InputStreamReader(conn.getInputStream());
-      br = new BufferedReader(in);
-      String s;
-      while ((s = br.readLine()) != null)
-        messageQueue.addMessage(s);
-      br.close();
-      br = null;
-    }
-    catch (IOException e)
-    {
-      if (br != null)
-        br.close();
-      throw e;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
deleted file mode 100644
index 981c4307f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLHttpPostOperationFormAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.net.URLConnection;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.MessageQueue;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-
-public class InvokeWSDLHttpPostOperationFormAction extends InvokeWSDLHttpOperationFormAction
-{
-
-  public InvokeWSDLHttpPostOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean run()
-  {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    boolean result = false;
-    String endPointString = getEndPoint();
-    URLConnection conn = NetUtils.getURLConnection(endPointString);
-    if (conn != null)
-    {
-      StringBuffer parameters = new StringBuffer();
-      addParameters(parameters);
-      conn.setDoOutput(true);
-      PrintWriter out = null;
-      try
-      {
-        out = new PrintWriter(conn.getOutputStream());
-        out.print(parameters);
-        out.close();
-        out = null;
-        recordHttpResponse(conn,messageQueue);
-        wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
-        result = true;
-      }
-      catch (IOException e)
-      {
-        handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-      }
-      finally
-      {
-        if (out != null)
-          out.close();
-      }
-    }
-    else
-      handleUnexpectedException(wsdlPerspective,messageQueue,"Exception",new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",endPointString)));
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
deleted file mode 100644
index b3668d9f7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationAction.java
+++ /dev/null
@@ -1,269 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPException;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport.HTTPTransport;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*;
-import org.eclipse.wst.ws.internal.parser.discovery.*;
-
-import org.apache.axis.Constants;
-
-import org.w3c.dom.*;
-
-import javax.xml.parsers.*;
-import javax.wsdl.*;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.servlet.http.HttpServletResponse;
-
-import java.util.*;
-import java.io.*;
-
-public abstract class InvokeWSDLSOAPOperationAction extends WSDLPropertiesFormAction
-{
-  public InvokeWSDLSOAPOperationAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    String endPoint = parser.getParameter(WSDLActionInputs.END_POINT);
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
-    invokeWSDLOperationTool.setEndPoint(endPoint);
-    return true;
-  }
-
-  protected final void addRPCWrapper(Vector bodyEntries,WSDLElement wsdlElement,WSDLOperationElement operElement,Hashtable soapEnvelopeNamespaceTable) throws ParserConfigurationException
-  {
-    // Must be RPC style.
-    String encodingNamespaceURI = null;
-    /*
-     * WS-I: In a rpc-literal SOAP binding, the serialized child element of the 
-     * soap:Body element consists of a wrapper element, whose namespace is the value 
-     * of the namespace attribute of the soapbind:body element and whose local name is 
-     * either the name of the operation or the name of the operation suffixed 
-     * with "Response". The namespace attribute is required, as opposed to being 
-     * optional, to ensure that the children of the soap:Body element are namespace-
-     * qualified.
-     */
-    BindingOperation bindingOperation = operElement.getBindingOperation();
-    if (bindingOperation != null)
-    {
-      BindingInput bindingInput = bindingOperation.getBindingInput();
-      if (bindingInput != null)
-      {
-        List extElements = bindingInput.getExtensibilityElements();
-        for (Iterator it = extElements.iterator(); it.hasNext();)
-        {
-          ExtensibilityElement extElement = (ExtensibilityElement)it.next();
-          if (extElement instanceof SOAPBody)
-          {
-            encodingNamespaceURI = ((SOAPBody)extElement).getNamespaceURI();
-            break;
-          }
-        }
-      }
-    }
-    // If the namespace of the soapbind:body element is not set, get it from the operation element
-    if (encodingNamespaceURI == null)
-      encodingNamespaceURI = operElement.getEncodingNamespace();
-    // If the namespace of the operation element is not set, get it from the definition element
-    if (encodingNamespaceURI == null)
-    {
-      Definition definition = wsdlElement.getDefinition();
-      encodingNamespaceURI = definition.getTargetNamespace();
-    }
-    // Generate an RPC style wrapper element.
-    Document doc = XMLUtils.createNewDocument(null);
-    String encodingStyle = (operElement.isUseLiteral() ? null : operElement.getEncodingStyle());
-    Element wrapperElement = SoapHelper.createRPCWrapperElement(doc,soapEnvelopeNamespaceTable,encodingNamespaceURI,operElement.getOperation().getName(),encodingStyle);
-    for (int i=0;i<bodyEntries.size();i++)
-      wrapperElement.appendChild(doc.importNode((Element)bodyEntries.elementAt(i),true));
-    bodyEntries.removeAllElements();
-    bodyEntries.addElement(wrapperElement);
-  }
-
-  /**
-   * Generate a Vector of the elements inside the Soap Body.
-   * @param soapEnvelopeNamespaceTable - Hashtable containing a map of the namespace URIs to prefixes.
-   * @param operElement - WSDLOperationElement encapsulating the WSDL operation.
-   */
-  protected Vector getBodyEntries(Hashtable soapEnvelopeNamespaceTable,WSDLOperationElement operElement,WSDLBindingElement bindingElement,WSDLServiceElement serviceElement) throws ParserConfigurationException,Exception
-  {
-    Vector bodyEntries = new Vector();
-    boolean isUseLiteral = operElement.isUseLiteral();
-    String encodingStyle = operElement.getEncodingStyle();
-    boolean addEncodingStyle = (!isUseLiteral && !Constants.URI_SOAP11_ENC.equals(encodingStyle));
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
-      Element[] instanceDocuments = frag.genInstanceDocumentsFromParameterValues(!isUseLiteral,soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-      for (int j=0;j<instanceDocuments.length;j++)
-      {
-        if (instanceDocuments[j] == null)
-          continue;
-        if (addEncodingStyle)
-          instanceDocuments[j].setAttribute("soapenv:encodingStyle",encodingStyle);
-        bodyEntries.addElement(instanceDocuments[j]);
-      }
-    }
-
-    if (!operElement.isDocumentStyle())
-    {
-      try
-      {
-        addRPCWrapper(bodyEntries,(WSDLElement)serviceElement.getParentElement(),operElement,soapEnvelopeNamespaceTable);
-      }
-      catch (ParserConfigurationException e)
-      {
-        throw e;
-      }
-    }
-    return bodyEntries;
-  }
-
-  protected Element getSOAPEnvelope(Hashtable soapEnvelopeNamespaceTable, Vector bodyEntries) throws ParserConfigurationException
-  {
-    DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-    Document doc = XMLUtils.createNewDocument(docBuilder);
-    Element soapEnvelopeElement = SoapHelper.createSoapEnvelopeElement(doc,soapEnvelopeNamespaceTable);
-    Element soapBodyElement = SoapHelper.createSoapBodyElement(doc);
-    for (int i=0;i<bodyEntries.size();i++)
-      soapBodyElement.appendChild(doc.importNode((Element)bodyEntries.elementAt(i),true));
-    soapEnvelopeElement.appendChild(soapBodyElement);
-    return soapEnvelopeElement;
-  }
-
-  private final void recordSoapRequest(SOAPMessageQueue soapRequestQueue,Hashtable soapEnvelopeNamespaceTable,Element soapEnvelope) throws ParserConfigurationException,IOException
-  {
-    soapRequestQueue.clear();
-    soapRequestQueue.addMessage(XMLUtils.serialize(soapEnvelope,false));
-  }
-
-  private final void recordSOAPResponse(SOAPMessageQueue soapResponseQueue,BufferedReader responseReader) throws IOException
-  {
-    soapResponseQueue.clear();
-    if (responseReader != null)
-    {
-      String line = null;
-      while ((line = responseReader.readLine()) != null)
-        soapResponseQueue.addMessage(line);
-      responseReader.close();
-    }
-  }
-
-  public boolean run()
-  {
-    String soapAddressLocation = (String)propertyTable_.get(WSDLActionInputs.END_POINT);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
-    WSDLBindingElement bindingElement = (WSDLBindingElement)operElement.getParentElement();
-    WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
-    operElement.setPropertyAsObject(WSDLActionInputs.SOAP_RESPONSE_CACHED, new Boolean(false));
-    try
-    {
-      // Generate the SOAP envelope and its children. We need to create a DOM element version to display and the object version to execute.
-      // <SOAP-ENV:Envelope
-      //    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-      //    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      //    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      // ...
-      Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-      SoapHelper.addDefaultSoapEnvelopeNamespaces(soapEnvelopeNamespaceTable);
-      Vector bodyEntries = getBodyEntries(soapEnvelopeNamespaceTable,operElement,bindingElement,serviceElement);
-      Element soapEnvelope = getSOAPEnvelope(soapEnvelopeNamespaceTable, bodyEntries);
-      recordSoapRequest(wsdlPerspective.getSOAPRequestQueue(),soapEnvelopeNamespaceTable,soapEnvelope);
-
-      // Execute the SOAP operation.
-      if (soapAddressLocation != null)
-      {
-        // Send the message and record the SOAP Response Envelope.
-        HTTPTransport transport = createTransport(bindingElement, soapAddressLocation);
-        transport.send(NetUtils.createURL(soapAddressLocation),operElement.getSoapAction(),XMLUtils.serialize(soapEnvelope, true));
-        recordSOAPResponse(wsdlPerspective.getSOAPResponseQueue(),transport.receive());
-        wsdlPerspective.setOperationNode(getSelectedNavigatorNode());
-        return true;
-      }
-      throw new IOException(wsdlPerspective.getMessage("MSG_ERROR_UNABLE_TO_CONNECT",soapAddressLocation));
-    }
-    catch (ParserConfigurationException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"ParserConfigurationException",e);
-    }
-    catch (IOException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-    }
-    catch (HTTPException httpe)
-    {
-      throwHTTPException(bindingElement, soapAddressLocation, httpe);
-    }
-    catch (Exception e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"Exception",e);
-    }
-    return false;
-  }
-  
-  private void throwHTTPException(WSDLBindingElement bindingElement, String endpointString, HTTPException httpException) throws HTTPException
-  {
-    if (httpException.getStatusCode() == HttpServletResponse.SC_UNAUTHORIZED)
-    {
-      Endpoint endpoint = bindingElement.getEndpoint(endpointString);
-      if (endpoint != null)
-      {
-        endpoint.setRequireHTTPBasicAuth(true);
-        endpoint.setHttpBasicAuthUsername(null);
-        endpoint.setHttpBasicAuthPassword(null);
-      }
-    }
-    throw httpException;
-  }
-  
-  private HTTPTransport createTransport(WSDLBindingElement bindingElement, String endpointString)
-  {
-    HTTPTransport transport = new HTTPTransport();
-    Endpoint endpoint = bindingElement.getEndpoint(endpointString);
-    if (endpoint != null)
-    {
-      if (endpoint.isRequireHTTPBasicAuth())
-      {
-        String httpBasicAuthUsername = endpoint.getHttpBasicAuthUsername();
-        String httpBasicAuthPassword = endpoint.getHttpBasicAuthPassword();
-        if (httpBasicAuthUsername == null || httpBasicAuthPassword == null)
-        {
-          httpBasicAuthUsername = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_USERNAME);
-          httpBasicAuthPassword = (String)propertyTable_.get(WSDLActionInputs.HTTP_BASIC_AUTH_PASSWORD);
-          endpoint.setHttpBasicAuthUsername(httpBasicAuthUsername);
-          endpoint.setHttpBasicAuthPassword(httpBasicAuthPassword);
-        }
-        if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
-        {
-          transport.setHttpBasicAuthUsername(httpBasicAuthUsername);
-          transport.setHttpBasicAuthPassword(httpBasicAuthPassword);
-        }
-      }
-    }
-    return transport;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
deleted file mode 100644
index db7653225..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationFormAction.java
+++ /dev/null
@@ -1,65 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.transformer.FragmentTransformer;
-
-import javax.wsdl.*;
-import java.util.*;
-
-public class InvokeWSDLSOAPOperationFormAction extends InvokeWSDLSOAPOperationAction
-{
-  public InvokeWSDLSOAPOperationFormAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    boolean resultsValid = true;
-    super.processParsedResults(parser);
-    String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
-    if (sourceContent == null)
-    {
-      WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-      MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-      WSDLOperationElement operElement = (WSDLOperationElement) getSelectedNavigatorNode().getTreeElement();
-      Iterator it = operElement.getOrderedBodyParts().iterator();
-      while (it.hasNext())
-      {
-        Part part = (Part) it.next();
-        IFragment frag = operElement.getFragment(part);
-        if (!frag.processParameterValues(parser))
-        {
-          messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_VALIDATING_PARAMETER", part.getName()));
-          resultsValid = false;
-        }
-      }
-    }
-    return resultsValid;
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new FragmentTransformer(controller_);
-    return transformers;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
deleted file mode 100644
index 6ed599247..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/InvokeWSDLSOAPOperationSourceAction.java
+++ /dev/null
@@ -1,158 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.util.*;
-import org.w3c.dom.*;
-import javax.xml.parsers.*;
-import java.util.*;
-import java.io.*;
-
-public class InvokeWSDLSOAPOperationSourceAction extends InvokeWSDLSOAPOperationAction
-{
-  private boolean newFileSelected_;
-  private boolean saveAsSelected_;
-  private static final String DUMMY_WRAPPER_START_TAG = "<dummyWrapper>";
-  private static final String DUMMY_WRAPPER_END_TAG = "</dummyWrapper>";
-  
-  public InvokeWSDLSOAPOperationSourceAction(Controller controller)
-  {
-    super(controller);
-    newFileSelected_ = false;
-    saveAsSelected_ = false;
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    WSDLOperationElement operElement = (WSDLOperationElement)getSelectedNavigatorNode().getTreeElement();
-    newFileSelected_ = false;
-    saveAsSelected_ = false;
-    /*  try and catch is needed if we are doing fragmentization.
-    try
-    {
-    */
-      String submissionAction = parser.getParameter(WSDLActionInputs.SUBMISSION_ACTION);
-      String sourceContents = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
-      if (sourceContents != null)
-        operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,sourceContents);
-      if (WSDLActionInputs.SUBMISSION_ACTION_BROWSE_FILE.equals(submissionAction))
-      {
-        newFileSelected_ = true;
-        String fileContents = parser.getParameter(WSDLActionInputs.SELECTED_FILE);
-        if (fileContents != null)
-          operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,fileContents);
-      }
-      else
-      {
-        if (WSDLActionInputs.SUBMISSION_ACTION_SAVE_AS.equals(submissionAction))
-        {
-          // Save As... action
-          saveAsSelected_ = true;
-        }
-        else
-        {
-          // Fragmentize on Go action.
-          // fragmentize(new StringBuffer(sourceContents));
-          String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
-          if (nsDeclarations != null)
-            operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-        }
-      }
-      return true;
-    /*
-    }       
-    catch (ParserConfigurationException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"ParserConfigurationException",e);
-    }
-    catch (SAXException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"SAXException",e);
-    }
-    catch (UnsupportedEncodingException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"UnsupportedEncodingException",e);
-    }
-    catch (IOException e)
-    {
-      handleUnexpectedException(wsdlPerspective,messageQueue,"IOException",e);
-    }
-    return false;
-    */
-  }
-
-  /**
-   * Generate a Vector of the elements inside the Soap Body.
-   * @param soapEnvelopeNamespaceTable - Hashtable containing a map of the namespace URIs to prefixes.
-   * @param operElement - WSDLOperationElement encapsulating the WSDL operation.
-   */
-  protected Vector getBodyEntries(Hashtable soapEnvelopeNamespaceTable,WSDLOperationElement operElement,WSDLBindingElement bindingElement,WSDLServiceElement serviceElement) throws ParserConfigurationException,Exception
-  {
-    Vector bodyEntries = new Vector();
-    String[] nsDeclarations = (String[])operElement.getPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE);
-    for (int i = 0; i < nsDeclarations.length; i++)
-    {
-      String[] prefix_ns = SoapHelper.decodeNamespaceDeclaration(nsDeclarations[i]);
-      if (!soapEnvelopeNamespaceTable.contains(prefix_ns[1]))
-        soapEnvelopeNamespaceTable.put(prefix_ns[1], prefix_ns[0]);
-    }
-    StringBuffer sourceContent = new StringBuffer(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT));
-    sourceContent.insert(0,DUMMY_WRAPPER_START_TAG).append(DUMMY_WRAPPER_END_TAG);
-    Element dummyWrapperElement = XMLUtils.stringToElement(sourceContent.toString());          
-    NodeList nl = dummyWrapperElement.getChildNodes();
-    for (int i = 0; i < nl.getLength(); i++)
-    {
-      if (nl.item(i) instanceof Element)
-        bodyEntries.add(nl.item(i));
-    }
-    if (!operElement.isDocumentStyle())
-    {
-      try
-      {
-        addRPCWrapper(bodyEntries,(WSDLElement)serviceElement.getParentElement(),operElement,soapEnvelopeNamespaceTable);
-      }
-      catch (ParserConfigurationException e)
-      {
-        throw e;
-      }
-    }
-    return bodyEntries;
-  }
-
-  public final boolean wasNewFileSelected()
-  {
-    return newFileSelected_;
-  }
-  
-  public final boolean wasSaveAsSelected()
-  {
-    return saveAsSelected_;
-  }
-  
-  public final String getDefaultSaveAsFileName()
-  {
-    WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
-    return (new StringBuffer(operElement.getOperation().getName())).append(".txt").toString();
-  }
-  
-  public final void writeSourceContent(OutputStream os)
-  {
-    WSDLOperationElement operElement = (WSDLOperationElement)(getSelectedNavigatorNode().getTreeElement());
-    PrintWriter pw = new PrintWriter(os); 
-    pw.println(operElement.getPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT));
-    pw.close();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
deleted file mode 100644
index 338281506..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenWSDLAction.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-import javax.wsdl.WSDLException;
-import java.util.Vector;
-
-public class OpenWSDLAction extends WSDLPropertiesFormAction {
-
-  public OpenWSDLAction(Controller controller) {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String wsdlUrl = parser.getParameter(ActionInputs.QUERY_INPUT_WSDL_URL);
-    FormTool formTool = getSelectedFormTool();
-    propertyTable_.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
-    formTool.updatePropertyTable(propertyTable_);
-    return true;
-  }
-
-  public boolean run() {
-    String wsdlUrl = (String)propertyTable_.get(ActionInputs.QUERY_INPUT_WSDL_URL);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement rootElement = rootNode.getTreeElement();
-
-    // create a WSDLElement representing the WSDL
-    WSDLElement wsdlElement = new WSDLElement(wsdlUrl, rootElement.getModel(), wsdlUrl);
-    try
-    {
-      // open WSDL
-      Vector errorMessages = wsdlElement.loadWSDL();
-      if (errorMessages.size() > 0)
-      {
-        messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
-        for (int i=0;i<errorMessages.size();i++)
-          messageQueue.addMessage((String)errorMessages.elementAt(i));
-      }            
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlUrl));          
-      handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
-      return false;
-    }
-    rootElement.connect(wsdlElement,WSDLModelConstants.REL_WSDL, ModelConstants.REL_OWNER);
-
-    // build the datamodel for this WSDLElement
-    wsdlElement.buildModel();
-
-    // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
-    // If there is just the one service and binding node, select the binding node.
-    // select the new WSDL node
-    Node wsdlNode = rootNode.getChildNode(wsdlElement);
-    Vector serviceNodes = wsdlNode.getChildNodes();
-    int newSelectedNodeId = wsdlNode.getNodeId();
-    if (serviceNodes.size() == 1)
-    {
-      Node serviceNode = (Node)serviceNodes.elementAt(0);
-      Vector bindingNodes = serviceNode.getChildNodes();
-      if (bindingNodes.size() == 1)
-      {
-        Node bindingNode = (Node)bindingNodes.elementAt(0);
-        newSelectedNodeId = bindingNode.getNodeId();
-      }
-      else
-        newSelectedNodeId = serviceNode.getNodeId();
-    }
-    nodeManager.setSelectedNodeId(newSelectedNodeId);
-    nodeManager.makeNodeVisible(nodeManager.getNode(newSelectedNodeId));
-    addToHistory(ActionInputs.PERSPECTIVE_WSDL,SelectWSDLPropertiesToolAction.getActionLink(newSelectedNodeId, 0, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));
-    messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_OPEN_WSDL_SUCCESSFUL", wsdlUrl));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
deleted file mode 100644
index c12cfd50a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/OpenXSDInfoDialogAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-import javax.servlet.http.*;
-
-public class OpenXSDInfoDialogAction extends Action
-{
-  public OpenXSDInfoDialogAction()
-  {
-  }
-
-  public static final String getActionLink(String sessionId,int nodeId,String fragId)
-  {
-    StringBuffer actionLink = new StringBuffer("wsdl/fragment/XSDInfoDialog.jsp?");
-    actionLink.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-    actionLink.append('&').append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(WSDLActionInputs.FRAGMENT_ID).append('=').append(fragId);
-    return actionLink.toString();
-  }
-
-  public final boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public final boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
deleted file mode 100644
index 8cb9062b8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/RefreshWSDLAction.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-
-import java.util.Vector;
-import javax.wsdl.Definition;
-import javax.wsdl.WSDLException;
-import javax.servlet.http.*;
-
-public class RefreshWSDLAction extends LinkAction {
-
-  public RefreshWSDLAction(Controller controller) {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID) {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLRefreshActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request) {
-    NodeManager nodeManager = controller_.getWSDLPerspective().getNodeManager();
-    String nodeIDString = request.getParameter(ActionInputs.NODEID);
-    int nodeID;
-    try {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe) {
-      nodeID = nodeManager.getSelectedNodeId();
-    }
-    Node node = nodeManager.getNode(nodeID);
-    while (node != null && !(node instanceof WSDLMainNode)) {
-      if (node instanceof WSDLNode) {
-        propertyTable_.put(ActionInputs.NODEID, String.valueOf(node.getNodeId()));
-        return true;
-      }
-      node = node.getParent();
-    }
-    return false;
-  }
-
-  public boolean run() {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node wsdlNode = nodeManager.getNode(nodeID);
-    WSDLElement wsdlElement = (WSDLElement)wsdlNode.getTreeElement();
-    Definition definitionCopy = wsdlElement.getDefinition();
-    Vector schemaListCopy = wsdlElement.getSchemaList();
-    wsdlElement.setDefinition(null);
-    wsdlElement.setSchemaList(new Vector());
-    int selectedNodeID = nodeManager.getSelectedNode().getNodeId();
-
-    try {
-      // open WSDL
-      Vector errorMessages = wsdlElement.loadWSDL();
-      if (errorMessages.size() > 0) {
-        messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_XSD_VALIDATION"));
-        for (int i=0;i<errorMessages.size();i++)
-          messageQueue.addMessage((String)errorMessages.elementAt(i));
-      }            
-    }
-    catch (WSDLException e)
-    {
-      messageQueue.addMessage(wsdlPerspective.getMessage("MSG_ERROR_OPEN_WSDL",wsdlElement.getWsdlUrl()));          
-      handleUnexpectedException(wsdlPerspective,messageQueue,"WSDLException",e);
-      wsdlElement.setDefinition(definitionCopy);
-      wsdlElement.setSchemaList(schemaListCopy);
-      return false;
-    }
-
-    // build the datamodel for this WSDLElement
-    wsdlElement.buildModel();
-
-    // Select a new node if the previous selected node no longer exists
-    // If there is more than 1 service node, select the WSDL node. If there is more than 1 binding node, select the service node.
-    // If there is just the one service and binding node, select the binding node.
-    Node node = nodeManager.getNode(selectedNodeID);
-    if (node == null) {
-      selectedNodeID = wsdlNode.getNodeId();
-      Vector serviceNodes = wsdlNode.getChildNodes();
-      if (serviceNodes.size() == 1)
-      {
-        Node serviceNode = (Node)serviceNodes.elementAt(0);
-        Vector bindingNodes = serviceNode.getChildNodes();
-        if (bindingNodes.size() == 1)
-        {
-          Node bindingNode = (Node)bindingNodes.elementAt(0);
-          selectedNodeID = bindingNode.getNodeId();
-        }
-        else
-          selectedNodeID = serviceNode.getNodeId();
-      }
-      nodeManager.setSelectedNodeId(selectedNodeID);
-      nodeManager.makeNodeVisible(nodeManager.getNode(selectedNodeID));
-    }
-    messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_REFRESH_WSDL_SUCCESSFUL", wsdlElement.getWsdlUrl()));
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
deleted file mode 100644
index e7fdbb512..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ResizeWSDLFramesAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-
-public class ResizeWSDLFramesAction extends ResizeFramesAction
-{
-  public ResizeWSDLFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(WSDLFrameNames.WSDL_NAVIGATOR_CONTAINER))
-    {
-      wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        wsdlPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(WSDLFrameNames.WSDL_PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
-          wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsdlPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(WSDLFrameNames.WSDL_STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsdlPerspective.setPerspectiveContentFramesetCols(wsdlPerspective.getSavedPerspectiveContentFramesetCols());
-          wsdlPerspective.setActionsContainerFramesetRows(wsdlPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsdlPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsdlPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsdlPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsdlPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
deleted file mode 100644
index a6e52fc3f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectWSDLNavigatorNodeAction extends SelectNodeAction
-{
-
-    public SelectWSDLNavigatorNodeAction(Controller controller)
-    {
-        super(controller,controller.getWSDLPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, boolean forHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID).append('=').append(nodeID);
-        if (forHistory)
-            actionLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-      ToolManager toolManager = selectedNode_.getToolManager();
-      Tool selectedTool = toolManager.getSelectedTool();
-      int nodeId = selectedNode_.getNodeId();
-      
-      if (selectedTool.getToolType() != ToolTypes.ACTION)
-        return selectedTool.getSelectToolActionHref(true);
-      else
-        return getActionLink(nodeId,true);
-    }
-
-    public final String getTreeContentVar() {
-        return "wsdlNavigatorContent";
-    }
-
-    public final String getTreeContentPage() {
-        return "wsdl/wsdl_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar() {
-        return "wsdlPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage() {
-        return "wsdl/wsdl_properties_container.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSDL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
deleted file mode 100644
index 89d53cafd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SelectWSDLPropertiesToolAction.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectWSDLPropertiesToolAction extends SelectNodeToolAction
-{
-
-    public SelectWSDLPropertiesToolAction(Controller controller)
-    {
-        super(controller, controller.getWSDLPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        if (viewID != ActionInputs.VIEWID_DEFAULT) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWID);
-            actionLink.append('=');
-            actionLink.append(viewID);
-            actionLink.append('&');
-            actionLink.append(ActionInputs.VIEWTOOLID);
-            actionLink.append('=');
-            actionLink.append(viewToolID);
-        }
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        int nodeId = selectedNode_.getNodeId();
-        int toolId = selectedTool_.getToolId();
-        int viewId = selectedNode_.getViewId();
-        int viewToolId = selectedNode_.getViewToolId();
-        return getActionLink(nodeId,toolId,viewId,viewToolId,true);
-    }
-
-    public final String getTreeContentVar() {
-        return "wsdlNavigatorContent";
-    }
-
-    public final String getTreeContentPage() {
-        return "wsdl/wsdl_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar() {
-        return "wsdlPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage() {
-        return "wsdl/wsdl_properties_container.jsp";
-    }
-
-    public final String getPropertiesContentVar() {
-        return "wsdlPropertiesContent";
-    }
-
-    public final String getPropertiesContentPage() {
-        return "wsdl/wsdl_properties_content.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSDL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
deleted file mode 100644
index 920c57352..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SwitchPerspectiveFromWSDLAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-
-public final class SwitchPerspectiveFromWSDLAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromWSDLAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WSDLActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      wsdlPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      wsdlPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");    
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
deleted file mode 100644
index 8ed578f9f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/SynchronizeFragmentViewsAction.java
+++ /dev/null
@@ -1,121 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.*;
-
-import javax.wsdl.*;
-import java.util.*;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
-public class SynchronizeFragmentViewsAction extends WSDLPropertiesFormAction
-{
-  public SynchronizeFragmentViewsAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    super.processParsedResults(parser);
-    Node selectedNode = getSelectedNavigatorNode();
-    WSDLOperationElement operElement = (WSDLOperationElement)selectedNode.getTreeElement();
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    InvokeWSDLOperationTool invokeWSDLOperationTool = (InvokeWSDLOperationTool)(selectedNode.getCurrentToolManager().getSelectedTool());
-    String viewID = parser.getParameter(FragmentConstants.FRAGMENT_VIEW_ID);
-    propertyTable_.put(FragmentConstants.FRAGMENT_VIEW_ID, viewID);
-    if (viewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
-    {
-      invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE);
-      return processFormViewParsedResults(parser, operElement, it);
-    }
-    else
-    {
-      invokeWSDLOperationTool.setFragmentViewID(FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM);
-      return processSourceViewParsedResults(parser, operElement, it);
-    }
-  }
-
-  private boolean processFormViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement, Iterator it) throws MultipartFormDataException
-  {
-    operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT, null);
-    operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE, null);
-    boolean resultsValid = true;
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = operElement.getFragment(part);
-      if (!frag.processParameterValues(parser))
-        resultsValid = false;
-    }
-    if (resultsValid)
-      operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT,null);
-    return resultsValid;
-  }
-
-  private boolean processSourceViewParsedResults(MultipartFormDataParser parser, WSDLOperationElement operElement, Iterator it) throws MultipartFormDataException
-  {
-    String sourceContent = parser.getParameter(FragmentConstants.SOURCE_CONTENT);
-    if (sourceContent != null)
-      operElement.setPropertyAsString(WSDLModelConstants.PROP_SOURCE_CONTENT, sourceContent);
-    String[] nsDeclarations = parser.getParameterValues(FragmentConstants.SOURCE_CONTENT_NAMESPACE);
-    if (nsDeclarations != null)
-      operElement.setPropertyAsObject(WSDLModelConstants.PROP_SOURCE_CONTENT_NAMESPACE,nsDeclarations);
-    sourceContent = addRootElement(sourceContent);
-    try
-    {
-      Element sourceElements = XMLUtils.stringToElement(sourceContent);
-      NodeList nl = sourceElements.getChildNodes();
-      Vector elementsVector = new Vector();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        org.w3c.dom.Node node = nl.item(i);
-        if (node != null && node instanceof Element)
-          elementsVector.add(node);
-      }
-      Element[] instanceDocuments = new Element[elementsVector.size()];
-      elementsVector.copyInto(instanceDocuments);
-      boolean sourceElementsValid = true;
-      while (it.hasNext())
-      {
-        Part part = (Part)it.next();
-        IXSDFragment frag = operElement.getFragment(part);
-        if (!frag.setParameterValuesFromInstanceDocuments(instanceDocuments))
-          sourceElementsValid = false;
-      }
-      return sourceElementsValid;
-    }
-    catch (Throwable t)
-    {
-      return false;
-    }
-  }
-
-  private String addRootElement(String element)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(FragmentConstants.ROOT_ELEMENT_START_TAG);
-    sb.append(element);
-    sb.append(FragmentConstants.ROOT_ELEMENT_END_TAG);
-    return sb.toString();
-  }
-
-  public boolean run() {
-    return true;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
deleted file mode 100644
index 42a6e4b82..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/ToggleWSDLNavigatorNodeAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class ToggleWSDLNavigatorNodeAction extends ToggleNodeAction
-{
-  public ToggleWSDLNavigatorNodeAction(Controller controller)
-  {
-    super(controller,controller.getWSDLPerspective().getNodeManager());
-  }
-
-  // uddi/actions/ToggleNavigatorNodeAction.jsp?nodeId=...&open=...
-  public static String getActionLink(int nodeId,boolean open)
-  {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID).append('=').append(nodeId);
-    actionLink.append('&').append(ActionInputs.OPEN).append('=').append(open?ActionInputs.OPEN_NODE:ActionInputs.CLOSE_NODE);
-    return actionLink.toString();
-  }
-
-  // This should be called only to select the toggled node when, at the time of
-  // the collapse event, a descendant node was selected.
-  public final String getActionLinkForHistory()
-  {
-    ToolManager toolManager = toggledNode_.getToolManager();
-    Tool selectedTool = toolManager.getSelectedTool();
-    int nodeId = toggledNode_.getNodeId();
-    int toolId = selectedTool.getToolId();
-    int viewId = toggledNode_.getViewId();
-    int viewToolId = toggledNode_.getViewToolId();
-    if (selectedTool.getToolType() != ToolTypes.ACTION)
-      return SelectWSDLPropertiesToolAction.getActionLink(nodeId,toolId,viewId,viewToolId,true);
-    else
-      return SelectWSDLNavigatorNodeAction.getActionLink(nodeId,true);
-  }
-
-    public final String getTreeContentVar()
-    {
-      return "wsdlNavigatorContent";
-    }
-
-    public final String getTreeContentPage()
-    {
-      return "wsdl/wsdl_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar()
-    {
-      return "wsdlPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage()
-    {
-      return "wsdl/wsdl_properties_container.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSDL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
deleted file mode 100644
index eaf6bffb9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/UpdateWSDLBindingAction.java
+++ /dev/null
@@ -1,90 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.InvokeWSDLOperationTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLBindingNode;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-import java.util.Vector;
-import java.util.List;
-import java.util.Iterator;
-
-public class UpdateWSDLBindingAction extends WSDLPropertiesFormAction
-{
-  public UpdateWSDLBindingAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] nodeIds = parser.getParameterValues(ActionInputs.NODEID);
-    if (nodeIds == null)
-      nodeIds = new String[0];
-    propertyTable_.put(ActionInputs.NODEID, nodeIds);
-    String[] endpoints = parser.getParameterValues(WSDLActionInputs.END_POINT);
-    if (endpoints == null)
-      endpoints = new String[0];
-    propertyTable_.put(WSDLActionInputs.END_POINT, endpoints);
-    return true;
-  }
-
-  public boolean run()
-  {
-    String[] nodeIds = getPropertyAsStringArray(ActionInputs.NODEID);
-    String[] endpoints = getPropertyAsStringArray(WSDLActionInputs.END_POINT);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    for (int i = 0; i < nodeIds.length; i++)
-    {
-      try
-      {
-        Node bindingNode = nodeManager.getNode(Integer.parseInt(nodeIds[i]));
-        if (bindingNode instanceof WSDLBindingNode)
-        {
-          WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
-          String[] endpointsCopy = endpoints;
-          bindingElement.setEndPoints(endpointsCopy);
-          if (endpointsCopy.length <= 0)
-            endpointsCopy = bindingElement.getEndPoints();
-          if (endpointsCopy.length > 0)
-          {
-            Vector operationNodes = bindingNode.getChildNodes();
-            for (Iterator it = operationNodes.iterator(); it.hasNext();)
-            {
-              Node operationNode = (Node)it.next();
-              List tools = operationNode.getCurrentToolManager().getTools();
-              for (Iterator toolsIterator = tools.iterator(); toolsIterator.hasNext();)
-              {
-                Tool tool = (Tool)toolsIterator.next();
-                if (tool instanceof InvokeWSDLOperationTool)
-                  ((InvokeWSDLOperationTool)tool).setEndPoint(endpointsCopy[0]);
-              }
-            }
-          }
-        }
-      }
-      catch (NumberFormatException nfe)
-      {
-      }
-    }
-    MessageQueue messageQueue = wsdlPerspective.getMessageQueue();
-    messageQueue.addMessage(wsdlPerspective.getMessage("MSG_INFO_UPDATE_WSDL_BINDING_SUCCESSFUL"));
-    return true;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
deleted file mode 100644
index 8f00ab1c5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLAddToFavoritesAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.*;
-
-public class WSDLAddToFavoritesAction extends LinkAction {
-  public WSDLAddToFavoritesAction(Controller controller) {
-    super(controller);
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request) {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    try {
-      Integer.parseInt(nodeID);
-      propertyTable_.put(ActionInputs.NODEID, nodeID);
-      return true;
-    }
-    catch (Throwable t) {
-      return false;
-    }
-  }
-
-  public static String getActionLink(int nodeID) {
-    StringBuffer actionLink = new StringBuffer("wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    return actionLink.toString();
-  }
-
-  public boolean favoriteExists() {
-    String wsdlUrl = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
-    FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
-    return favFolderElement.favoriteExists(table);
-  }
-
-  public boolean run() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    String wsdlUrl = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlUrl);
-    FavoritesFolderElement favFolderElement = getFavWSDLFolderElement();
-    if (favFolderElement.addFavorite(table)) {
-      wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlUrl));
-      return true;
-    }
-    else {
-      wsdlPerspective.getMessageQueue().addMessage(wsdlPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlUrl));
-      return false;
-    }
-  }
-
-  private String getWsdlUrl() {
-    String nodeID = (String)propertyTable_.get(ActionInputs.NODEID);
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager wsdlNodeManager = wsdlPerspective.getNodeManager();
-    WSDLElement selectedElement = (WSDLElement)wsdlNodeManager.getNode(Integer.parseInt(nodeID)).getTreeElement();
-    return selectedElement.getWsdlUrl();
-  }
-
-  private FavoritesFolderElement getFavWSDLFolderElement() {
-    FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-    NodeManager favNodeManager = favPerspective.getNodeManager();
-    TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-    Enumeration e = favRootElement.getElements(FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
-    return (FavoritesFolderElement)e.nextElement();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
deleted file mode 100644
index 30e314f93..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.WSDLFileNameHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-import javax.wsdl.Definition;
-import java.io.OutputStream;
-
-public class WSDLImportWSDLToFileSystemAction extends ImportToFileSystemAction {
-  private Definition definition_;
-  private String defaultWSDLFileName_;
-
-  public WSDLImportWSDLToFileSystemAction(Controller controller) {
-    super(controller);
-    definition_ = null;
-    defaultWSDLFileName_ = "temp.wsdl";
-  }
-
-  public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId) {
-    return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp");
-  }
-
-  public final boolean write(OutputStream os) {
-    return writeWSDLDefinition(os, definition_);
-  }
-
-  public final String getDefaultFileName() {
-    return defaultWSDLFileName_;
-  }
-
-  public final boolean run() {
-    int nodeID;
-    try {
-      nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    }
-    catch (NumberFormatException nfe) {
-        return false;
-    }
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node node = nodeManager.getNode(nodeID);
-    WSDLElement wsdlElement = (WSDLElement)node.getTreeElement();
-    definition_ = wsdlElement.getDefinition();
-    defaultWSDLFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlElement.getWsdlUrl());
-    return (definition_ != null);
-  }
-
-  public final String getStatusContentVar() {
-    return controller_.getWSDLPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage() {
-    return controller_.getWSDLPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
deleted file mode 100644
index ed9c54bf7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-import java.util.Hashtable;
-
-public class WSDLImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
-  public WSDLImportWSDLToWorkbenchAction(Controller controller) {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-  public ImportToFileSystemAction newImportToFileSystemAction() {
-    WSDLImportWSDLToFileSystemAction action = new WSDLImportWSDLToFileSystemAction(controller_);
-    Hashtable table = action.getPropertyTable();
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-    return action;
-  }
-
-  public final String getStatusContentVar() {
-    return controller_.getWSDLPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage() {
-    return controller_.getWSDLPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
deleted file mode 100644
index 681b90aef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective.WSDLPerspective;
-
-public class WSDLLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-
-  public WSDLLaunchWebServiceWizardAction(Controller controller) {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    return (FormTool)wsdlPerspective.getNodeManager().getSelectedNode().getCurrentToolManager().getSelectedTool();
-  }
-
-  public boolean run() {
-    WSDLPerspective wsdlPerspective = controller_.getWSDLPerspective();
-    NodeManager nodeManager = wsdlPerspective.getNodeManager();
-    Node node = nodeManager.getSelectedNode();
-    WSDLElement element = (WSDLElement)node.getTreeElement();
-    return launchWizard(element.getWsdlUrl());
-  }
-
-  public final String getStatusContentVar() {
-    return controller_.getWSDLPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage() {
-    return controller_.getWSDLPerspective().getStatusContentPage();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
deleted file mode 100644
index cf6685d53..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/actions/WSDLPropertiesFormAction.java
+++ /dev/null
@@ -1,53 +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.wst.ws.internal.explorer.platform.wsdl.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-public abstract class WSDLPropertiesFormAction extends FormAction
-{
-  protected NodeManager navigatorManager_;
-  public WSDLPropertiesFormAction(Controller controller)
-  {
-    super(controller);
-    navigatorManager_ = controller.getWSDLPerspective().getNodeManager();
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String[] keys = parser.getParameterNames();
-    for (int i = 0; i < keys.length; i++)
-    {
-      String[] values = parser.getParameterValues(keys[i]);
-      if (values != null)
-      {
-        if (values.length == 1)
-          propertyTable_.put(keys[i], values[0]);
-        else if (values.length > 1)
-          propertyTable_.put(keys[i], values);
-      }
-    }
-    return true;
-  }
-
-  public Node getSelectedNavigatorNode()
-  {
-    return navigatorManager_.getSelectedNode();
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    return (FormTool)(getSelectedNavigatorNode().getCurrentToolManager().getSelectedTool());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
deleted file mode 100644
index ed8af597f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/BindingTypes.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class BindingTypes
-{
-  public static final int UNSUPPORTED = -1;
-  public static final int SOAP = 0;
-  public static final int HTTP_GET = 1;
-  public static final int HTTP_POST = 2;
-  
-  public static final String HTTP_VERB_GET = "GET";
-  public static final String HTTP_VERB_POST = "POST";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
deleted file mode 100644
index 145d9dad1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/FragmentConstants.java
+++ /dev/null
@@ -1,91 +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.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class FragmentConstants
-{
-  // XSD minOccurs and maxOccurs
-  public static final int DEFAULT_MIN_OCCURS = 1;
-  public static final int DEFAULT_MAX_OCCURS = 1;
-  public static final int UNBOUNDED = -1;
-
-  // WSDL style
-  public static final int STYLE_DOCUMENT = 0;
-  public static final int STYLE_RPC = 1;
-
-  // WSDL Encoding styles
-  public static final int ENCODING_LITERAL = 0;
-  public static final int ENCODING_SOAP = 1;
-  public static final int ENCODING_URL = 2; // HTTP Get/Post
-
-  // IDs used by the fragment model
-  public static final String ID_SEPERATOR = "::";
-  public static final String INPUT_ID = "::input";
-  public static final String OUTPUT_ID = "::output";
-  public static final String TABLE_ID = "::tableID";
-  public static final String FRAGMENT_ID = "::fragmentID";
-  public static final String NAME_ANCHOR_ID = "::nameAnchorID";
-  public static final String FRAGMENT_VIEW_ID = "::fragmentViewID";
-  public static final String XSD_ATOMIC_ENUM_ID = "::xsdAtomicEnumID";
-  public static final String XSD_ALL_GROUP_ID = "::xsdAllGroupID";
-
-  // Fragment view IDs
-  public static final String FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE = "::fragmentViewSwitchFormToSource";
-  public static final String FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM = "::fragmentViewSwitchSourceToForm";
-  public static final String SOURCE_CONTENT = "::sourceContent";
-  public static final String SOURCE_CONTENT_NAMESPACE = "::sourceContentNS";
-
-  // Action input constants
-  public static final String NAME_ANCHOR = "nameAnchor";
-
-  // Namespaces contants
-  public static final String URI_XSD = "http://www.w3.org/2001/XMLSchema";
-  public static final String URI_SOAP = "http://schemas.xmlsoap.org/soap/encoding/";
-  public static final String URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
-  public static final String URI_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-  public static final String URI_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-  public static final String SOAP_ENC_ARRAY_TYPE = "arrayType";
-  public static final String XSI_TYPE = "type";
-  public static final String QNAME_PREFIX = "q";
-  public static final String QNAME_LOCAL_NAME_ARRAY_TYPE = "arrayType";
-  public static final String QNAME_LOCAL_NAME_ARRAY = "Array";
-  public static final String COLON = ":";
-  public static final String QNAME_LOCAL_NAME_BODY = "Body";
-  public static final String QNAME_LOCAL_NAME_FAULT = "Fault";
-
-  // List
-  public static final String LIST_SEPERATOR = " ";
-
-  // SOAP-ENC:Array
-  public static final String LEFT_SQUARE_BRACKET = "[";
-  public static final String RIGHT_SQUARE_BRACKET = "]";
-
-  // XSDDefaultFragment
-  public static final String ROOT_ELEMENT_START_TAG = "<root>";
-  public static final String ROOT_ELEMENT_END_TAG = "</root>";
-
-  // Namespace URIs.
-  public static final String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
-  public static final String NS_URI_SOAP_ENV = "http://schemas.xmlsoap.org/soap/envelope/";
-  public static final String NS_URI_SOAP_ENC = "http://schemas.xmlsoap.org/soap/encoding/";
-  public static final String NS_URI_1999_SCHEMA_XSI = "http://www.w3.org/1999/XMLSchema-instance";
-  public static final String NS_URI_1999_SCHEMA_XSD = "http://www.w3.org/1999/XMLSchema";
-  public static final String NS_URI_2000_SCHEMA_XSI = "http://www.w3.org/2000/10/XMLSchema-instance";
-  public static final String NS_URI_2000_SCHEMA_XSD = "http://www.w3.org/2000/10/XMLSchema";
-  public static final String NS_URI_2001_SCHEMA_XSI = "http://www.w3.org/2001/XMLSchema-instance";
-  public static final String NS_URI_2001_SCHEMA_XSD = "http://www.w3.org/2001/XMLSchema";
-  public static final String NS_URI_CURRENT_SCHEMA_XSI = NS_URI_2001_SCHEMA_XSI;
-  public static final String NS_URI_CURRENT_SCHEMA_XSD = NS_URI_2001_SCHEMA_XSD;
-  public static final String NS_URI_XML_SOAP = "http://xml.apache.org/xml-soap";
-  public static final String NS_URI_XML_SOAP_DEPLOYMENT = "http://xml.apache.org/xml-soap/deployment";
-  public static final String NS_URI_LITERAL_XML = "http://xml.apache.org/xml-soap/literalxml";
-  public static final String NS_URI_XMI_ENC = "http://www.ibm.com/namespaces/xmi";
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
deleted file mode 100644
index 341de9105..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLActionInputs.java
+++ /dev/null
@@ -1,36 +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.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLActionInputs
-{
-  public static final String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-  public static final String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-
-  public static final String SESSION_ID = "sessionID";
-  public static final String FRAGMENT_ID = "fragmentID";
-
-  public static final String SOAP_ENVELOPE_TYPE = "soapEnvelopeType";
-  public static final int SOAP_ENVELOPE_TYPE_REQUEST = 0;
-  public static final int SOAP_ENVELOPE_TYPE_RESPONSE = 1;
-  public static final String SOAP_RESPONSE_CACHED = "soapResponseCached";
-
-  public static final String SUBMISSION_ACTION = "submissionAction";
-  public static final String SUBMISSION_ACTION_FORM = "submissionActionForm";
-  public static final String SUBMISSION_ACTION_BROWSE_FILE = "submissionActionBrowseFile";
-  public static final String SUBMISSION_ACTION_SAVE_AS = "submissionActionSaveAs";
-  public static final String SELECTED_FILE = "selectedFile";
-  public static final String OPERATION_ELEMENT = "operationElement";
-
-  public static final String END_POINT = "::endPoint";
-  public static final String HTTP_BASIC_AUTH_USERNAME = "httpBasicAuthUsername";
-  public static final String HTTP_BASIC_AUTH_PASSWORD = "httpBasicAuthPassword";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
deleted file mode 100644
index 29f7137e8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLFrameNames.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLFrameNames
-{
-  public final static String WSDL_NAVIGATOR_CONTAINER = "wsdl_navigator_container";
-  public final static String WSDL_NAVIGATOR_TOOLBAR = "wsdl_navigator_toolbar";
-  public final static String WSDL_NAVIGATOR_CONTENT = "wsdl_navigator_content";
-  public final static String WSDL_ACTIONS_CONTAINER = "wsdl_actions_container";
-  public final static String WSDL_PROPERTIES_CONTAINER = "wsdl_properties_container";
-  public final static String WSDL_PROPERTIES_TOOLBAR = "wsdl_properties_toolbar";
-  public final static String WSDL_PROPERTIES_CONTENT = "wsdl_properties_content";
-  public final static String WSDL_STATUS_CONTAINER = "wsdl_status_container";
-  public final static String WSDL_STATUS_TOOLBAR = "wsdl_status_toolbar";
-  public final static String WSDL_STATUS_CONTENT = "wsdl_status_content";
-
-  // XSD Info Dialog
-  public final static String XSD_INFO_TOOLBAR = "xsd_info_toolbar";
-  public final static String XSD_INFO_CONTENT = "xsd_info_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
deleted file mode 100644
index 13b19b674..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/constants/WSDLModelConstants.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants;
-
-public class WSDLModelConstants
-{
-    // Relation
-    public final static String REL_WSDL = "relWSDL";
-    public final static String REL_WSDL_SERVICE = "relWSDLService";
-    public final static String REL_WSDL_BINDING = "relWSDLBinding";
-    public final static String REL_WSDL_OPERATION = "relWSDLOperation";
-
-    // Documentation
-    public final static String PROP_DOCUMENTATION = "propDocumentation";
-
-    // Source Content
-    public final static String PROP_SOURCE_CONTENT = "propSourceContent";
-    public final static String PROP_SOURCE_CONTENT_NAMESPACE = "propSourceContentNS";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
deleted file mode 100644
index ea3c92fd9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/Endpoint.java
+++ /dev/null
@@ -1,67 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-public class Endpoint
-{
-  private String endpoint;
-  private boolean requireHTTPBasicAuth;
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  
-  public Endpoint()
-  {
-    endpoint = null;
-    requireHTTPBasicAuth = false;
-    httpBasicAuthUsername = null;
-    httpBasicAuthPassword = null;
-  }
-
-  public String getEndpoint()
-  {
-    return endpoint;
-  }
-  
-  public void setEndpoint(String endpoint)
-  {
-    this.endpoint = endpoint;
-  }
-  
-  public boolean isRequireHTTPBasicAuth()
-  {
-    return requireHTTPBasicAuth;
-  }
-  
-  public void setRequireHTTPBasicAuth(boolean requireHTTPBasicAuth)
-  {
-    this.requireHTTPBasicAuth = requireHTTPBasicAuth;
-  }
-  
-  public String getHttpBasicAuthUsername()
-  {
-    return httpBasicAuthUsername;
-  }
-  
-  public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
-  {
-    this.httpBasicAuthUsername = httpBasicAuthUsername;
-  }
-  
-  public String getHttpBasicAuthPassword()
-  {
-    return httpBasicAuthPassword;
-  }
-  
-  public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
-  {
-    this.httpBasicAuthPassword = httpBasicAuthPassword;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
deleted file mode 100644
index babdcb68e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLBindingElement.java
+++ /dev/null
@@ -1,226 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-import javax.xml.namespace.QName;
-import javax.wsdl.extensions.soap.*;
-import javax.wsdl.extensions.http.*;
-import javax.wsdl.extensions.*;
-import javax.wsdl.*;
-
-import java.util.*;
-
-public class WSDLBindingElement extends WSDLCommonElement
-{
-  private int bindingType_;
-  private Binding binding_;
-  private ExtensibilityElement bindingExtensibilityElement_;
-  private Vector endPoints_;
-
-  private final void setBindingExtensibilityElement()
-  {
-    bindingExtensibilityElement_ = null;
-    bindingType_ = BindingTypes.UNSUPPORTED;
-    List extensibilityElements = binding_.getExtensibilityElements();
-    for (Iterator i = extensibilityElements.iterator();i.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)i.next();
-      if (e instanceof HTTPBinding)
-      {
-        HTTPBinding binding = (HTTPBinding)e;
-        String verb = binding.getVerb();
-        if (BindingTypes.HTTP_VERB_GET.equals(verb))
-          bindingType_ = BindingTypes.HTTP_GET;
-        else if (BindingTypes.HTTP_VERB_POST.equals(verb))
-          bindingType_ = BindingTypes.HTTP_POST;
-      }
-      else if (e instanceof SOAPBinding)
-        bindingType_ = BindingTypes.SOAP;
-      if (bindingType_ != BindingTypes.UNSUPPORTED)
-      {
-        bindingExtensibilityElement_ = e;
-        break;
-      }
-    }
-  }
-  
-  public WSDLBindingElement(String name, Model model, Binding binding)
-  {
-    super(name, model);
-    setBinding(binding);
-    endPoints_ = new Vector();
-  }
-
-  public void setBinding(Binding binding) {
-    binding_ = binding;
-    setDocumentation(binding.getDocumentationElement());
-    setBindingExtensibilityElement();
-  }
-
-  public Binding getBinding() {
-    return binding_;
-  }
-  
-  public ExtensibilityElement getBindingExtensibilityElement()
-  {
-    return bindingExtensibilityElement_;
-  }
-  
-  public int getBindingType()
-  {
-    return bindingType_;
-  }
-
-  private void resetEndPoints()
-  {
-    WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
-    String fixedEndpointString = serviceElement.getAddressLocation(binding_);
-    Endpoint fixedEndpoint = getEndpoint(fixedEndpointString);
-    if (fixedEndpoint == null)
-    {
-      fixedEndpoint = new Endpoint();
-      fixedEndpoint.setEndpoint(fixedEndpointString);
-    }
-    endPoints_.clear();
-    endPoints_.add(fixedEndpoint);
-  }
-
-  public String[] getEndPoints()
-  {
-    String[] endPoints = new String[endPoints_.size()];
-    for (int i = 0; i < endPoints.length; i++)
-      endPoints[i] = ((Endpoint)endPoints_.get(i)).getEndpoint();
-    return endPoints;
-  }
-  
-  public Endpoint getEndpoint(String endpointString)
-  {
-    if (endpointString != null && endpointString.length() > 0)
-    {
-      for (Iterator it = endPoints_.iterator(); it.hasNext();)
-      {
-        Endpoint endpoint = (Endpoint)it.next();
-        if (endpointString.equals(endpoint.getEndpoint()))
-          return endpoint;
-      }
-    }
-    return null;
-  }
-
-  public void setEndPoints(String[] endpoints)
-  {
-    Vector endpointVector = new Vector();
-    for (int i = 0; i < endpoints.length; i++)
-    {
-      Endpoint endpoint = getEndpoint(endpoints[i]);
-      if (endpoint == null)
-      {
-        endpoint = new Endpoint();
-        endpoint.setEndpoint(endpoints[i]);
-      }
-      endpointVector.add(endpoint);
-    }
-    resetEndPoints();
-    endPoints_.addAll(endpointVector);
-  }
-
-  public void addEndPoint(String endpointString)
-  {
-    if (endpointString != null && endpointString.length() > 0)
-    {
-      Endpoint endpoint = new Endpoint();
-      endpoint.setEndpoint(endpointString);
-      endPoints_.add(endpoint);
-    }
-  }
-
-  public void removeEndPoint(String endpointString)
-  {
-    if (endpointString != null && endpointString.length() > 0)
-    {
-      WSDLServiceElement serviceElement = (WSDLServiceElement)getParentElement();
-      String fixedEndpointString = serviceElement.getAddressLocation(binding_);
-      if (fixedEndpointString == null || !fixedEndpointString.equals(endpointString))
-      {
-        for (int i = 0; i < endPoints_.size(); i++)
-        {
-          if (endpointString.equals(((Endpoint)endPoints_.get(i)).getEndpoint()))
-          {
-            endPoints_.remove(i);
-            break;
-          }
-        }
-      }
-    }
-  }
-
-  public void buildModel() {
-    resetEndPoints();
-    if (binding_ != null) {
-      PortType pt = binding_.getPortType();
-      if (pt != null) {
-        List operations = pt.getOperations();
-        HashMap operationsMap = new HashMap();
-        for (Iterator it = operations.iterator();it.hasNext();) {
-          Operation operation = (Operation)it.next();
-          operationsMap.put(createOperationUniqueName(operation), operation);
-        }
-        WSDLOperationElement[] wsdlOperationElements = new WSDLOperationElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_OPERATION)];
-        Enumeration e = getElements(WSDLModelConstants.REL_WSDL_OPERATION);
-        for (int i = 0; i < wsdlOperationElements.length; i++) {
-          wsdlOperationElements[i] = (WSDLOperationElement)e.nextElement();
-        }
-        for (int j = 0; j < wsdlOperationElements.length; j++) {
-          String operationName = createOperationUniqueName(wsdlOperationElements[j].getOperation());
-          Operation operation = (Operation)operationsMap.get(operationName);
-          if (operation != null) {
-            operationsMap.remove(operationName);
-            wsdlOperationElements[j].setOperation(this, operation);
-          }
-          else
-            disconnect(wsdlOperationElements[j], WSDLModelConstants.REL_WSDL_OPERATION);
-        }
-        for (Iterator it = operationsMap.values().iterator();it.hasNext();) {
-          Operation oper = (Operation)it.next();
-          WSDLOperationElement wsdlOperationElement = new WSDLOperationElement(oper.getName(), this, oper);
-          connect(wsdlOperationElement,WSDLModelConstants.REL_WSDL_OPERATION,ModelConstants.REL_OWNER);
-        }
-      }
-    }
-  }
-
-  private String createOperationUniqueName(Operation operation)
-  {
-    StringBuffer name = new StringBuffer();
-    name.append(operation.getName());
-    Input inputMsg = operation.getInput();
-    if (inputMsg != null)
-    {
-      QName qname = inputMsg.getMessage().getQName();
-      name.append(qname.getNamespaceURI());
-      name.append(":");
-      name.append(qname.getLocalPart());
-    }
-    Output outputMsg = operation.getOutput();
-    if (outputMsg != null)
-    {
-      QName qname = outputMsg.getMessage().getQName();
-      name.append(qname.getNamespaceURI());
-      name.append(":");
-      name.append(qname.getLocalPart());
-    }
-    return name.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
deleted file mode 100644
index 5016477fa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLCommonElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-import org.w3c.dom.*;
-
-import javax.xml.parsers.*;
-
-public class WSDLCommonElement extends TreeElement
-{
-
-  public WSDLCommonElement(String name, Model model) {
-    super(name, model);
-  }
-
-  public final TreeElement getParentElement() {
-      return (TreeElement)getElements(ModelConstants.REL_OWNER).nextElement();
-  }
-  
-  protected final void setDocumentation(Node documentationElement)
-  {
-    String documentation = "";
-    try
-    {
-      if (documentationElement != null)
-      {
-        Document doc = XMLUtils.createNewDocument(null);
-        DocumentFragment df = doc.createDocumentFragment();
-        NodeList documentationNodes = documentationElement.getChildNodes();
-        for (int i=0;i<documentationNodes.getLength();i++)
-          df.appendChild(doc.importNode(documentationNodes.item(i),true));
-        documentation = XMLUtils.serialize(df,true);
-      }
-    }
-    catch (ParserConfigurationException e)
-    {
-    }
-    setPropertyAsString(WSDLModelConstants.PROP_DOCUMENTATION,documentation);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
deleted file mode 100644
index 777ddb419..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLElement.java
+++ /dev/null
@@ -1,326 +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.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.parser.discovery.*;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-
-import org.eclipse.xsd.util.*;
-import org.eclipse.xsd.impl.*;
-import org.eclipse.xsd.*;
-import org.eclipse.emf.common.util.EList;
-
-import javax.xml.namespace.QName;
-import javax.wsdl.extensions.*;
-import javax.wsdl.*;
-import java.util.*;
-import java.io.*;
-
-public class WSDLElement extends WSDLCommonElement
-{
-
-  private String wsdlUrl_;
-  private Definition definition_;
-  private Vector schemaList_;
-
-  private static Vector w3SchemaQNameList_;
-  private static Vector constantSchemaList_;
-
-  static
-  {
-    // w3 schema URI list:
-    // http://www.w3.org/2001/XMLSchema
-    // http://www.w3.org/2000/10/XMLSchema
-    // http://www.w3.org/1999/XMLSchema
-    w3SchemaQNameList_ = new Vector();
-    w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD,"schema"));
-    w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_2000_SCHEMA_XSD,"schema"));
-    w3SchemaQNameList_.addElement(new QName(FragmentConstants.NS_URI_1999_SCHEMA_XSD,"schema"));
-
-    // Constant schema URI list:
-    // http://www.w3.org/2001/XMLSchema
-    // http://www.w3.org/2000/10/XMLSchema
-    // http://www.w3.org/1999/XMLSchema
-    // http://schemas.xmlsoap.org/soap/encoding/
-    // http://schemas.xmlsoap.org/wsdl/
-    constantSchemaList_ = new Vector();
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_CURRENT_SCHEMA_XSD));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_2000_SCHEMA_XSD));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_1999_SCHEMA_XSD));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.NS_URI_SOAP_ENC));
-    constantSchemaList_.addElement(XSDSchemaImpl.getSchemaForSchema(FragmentConstants.URI_WSDL));
-  }
-
-  public WSDLElement(String name, Model model, String wsdlUrl)
-  {
-    super(name, model);
-    wsdlUrl_ = wsdlUrl;
-    definition_ = null;
-    schemaList_ = new Vector();
-  }
-
-  public void setWsdlUrl(String wsdlUrl) {
-    wsdlUrl_ = wsdlUrl;
-  }
-
-  public String getWsdlUrl() {
-    return wsdlUrl_;
-  }
-
-  public void setSchemaList(Vector schemaList)
-  {
-    schemaList_ = schemaList;
-  }
-
-  public Vector getSchemaList()
-  {
-    return schemaList_;
-  }
-  
-  private final Definition loadWSDL(String wsdlURL) throws WSDLException
-  {
-    WebServicesParser parser = new WebServicesParserExt();
-    try
-    {
-      return parser.getWSDLDefinitionVerbose(wsdlURL);
-    }
-    catch (WSDLException wsdle)
-    {
-      throw wsdle;
-    }
-    catch (Throwable t)
-    {
-      throw new WSDLException(WSDLException.OTHER_ERROR , t.getMessage(), t);
-    }
-  }
-
-  public Vector loadWSDL() throws WSDLException
-  {
-    Vector errorMessages = new Vector();
-    definition_ = loadWSDL(wsdlUrl_);
-    if (definition_ != null)
-    {
-      setDocumentation(definition_.getDocumentationElement());
-      gatherSchemas(definition_, wsdlUrl_);
-      // Validate the schemas.
-      for (int i=0;i<schemaList_.size();i++)
-      {
-        XSDSchema xsdSchema = (XSDSchema)schemaList_.elementAt(i);
-        xsdSchema.validate();
-        EList errors = xsdSchema.getAllDiagnostics();
-        if (!errors.isEmpty())
-        {
-          for (ListIterator li = errors.listIterator();li.hasNext();)
-          {
-            XSDDiagnostic xd = (XSDDiagnostic)li.next();
-            String msg = xd.getMessage();
-            // do not report low severity diagnostics or erroneous array reference errors.
-            if (xd.getSeverity().getValue() == XSDDiagnosticSeverity.FATAL_LITERAL.getValue() || (msg != null && msg.length() > 0 && msg.toLowerCase().indexOf("#array") != -1))
-              li.remove();
-            else
-            {
-              if (msg != null && msg.length() > 0)
-                errorMessages.addElement(xd.getMessage());
-            }
-          }
-        }
-      }
-
-      for (int i=0;i<constantSchemaList_.size();i++)
-        schemaList_.addElement(constantSchemaList_.elementAt(i));
-    }
-    return errorMessages;
-  }
-
-  private final void gatherSchemas(Definition definition, String definitionURL)
-  {
-    Types types = definition.getTypes();
-    if (types != null)
-    {
-      List extTypes = types.getExtensibilityElements();
-      if (extTypes != null)
-      {
-        for (int i=0;i<extTypes.size();i++)
-        {
-          Object obj = extTypes.get(i);
-          if (obj instanceof UnknownExtensibilityElement)
-          {
-            UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)obj;
-            if (isW3SchemaElementType(schemaElement.getElementType()))
-            {
-              XSDSchema xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-              schemaList_.addElement(xsdSchema);
-              gatherSchemaDirective(xsdSchema, definitionURL);
-            }
-          }
-          else if (obj instanceof XSDSchemaExtensibilityElementImpl)
-          {
-            XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)obj;
-            XSDSchema xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
-            schemaList_.addElement(xsdSchema);
-            gatherSchemaDirective(xsdSchema, definitionURL);
-          }
-        }
-      }
-    }
-    Map imports = definition.getImports();
-    if (imports != null)
-      gatherImportedSchemas(definition,imports);
-  }
-
-  private final void gatherSchemaDirective(XSDSchema xsdSchema, String xsdSchemaURL)
-  {
-    if (xsdSchema != null)
-    {
-      EList xsdSchemaContents = xsdSchema.getContents();
-      for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
-      {
-        Object content = it.next();
-        if (content instanceof XSDSchemaDirective)
-        {
-          XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
-          StringBuffer xsdSchemaDirectiveURL = new StringBuffer();
-          String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
-          if (xsdSchemaDirectiveLocation != null && xsdSchemaDirectiveLocation.indexOf(':') == -1 && xsdSchemaURL != null && xsdSchemaURL.indexOf(':') != -1)
-          {
-            // relative URL
-            int index = xsdSchemaURL.lastIndexOf('/');
-            if (index != -1)
-              xsdSchemaDirectiveURL.append(xsdSchemaURL.substring(0, index+1));
-            else
-            {
-              xsdSchemaDirectiveURL.append(xsdSchemaURL);
-              xsdSchemaDirectiveURL.append('/');
-            }
-          }
-          xsdSchemaDirectiveURL.append(xsdSchemaDirectiveLocation);
-          // resolve schema directive
-          XSDSchema resolvedSchema = xsdSchemaDirective.getResolvedSchema();
-          if (resolvedSchema == null && xsdSchemaDirectiveURL.length() > 0)
-            resolvedSchema = getSchema(xsdSchemaDirectiveURL.toString());
-          if (resolvedSchema != null)
-          {
-            schemaList_.addElement(resolvedSchema);
-            gatherSchemaDirective(resolvedSchema, xsdSchemaDirectiveURL.toString());
-          }
-        }
-      }
-    }
-  }
-
-  private final boolean isW3SchemaElementType(QName qname)
-  {
-    for (int i=0;i<w3SchemaQNameList_.size();i++)
-    {
-      QName w3SchemaQName = (QName)w3SchemaQNameList_.elementAt(i);
-      if (w3SchemaQName.equals(qname))
-        return true;
-    }
-    return false;
-  }
-
-  private final void gatherImportedSchemas(Definition definition,Map imports)
-  {
-    for (Iterator iterator = imports.keySet().iterator();iterator.hasNext();)
-    {
-      List importList = (List)imports.get(iterator.next());
-      for (int i=0;i<importList.size();i++)
-      {
-        Import imp = (Import)importList.get(i);
-        StringBuffer locURI = new StringBuffer(imp.getLocationURI());
-        if (!Validator.validateURL(locURI.toString()))
-        {
-          String base = definition.getDocumentBaseURI();
-          locURI.insert(0,base.substring(0,base.lastIndexOf('/')+1));
-        }
-        try
-        {
-          Definition importDef = loadWSDL(locURI.toString());
-          gatherSchemas(importDef, locURI.toString());
-        }
-        catch (WSDLException e)
-        {
-          // May be an XSD file.
-          gatherSchema(locURI.toString());
-        }
-      }
-    }
-  }
-
-  private final void gatherSchema(String locURI)
-  {
-    XSDSchema xsdSchema = getSchema(locURI);
-    if (xsdSchema != null)
-    {
-      schemaList_.addElement(xsdSchema);
-      gatherSchemaDirective(xsdSchema, locURI);
-    }
-  }
-
-  private final XSDSchema getSchema(String locURI)
-  {
-    XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(locURI);
-    if (xsdSchema == null)
-    {
-      XSDParser p = new XSDParser();
-      InputStream is = NetUtils.getURLInputStream(locURI);
-      if (is != null)
-      {
-        p.parse(is);
-        xsdSchema = p.getSchema();
-      }
-    }
-    return xsdSchema;
-  }
-
-  public void setDefinition(Definition definition)
-  {
-    definition_ = definition;
-  }
-
-  public Definition getDefinition()
-  {
-    return definition_;
-  }
-
-  public void buildModel() {
-    if (definition_ != null) {
-      Map services = new HashMap(definition_.getServices());
-      WSDLServiceElement[] wsdlServiceElements = new WSDLServiceElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_SERVICE)];
-      Enumeration e = getElements(WSDLModelConstants.REL_WSDL_SERVICE);
-      for (int i = 0; i < wsdlServiceElements.length; i++) {
-        wsdlServiceElements[i] = (WSDLServiceElement)e.nextElement();
-      }
-      for (int j = 0; j < wsdlServiceElements.length; j++) {
-        QName qname = wsdlServiceElements[j].getService().getQName();
-        Service service = (Service)services.get(qname);
-        if (service != null) {
-          services.remove(qname);
-          wsdlServiceElements[j].setService(service);
-          wsdlServiceElements[j].buildModel();
-        }
-        else
-          disconnect(wsdlServiceElements[j], WSDLModelConstants.REL_WSDL_SERVICE);
-      }
-      for (Iterator it = services.values().iterator();it.hasNext();) {
-        Service service = (Service)it.next();
-        WSDLServiceElement wsdlServiceElement = new WSDLServiceElement(service.getQName().getLocalPart(), getModel(), service);
-        connect(wsdlServiceElement,WSDLModelConstants.REL_WSDL_SERVICE,ModelConstants.REL_OWNER);
-        wsdlServiceElement.buildModel();
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
deleted file mode 100644
index b6b444ea4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLOperationElement.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.*;
-
-import javax.wsdl.extensions.soap.*;
-import javax.wsdl.extensions.*;
-import javax.wsdl.*;
-
-import java.util.*;
-
-public class WSDLOperationElement extends WSDLCommonElement
-{
-  public static final int OPERATION_TYPE_SOAP = 0;
-  public static final int OPERATION_TYPE_HTTP_GET = 1;
-  public static final int OPERATION_TYPE_HTTP_POST = 2;
-
-  private int operationType_;
-  private Operation operation_;
-  private WSDLPartsToXSDTypeMapper wsdlPartsToXsdTypeMapper_;
-  private XSDToFragmentController fragController_;
-  private boolean isDocumentStyle_;
-  private boolean isUseLiteral_;
-  private String soapAction_;
-  private String encodingStyle_;
-  private String encodingNamespace_;
-
-  private final void gatherSoapInformation(WSDLBindingElement bindingElement,SOAPBinding soapBinding)
-  {
-    // Initialize defaults.
-    isDocumentStyle_ = true;
-    soapAction_ = "";
-    isUseLiteral_ = true;
-    encodingStyle_ = null;
-    encodingNamespace_ = null;
-
-    if (soapBinding != null)
-      isDocumentStyle_ = "document".equals(soapBinding.getStyle());
-    BindingOperation bindingOperation = getBindingOperation(bindingElement);
-    SOAPOperation soapOperation = null;
-    
-    for (Iterator i = bindingOperation.getExtensibilityElements().iterator();i.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)i.next();
-      if (e instanceof SOAPOperation)
-      {
-        soapOperation = (SOAPOperation)e;
-        soapAction_ = soapOperation.getSoapActionURI();
-        String style = soapOperation.getStyle();
-        if (style != null)
-          isDocumentStyle_ = style.equals("document");
-        break;
-      }
-    }
-
-    BindingInput bindingInput = bindingOperation.getBindingInput();
-    SOAPBody soapBody = null;
-    for (Iterator i = bindingInput.getExtensibilityElements().iterator();i.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)i.next();
-      if (e instanceof SOAPBody)
-      {
-        soapBody = (SOAPBody)e;
-        isUseLiteral_ = "literal".equals(soapBody.getUse());
-        if (!isUseLiteral_)
-        {
-          // Encoded.
-          for (Iterator j = soapBody.getEncodingStyles().iterator();j.hasNext();)
-          {
-            encodingStyle_ = (String)j.next();
-            encodingNamespace_ = soapBody.getNamespaceURI();
-            break;
-          }
-        }
-        break;
-      }
-    }
-  }
-
-  public WSDLOperationElement(String name,WSDLBindingElement bindingElement,Operation operation)
-  {
-    super(name, bindingElement.getModel());
-    // Set the default operation type to be SOAP.
-    setOperation(bindingElement,operation);
-  }
-
-  public void setOperation(WSDLBindingElement bindingElement,Operation operation) {
-    operation_ = operation;
-    setDocumentation(operation.getDocumentationElement());
-    fragController_ = null;
-    wsdlPartsToXsdTypeMapper_ = null;
-    operationType_ = bindingElement.getBindingType();
-    ExtensibilityElement bindingExtensibilityElement = bindingElement.getBindingExtensibilityElement();
-    switch (operationType_)
-    {
-      case BindingTypes.SOAP:
-        gatherSoapInformation(bindingElement,(SOAPBinding)bindingExtensibilityElement);
-      case BindingTypes.HTTP_GET:
-      case BindingTypes.HTTP_POST:
-      default:
-        break;
-    }
-  }
-
-  public Operation getOperation() {
-    return operation_;
-  }
-
-  public BindingOperation getBindingOperation()
-  {
-    return getBindingOperation((WSDLBindingElement)getParentElement());
-  }
-
-  private BindingOperation getBindingOperation(WSDLBindingElement bindingElement)
-  {
-    Binding binding = bindingElement.getBinding();
-    String operationInputName = null;
-    String operationOutputName = null;
-    Input operationInput = operation_.getInput();
-    Output operationOutput = operation_.getOutput();
-    if (operationInput != null)
-      operationInputName = operationInput.getName();
-    if (operationOutput != null)
-      operationOutputName = operationOutput.getName();
-    BindingOperation bindingOperation = binding.getBindingOperation(operation_.getName(),operationInputName,operationOutputName);
-    if (bindingOperation == null)
-      bindingOperation = binding.getBindingOperation(operation_.getName(),null,null);
-    return bindingOperation;
-  }
-
-  public List getOrderedBodyParts()
-  {
-    List parts = new Vector(operation_.getInput().getMessage().getOrderedParts(operation_.getParameterOrdering()));
-    BindingOperation bindingOperation = getBindingOperation();
-    BindingInput bindingInput = bindingOperation.getBindingInput();
-    for (Iterator it = bindingInput.getExtensibilityElements().iterator(); it.hasNext();)
-    {
-      ExtensibilityElement e = (ExtensibilityElement)it.next();
-      if (e instanceof SOAPBody)
-      {
-        SOAPBody soapBody = (SOAPBody)e;
-        List bodyParts = soapBody.getParts();
-        if (bodyParts != null)
-        {
-          for (int i = 0; i < parts.size(); i++)
-          {
-            Part part = (Part)parts.get(i);
-            if (!bodyParts.contains(part) && !bodyParts.contains(part.getName()))
-            {
-              parts.remove(i);
-              i--;
-            }
-          }
-        }
-        break;
-      }
-    }
-    return parts;
-  }
-
-  private XSDToFragmentController getXSDToFragmentController() {
-    if (fragController_ == null) {
-      fragController_ = new XSDToFragmentController();
-      fragController_.setWSDLPartsToXSDTypeMapper(wsdlPartsToXsdTypeMapper_);
-    }
-    return fragController_;
-  }
-
-  private XSDNamedComponent getSchema(Part part, String id) {
-    if (wsdlPartsToXsdTypeMapper_ == null) {
-      wsdlPartsToXsdTypeMapper_ = new WSDLPartsToXSDTypeMapper();
-      WSDLBindingElement bindingElement = (WSDLBindingElement)getParentElement();
-      WSDLServiceElement serviceElement = (WSDLServiceElement)bindingElement.getParentElement();
-      WSDLElement wsdlElement = (WSDLElement)serviceElement.getParentElement();
-      wsdlPartsToXsdTypeMapper_.addSchemas(wsdlElement.getSchemaList());
-    }
-    return wsdlPartsToXsdTypeMapper_.getXSDType(part, id);
-  }
-
-  public IXSDFragment getFragment(Part part) {
-    return getFragment(part, true);
-  }
-
-  public IXSDFragment getFragment(Part part, boolean isInput) {
-    StringBuffer id = new StringBuffer();
-    if (isInput)
-      id.append(FragmentConstants.INPUT_ID);
-    else
-      id.append(FragmentConstants.OUTPUT_ID);
-    String partName = part.getName();
-    id.append(partName);
-    XSDToFragmentConfiguration config = new XSDToFragmentConfiguration();
-    config.setIsWSDLPart(true);
-    config.setWSDLPartName(partName);
-    config.setXSDComponent(getSchema(part, id.toString()));
-    if (isDocumentStyle())
-      config.setStyle(FragmentConstants.STYLE_DOCUMENT);
-    else
-      config.setStyle(FragmentConstants.STYLE_RPC);
-    if (operationType_ == BindingTypes.SOAP)
-    {
-      if (!isUseLiteral_)
-        config.setPartEncoding(FragmentConstants.ENCODING_SOAP);
-    }
-    else
-      config.setPartEncoding(FragmentConstants.ENCODING_URL);
-    IXSDFragment fragment = getXSDToFragmentController().getFragment(config, id.toString(), part.getName());
-    return fragment;
-  }
-
-  public IXSDFragment getFragmentByID(String id) {
-    return getXSDToFragmentController().getCachedFragment(id);
-  }
-
-  public void removeAllFragment() {
-    getXSDToFragmentController().emptyCache();
-  }
-
-  public boolean isDocumentStyle()
-  {
-    return isDocumentStyle_;
-  }
-
-  public String getSoapAction()
-  {
-    return soapAction_;
-  }
-
-  public boolean isUseLiteral()
-  {
-    return isUseLiteral_;
-  }
-
-  public String getEncodingStyle()
-  {
-    return encodingStyle_;
-  }
-
-  public String getEncodingNamespace()
-  {
-    return encodingNamespace_;
-  }
-
-  public int getOperationType()
-  {
-    return operationType_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
deleted file mode 100644
index 7d3045679..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/datamodel/WSDLServiceElement.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-import javax.xml.namespace.QName;
-import javax.wsdl.extensions.soap.*;
-import javax.wsdl.extensions.http.*;
-import javax.wsdl.extensions.*;
-import javax.wsdl.*;
-
-import java.util.*;
-
-public class WSDLServiceElement extends WSDLCommonElement
-{
-
-  private Service service_;
-
-  public WSDLServiceElement(String name, Model model, Service service)
-  {
-    super(name, model);
-    setService(service);
-  }
-  
-  public void setService(Service service) {
-    service_ = service;
-    setDocumentation(service.getDocumentationElement());
-  }
-
-  public Service getService() {
-    return service_;
-  }
-  
-  public String getAddressLocation(Binding binding)
-  {
-    Map ports = service_.getPorts();
-    for (Iterator i = ports.values().iterator();i.hasNext();)
-    {
-      Port port = (Port)i.next();
-      if (port.getBinding().getQName().equals(binding.getQName()))
-      {
-        List extensibilityElements = port.getExtensibilityElements();
-        for (Iterator j = extensibilityElements.iterator();j.hasNext();)
-        {
-          ExtensibilityElement element = (ExtensibilityElement)j.next();
-          if (element instanceof SOAPAddress)
-          {
-            SOAPAddress soapAddress = (SOAPAddress)element;
-            return soapAddress.getLocationURI();
-          }
-          else if (element instanceof HTTPAddress)
-          {
-            HTTPAddress httpAddress = (HTTPAddress)element;
-            return httpAddress.getLocationURI();
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  public void buildModel() {
-    if (service_ != null) {
-      Map ports = service_.getPorts();
-      Map bindings = new HashMap();
-      for (Iterator it = ports.values().iterator();it.hasNext();) {
-        Port port = (Port)it.next();
-        Binding binding = port.getBinding();
-        if (binding.getPortType() == null)
-          continue;
-        else
-          bindings.put(binding.getQName(), binding);
-      }
-      WSDLBindingElement[] wsdlBindingElements = new WSDLBindingElement[getNumberOfElements(WSDLModelConstants.REL_WSDL_BINDING)];
-      Enumeration e = getElements(WSDLModelConstants.REL_WSDL_BINDING);
-      for (int i = 0; i < wsdlBindingElements.length; i++) {
-        wsdlBindingElements[i] = (WSDLBindingElement)e.nextElement();
-      }
-      for (int j = 0; j < wsdlBindingElements.length; j++) {
-        QName qname = wsdlBindingElements[j].getBinding().getQName();
-        Binding binding = (Binding)bindings.get(qname);
-        if (binding != null) {
-          bindings.remove(qname);
-          wsdlBindingElements[j].setBinding(binding);
-          wsdlBindingElements[j].buildModel();
-        }
-        else
-          disconnect(wsdlBindingElements[j], WSDLModelConstants.REL_WSDL_BINDING);
-      }
-      for (Iterator it = bindings.values().iterator();it.hasNext();) {
-        Binding binding = (Binding)it.next();
-        WSDLBindingElement wsdlBindingElement = new WSDLBindingElement(binding.getQName().getLocalPart(), getModel(), binding);
-        connect(wsdlBindingElement,WSDLModelConstants.REL_WSDL_BINDING,ModelConstants.REL_OWNER);
-        wsdlBindingElement.buildModel();
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
deleted file mode 100644
index 114e13d29..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-
-import java.util.Vector;
-
-public interface IFragment {
-  public void setID(String id);
-  public String getID();
-
-  public void setName(String name);
-  public String getName();
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException;
-
-  public void setParameterValues(String paramKey, String[] params);
-    public void setParameterValues(String paramKey, Vector params);
-  public String[] getParameterValues(String paramKey);
-  public String getParameterValue(String paramKey, int paramIndex);
-
-  public boolean validateAllParameterValues();
-  public boolean validateParameterValues(String paramKey);
-  public boolean validateParameterValue(String paramKey, int paramIndex);
-
-  public String getInformationFragment();
-  public String getWriteFragment();
-  public String getReadFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
deleted file mode 100644
index d30dbd5b4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncArrayFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface ISOAPEncArrayFragment extends IXSDGroupSeqFragment {
-  public String createSOAPEncArrayInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
deleted file mode 100644
index 65013d94b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/ISOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import java.util.Hashtable;
-
-public interface ISOAPEncodingWrapperFragment extends IXSDDelegationFragment
-{
-  public void setURIReferences(Hashtable uriReferences);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
deleted file mode 100644
index dca6da2be..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDComplexFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDComplexFragment extends IXSDMapFragment {
-  public String createComplexInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
deleted file mode 100644
index eb43be581..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDDelegationFragment.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDDelegationFragment extends IXSDFragment {
-  public void setXSDDelegationFragment(IXSDFragment xsdFragment);
-  public IXSDFragment getXSDDelegationFragment();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
deleted file mode 100644
index 19b872b0f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDElementFragment.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDElementFragment extends IXSDDelegationFragment {
-  public int getMinOccurs();
-  public int getMaxOccurs();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
deleted file mode 100644
index e15ae7694..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDFragment.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import java.util.Hashtable;
-
-public interface IXSDFragment extends IFragment {
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config);
-  public XSDToFragmentConfiguration getXSDToFragmentConfiguration();
-
-  public void setXSDTypeDefinition(XSDTypeDefinition typeDef);
-  public XSDTypeDefinition getXSDTypeDefinition();
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments);
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc);
-
-  public String genID();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
deleted file mode 100644
index 9bd54e66e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupAllFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupAllFragment extends IXSDGroupFragment {
-  public String getGroupAllInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
deleted file mode 100644
index 864837cc2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDParticle;
-
-public interface IXSDGroupChoiceFragment extends IXSDGroupFragment {
-  public XSDParticle[] getChoices();
-  public String createGroupChoiceInstance(int choiceIndex);
-  public int getChoiceIndex(String groupID);
-  public void setChoiceIndex(String groupID, int choiceIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
deleted file mode 100644
index 9da875972..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupFragment.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDModelGroup;
-
-public interface IXSDGroupFragment extends IXSDMapFragment {
-  public void setXSDModelGroup(XSDModelGroup xsdModelGroup);
-  public XSDModelGroup getXSDModelGroup();
-
-  public String[] getGroupIDs();
-  public String[] getGroupMemberIDs(String groupID);
-  public IXSDFragment[] getGroupMemberFragments(String groupID);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
deleted file mode 100644
index 614433eee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDGroupSeqFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDGroupSeqFragment extends IXSDGroupFragment {
-  public String createGroupSeqInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
deleted file mode 100644
index 1a9fd3b9a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDMapFragment.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDMapFragment extends IXSDFragment {
-  public void setXSDToFragmentController(XSDToFragmentController controller);
-  public XSDToFragmentController getXSDToFragmentController();
-
-  public String createInstance();
-
-  public String[] getFragmentsOrder();
-  public IXSDFragment getFragment(String id);
-  public IXSDFragment[] getFragments(String[] ids);
-  public IXSDFragment[] getAllFragments();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
deleted file mode 100644
index 33f97da25..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleAtomicFragment extends IXSDFragment {
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
deleted file mode 100644
index 00925a379..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleListFragment.java
+++ /dev/null
@@ -1,15 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-public interface IXSDSimpleListFragment extends IXSDMapFragment {
-  public String createListInstance();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
deleted file mode 100644
index ba86a1232..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/IXSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public interface IXSDSimpleUnionFragment extends IXSDMapFragment {
-  public XSDSimpleTypeDefinition[] getMemberTypeDefinitions();
-  public String createUnionInstance(int memberTypeIndex);
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
deleted file mode 100644
index b44174a4d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDComplexTypeToFragmentMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComplexTypeContent;
-
-public class XSDComplexTypeToFragmentMapper extends XSDToFragmentMapper {
-  public XSDComplexTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)config.getXSDComponent();
-    if (complexType != null && complexType.isMixed())
-      return getXSDDefaultFragment(config, id, name);
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    if (complexTypeContent != null)
-      return getXSDComplexFragment(config, id, name);
-    else
-      return getXSDEmptyFragment(config, id, name);
-  }
-
-  private IXSDFragment getXSDComplexFragment(XSDToFragmentConfiguration config, String id, String name) {
-    int minOccurs = config.getMinOccurs();
-    int maxOccurs = config.getMaxOccurs();
-    
-    if (minOccurs == maxOccurs)
-      return new XSDComplexFixFragment(id, name, config, getController());
-    else
-      return new XSDComplexRangeFragment(id, name, config, getController());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
deleted file mode 100644
index bee204e91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDElementDeclarationToFragmentMapper.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public class XSDElementDeclarationToFragmentMapper extends XSDToFragmentMapper {
-  public XSDElementDeclarationToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDElementDeclaration element = (XSDElementDeclaration)config.getXSDComponent();
-    if (element != null) {
-      XSDElementDeclaration resolvedElement = resolveXSDElementDeclaration(element);
-      XSDTypeDefinition typeDef = getXSDTypeDefinition(resolvedElement);
-      if (typeDef != null) {
-        int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
-        int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
-        XSDConcreteComponent concreteComponent = element.getContainer();
-        if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
-          XSDParticle particle = (XSDParticle)concreteComponent;
-          if (particle.isSetMinOccurs())
-            minOccurs = particle.getMinOccurs();
-          if (particle.isSetMaxOccurs())
-            maxOccurs = particle.getMaxOccurs();
-        }
-        config.setMinOccurs(minOccurs);
-        config.setMaxOccurs(maxOccurs);
-        IXSDElementFragment elementFrag = new XSDElementFragment(id, resolvedElement.getName(), config);
-        elementFrag.setXSDTypeDefinition(typeDef);
-        XSDToFragmentConfiguration elementTypeConfig = new XSDToFragmentConfiguration();
-        elementTypeConfig.setXSDComponent(typeDef);
-        elementTypeConfig.setMinOccurs(minOccurs);
-        elementTypeConfig.setMaxOccurs(maxOccurs);
-        elementTypeConfig.setStyle(config.getStyle());
-        elementTypeConfig.setPartEncoding(config.getPartEncoding());
-        elementTypeConfig.setWSDLPartName(config.getWSDLPartName());
-        IXSDFragment xsdFragment = getController().getFragment(elementTypeConfig, elementFrag.genID(), resolvedElement.getName());
-        elementFrag.setXSDDelegationFragment(xsdFragment);
-        return elementFrag;
-      }
-    }
-    return getXSDDefaultFragment(config, id, name);
-  }
-
-  private XSDElementDeclaration resolveXSDElementDeclaration(XSDElementDeclaration element) {
-    // port to org.eclipse.xsd
-    if (element.getResolvedElementDeclaration() != null)
-    {
-      XSDElementDeclaration resolvedElement = element.getResolvedElementDeclaration();
-      if (!isComponentResolvable(resolvedElement))
-      {
-        XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent(resolvedElement);
-        if (resolvedComponent != null && (resolvedComponent instanceof XSDElementDeclaration))
-          resolvedElement = (XSDElementDeclaration)resolvedComponent;
-      }
-      return resolvedElement;
-    }
-    else
-      return element;
-  }
-
-  private XSDTypeDefinition getXSDTypeDefinition(XSDElementDeclaration element) {
-    // port to org.eclipse.xsd
-    if (element.getTypeDefinition() != null)
-      return element.getTypeDefinition();
-    // port to org.eclipse.xsd
-    else if (element.getAnonymousTypeDefinition() != null)
-      return element.getAnonymousTypeDefinition();
-    else
-      return null;
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
deleted file mode 100644
index 55e440883..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDLiteralXMLEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-
-public class XSDLiteralXMLEncodingToFragmentMapper extends XSDToFragmentMapper {
-  private XSDSimpleTypeToFragmentMapper xsdSimpleMapper_;
-  private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
-  private XSDElementDeclarationToFragmentMapper xsdElementMapper_;
-  private XSDParticleToFragmentMapper xsdParticleMapper_;
-
-  public XSDLiteralXMLEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-    xsdSimpleMapper_ = null;
-    xsdComplexMapper_ = null;
-    xsdElementMapper_ = null;
-    xsdParticleMapper_= null;
-  }
-
-  private XSDSimpleTypeToFragmentMapper getXSDSimpleMapper() {
-    if (xsdSimpleMapper_ == null)
-      xsdSimpleMapper_ = new XSDSimpleTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdSimpleMapper_;
-  }
-
-  private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
-    if (xsdComplexMapper_ == null)
-      xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdComplexMapper_;
-  }
-
-  private XSDElementDeclarationToFragmentMapper getXSDElementMapper() {
-    if (xsdElementMapper_ == null)
-      xsdElementMapper_ = new XSDElementDeclarationToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdElementMapper_;
-  }
-
-  private XSDParticleToFragmentMapper getXSDParticleMapper() {
-    if (xsdParticleMapper_ == null)
-      xsdParticleMapper_ = new XSDParticleToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdParticleMapper_;
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    config = resolveXSDComponent(config);
-    XSDComponent component = config.getXSDComponent();
-    if (!isComponentResolvable(component))
-      return getXSDDefaultFragment(config, id, name);
-    else if (component instanceof XSDElementDeclaration)
-      return getXSDElementMapper().getFragment(config, id, name);
-    else if (component instanceof XSDSimpleTypeDefinition)
-      return getXSDSimpleMapper().getFragment(config, id, name);
-    else if (component instanceof XSDComplexTypeDefinition)
-      return getXSDComplexMapper().getFragment(config, id, name);
-    else if (component instanceof XSDParticle)
-      return getXSDParticleMapper().getFragment(config, id, name);
-    else if (component instanceof XSDParticleContent)
-      return getXSDParticleMapper().getFragment(config, id, name);
-    else
-      return getXSDDefaultFragment(config, id, name);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
deleted file mode 100644
index 3e4765e57..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDParticleToFragmentMapper.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDWildcard;
-
-
-public class XSDParticleToFragmentMapper extends XSDToFragmentMapper {
-  public XSDParticleToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDComponent component = config.getXSDComponent();
-    XSDParticleContent xsdParticleContent;
-    if (component instanceof XSDParticle)
-      xsdParticleContent = ((XSDParticle)component).getContent();
-    else if (component instanceof XSDParticleContent)
-      xsdParticleContent = (XSDParticleContent)component;
-    else
-      xsdParticleContent = null;
-    if (xsdParticleContent != null) {
-      if (xsdParticleContent instanceof XSDModelGroupDefinition)
-        return getXSDModelGroupDefFragment(config, id, name, (XSDModelGroupDefinition)xsdParticleContent);
-      else if (xsdParticleContent instanceof XSDModelGroup)
-        return getXSDModelGroupFragment(config, id, name, (XSDModelGroup)xsdParticleContent);
-      else if (xsdParticleContent instanceof XSDWildcard)
-        return getXSDWildcardFragment(config, id, name, (XSDWildcard)xsdParticleContent);
-      else
-        return getXSDDefaultFragment(config, id, name);
-    }
-    else
-      return getXSDDefaultFragment(config, id, name);
-  }
-
-  private IXSDFragment getXSDModelGroupDefFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroupDefinition xsdModelGroupDef) {
-    XSDModelGroupDefinition resolvedXSDModelGroupDef = xsdModelGroupDef;
-    if (xsdModelGroupDef.isModelGroupDefinitionReference())
-      resolvedXSDModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
-    XSDModelGroup xsdModelGroup = resolvedXSDModelGroupDef.getModelGroup();
-    if (xsdModelGroup == null)
-      return getXSDDefaultFragment(config, id, name);
-    else
-      return getXSDModelGroupFragment(config, id, name, xsdModelGroup);
-  }
-
-  private IXSDFragment getXSDModelGroupFragment(XSDToFragmentConfiguration config, String id, String name, XSDModelGroup xsdModelGroup) {
-    int minOccurs = FragmentConstants.DEFAULT_MIN_OCCURS;
-    int maxOccurs = FragmentConstants.DEFAULT_MAX_OCCURS;
-    XSDConcreteComponent concreteComponent = xsdModelGroup.getContainer();
-    if (concreteComponent != null && concreteComponent instanceof XSDParticle) {
-      XSDParticle particle = (XSDParticle)concreteComponent;
-      if (particle.isSetMinOccurs())
-        minOccurs = particle.getMinOccurs();
-      if (particle.isSetMaxOccurs())
-        maxOccurs = particle.getMaxOccurs();
-    }
-    config.setMinOccurs(minOccurs);
-    config.setMaxOccurs(maxOccurs);
-    
-    switch (xsdModelGroup.getCompositor().getValue()) {
-      case XSDCompositor.SEQUENCE: 
-        if (minOccurs == maxOccurs)
-          return new XSDGroupSeqFixFragment(id, name, config, getController(), xsdModelGroup);
-        else
-          return new XSDGroupSeqRangeFragment(id, name, config, getController(), xsdModelGroup);
-      case XSDCompositor.CHOICE:
-        if (minOccurs == maxOccurs)
-          return new XSDGroupChoiceFixFragment(id, name, config, getController(), xsdModelGroup);
-        else
-          return new XSDGroupChoiceRangeFragment(id, name, config, getController(), xsdModelGroup);
-      case XSDCompositor.ALL:
-        return new XSDGroupAllFragment(id, name, config, getController(), xsdModelGroup);
-      default:
-        return getXSDDefaultFragment(config, id, name);
-    }
-  }
-
-  private IXSDFragment getXSDWildcardFragment(XSDToFragmentConfiguration config, String id, String name, XSDWildcard xsdParticleContent) {
-    return getXSDDefaultFragment(config, id, name);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
deleted file mode 100644
index e43c8b802..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSOAPEncodingToFragmentMapper.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.emf.common.util.EList;
-
-import org.w3c.dom.Element;
-
-public class XSDSOAPEncodingToFragmentMapper extends XSDToFragmentMapper {
-  private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
-  private XSDComplexTypeToFragmentMapper xsdComplexMapper_;
-
-  public XSDSOAPEncodingToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-    xsdLiteralMapper_ = null;
-    xsdComplexMapper_ = null;
-  }
-
-  private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
-    if (xsdLiteralMapper_ == null)
-      xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-    return xsdLiteralMapper_;
-  }
-
-  private XSDComplexTypeToFragmentMapper getXSDComplexMapper() {
-    if (xsdComplexMapper_ == null)
-      xsdComplexMapper_ = new XSDComplexTypeToFragmentMapper(getController(), getWSDLPartsToXSDTypeMapper());
-     return xsdComplexMapper_;
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    if (config.getIsWSDLPart()) {
-      ISOAPEncodingWrapperFragment wrapperFragment = new SOAPEncodingWrapperFragment(id, name, null);
-      String delegationFragId = wrapperFragment.genID();
-      IXSDFragment delegationFragment = getFragmentDelegate(config, delegationFragId, name);
-      wrapperFragment.setXSDDelegationFragment(delegationFragment);
-      getController().addToCache(delegationFragId, delegationFragment);
-      return wrapperFragment;
-    }
-    else
-      return getFragmentDelegate(config, id, name);
-  }
-
-  public IXSDFragment getFragmentDelegate(XSDToFragmentConfiguration config, String id, String name) {
-    config = resolveXSDComponent(config);
-    XSDComponent component = config.getXSDComponent();
-    if (!isComponentResolvable(component))
-      return getXSDDefaultFragment(config, id, name);
-    else if (component instanceof XSDComplexTypeDefinition) {
-      XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)component;
-      if (XSDTypeDefinitionUtil.isSoapEncArray(complexType))
-        return getSOAPEncArrayFragment(config, id, name, complexType);
-      else
-        return getXSDComplexMapper().getFragment(config, id, name);
-    }
-    else
-      return getXSDLiteralMapper().getFragment(config, id, name);
-  }
-
-  private IXSDFragment getSOAPEncArrayFragment(XSDToFragmentConfiguration config, String id, String name, XSDComplexTypeDefinition complexType) {
-    EList xsdAttrContents = complexType.getAttributeContents();
-    for (int i = 0; i < xsdAttrContents.size(); i++) {
-      String soapEncArrayTypeNamespaceURI = null;
-      String soapEncArrayTypeLocalName = null;
-      int soapEncArrayDimension = 0;
-      XSDAttributeGroupContent xsdAttrContent = (XSDAttributeGroupContent)xsdAttrContents.get(i);
-      Element element = xsdAttrContent.getElement();
-      String arrayTypeAttr = element.getAttributeNS(FragmentConstants.URI_WSDL, FragmentConstants.QNAME_LOCAL_NAME_ARRAY_TYPE);
-      if (arrayTypeAttr != null && arrayTypeAttr.length() > 0) {
-        int colon = arrayTypeAttr.indexOf(FragmentConstants.COLON);
-        String nsPrefix = (colon > 0) ? arrayTypeAttr.substring(0, colon) : null;
-        soapEncArrayTypeNamespaceURI = (String)xsdAttrContent.getSchema().getQNamePrefixToNamespaceMap().get(nsPrefix);
-        int dimensionIndex = arrayTypeAttr.indexOf(FragmentConstants.LEFT_SQUARE_BRACKET);
-        soapEncArrayTypeLocalName = arrayTypeAttr.substring(colon + 1, dimensionIndex);
-        String dimensionString = arrayTypeAttr.substring(dimensionIndex, arrayTypeAttr.length());
-        for (int j = 0; j < dimensionString.length() - 1; j++) {
-          if (dimensionString.charAt(j) == FragmentConstants.LEFT_SQUARE_BRACKET.charAt(0) && dimensionString.charAt(j + 1) == FragmentConstants.RIGHT_SQUARE_BRACKET.charAt(0)) {
-            soapEncArrayDimension++;
-            j++;
-          }
-          else {
-            soapEncArrayDimension = 0;
-            break;
-          }
-        }
-      }
-      if (soapEncArrayTypeNamespaceURI != null && soapEncArrayTypeLocalName != null && soapEncArrayDimension == 1) {
-        XSDComponent soapEncArrayType = getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(soapEncArrayTypeNamespaceURI, soapEncArrayTypeLocalName, false);
-        if (soapEncArrayType != null && soapEncArrayType instanceof XSDTypeDefinition) {
-          XSDModelGroup sequence = null;
-          XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-          if (complexTypeContent != null && (complexTypeContent instanceof XSDParticle)) {
-            XSDParticleContent xsdParticleContent = ((XSDParticle)complexTypeContent).getContent();
-            if (xsdParticleContent instanceof XSDModelGroup)
-              sequence = (XSDModelGroup)xsdParticleContent;
-          }
-          ISOAPEncArrayFragment frag;
-          if (config.getMinOccurs() == config.getMaxOccurs())
-            frag = new SOAPEncArrayFixFragment(id, name, config, getController(), sequence);
-          else
-            frag = new SOAPEncArrayRangeFragment(id, name, config, getController(), sequence);
-          frag.setXSDTypeDefinition((XSDTypeDefinition)soapEncArrayType);
-          return frag;
-        }
-      }
-    }
-    return getXSDComplexMapper().getFragment(config, id, name);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
deleted file mode 100644
index ba752ea83..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDSimpleTypeToFragmentMapper.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-import org.eclipse.xsd.*;
-
-public class XSDSimpleTypeToFragmentMapper extends XSDToFragmentMapper {
-  public XSDSimpleTypeToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    super(controller, wsdlToXSDMapper);
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)config.getXSDComponent();
-    if (simpleType != null && simpleType.getVariety() != null) {
-      switch (simpleType.getVariety().getValue()) {
-        case XSDVariety.ATOMIC:
-          return getXSDSimpleAtomicFragment(config, id, name);
-        case XSDVariety.LIST:
-          return getXSDSimpleListFragment(config, id, name);
-        case XSDVariety.UNION:
-          return getXSDSimpleUnionFragment(config, id, name);
-        default:
-          return getXSDDefaultFragment(config, id, name);
-      }
-    }
-    else
-      return getXSDDefaultFragment(config, id, name);
-  }
-
-  private IXSDFragment getXSDSimpleAtomicFragment(XSDToFragmentConfiguration config, String id, String name) {
-    boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
-    XSDSimpleTypeDefinition xsdSimpleTypeDef = (XSDSimpleTypeDefinition)config.getXSDComponent();
-    XSDSimpleTypeDefinition xsdBaseSimpleTypeDef = (XSDSimpleTypeDefinition)XSDTypeDefinitionUtil.resolveToXSDBuiltInTypeDefinition(xsdSimpleTypeDef);
-    String baseSimpleTypeDefNS = null;
-    String baseSimpleTypeDefName = null;
-    if (xsdBaseSimpleTypeDef != null)
-    {
-      baseSimpleTypeDefNS = xsdBaseSimpleTypeDef.getTargetNamespace();
-      baseSimpleTypeDefName = xsdBaseSimpleTypeDef.getName();
-    }
-    boolean isEnum = isSimpleTypeEnumeration(xsdSimpleTypeDef);
-    if (FragmentConstants.URI_XSD.equals(baseSimpleTypeDefNS))
-    {
-      if (baseSimpleTypeDefName.equals("date"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATE,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("dateTime"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_DATETIME,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("gYearMonth"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GYEARMONTH,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("gMonthDay"))
-        return getXSDSimpleDateTimeFragment(id, name, config, ActionInputs.CALENDAR_TYPE_GMONTHDAY,xsdSimpleTypeDef,isEnum,isFixed);
-      else if (baseSimpleTypeDefName.equals("gDay"))
-        return getXSDSimpleGDayFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);        
-      else if (baseSimpleTypeDefName.equals("boolean"))
-        return getXSDSimpleBooleanFragment(id, name, config, xsdSimpleTypeDef,isEnum,isFixed);
-    }
-
-    if (isEnum)
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
-      else
-        return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdSimpleTypeDef.getEnumerationFacets());
-    }
-    else
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicFixFragment(id, name, config);
-      else
-        return new XSDSimpleAtomicRangeFragment(id, name, config);
-    }
-  }
-
-  private XSDSimpleAtomicFragment getXSDSimpleDateTimeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType,XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
-  {
-    if (isEnum)
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicEnumFixFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
-      else
-        return new XSDSimpleAtomicEnumRangeFragment(id, name, config, xsdDateTimeType.getEnumerationFacets());
-    }
-    else
-    {
-      if (isFixed)
-        return new XSDSimpleAtomicDateTimeFixFragment(id, name, config, calendarType);
-      else
-        return new XSDSimpleAtomicDateTimeRangeFragment(id, name, config, calendarType);
-    }
-  }
-  
-  private XSDSimpleAtomicFragment getXSDSimpleGDayFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdDateTimeType,boolean isEnum,boolean isFixed)
-  {
-    if (isEnum)
-      return null;
-    OptionVector optionVector = new OptionVector();
-    StringBuffer value = new StringBuffer();
-    for (int i=1;i<=31;i++)
-    {
-      value.setLength(0);
-      value.append("---");
-      if (i<10)
-        value.append(0);
-      value.append(i);
-      optionVector.addOption(String.valueOf(i),value.toString());
-    }
-    if (isFixed)
-      return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
-    else
-      return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
-  }
-
-  private XSDSimpleAtomicFragment getXSDSimpleBooleanFragment(String id, String name, XSDToFragmentConfiguration config, XSDSimpleTypeDefinition xsdBooleanType,boolean isEnum,boolean isFixed)
-  {
-    if (isEnum)
-      return null;
-    OptionVector optionVector = new OptionVector();
-    optionVector.addOption("true","true");
-    optionVector.addOption("false","false");
-    if (isFixed)
-      return new XSDSimpleAtomicEnumFixFragment(id, name, config, optionVector);
-    else
-      return new XSDSimpleAtomicEnumRangeFragment(id, name, config, optionVector);
-  }
-
-  private IXSDFragment getXSDSimpleListFragment(XSDToFragmentConfiguration config, String id, String name) {
-    
-    boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
-    if (isFixed)
-      return new XSDSimpleListFixFragment(id, name, config, getController());
-    else
-      return new XSDSimpleListRangeFragment(id, name, config, getController());
-  }
-
-  private IXSDFragment getXSDSimpleUnionFragment(XSDToFragmentConfiguration config, String id, String name) {
-    
-    boolean isFixed = ((config.getMinOccurs() == config.getMaxOccurs()) && config.getMaxOccurs() != FragmentConstants.UNBOUNDED);
-    if (isFixed)
-      return new XSDSimpleUnionFixFragment(id, name, config, getController());
-    else
-      return new XSDSimpleUnionRangeFragment(id, name, config, getController());
-  }
-
-  private boolean isSimpleTypeEnumeration(XSDSimpleTypeDefinition simpleType) {
-    EList e = simpleType.getEnumerationFacets();
-    return (e != null && e.size() > 0);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
deleted file mode 100644
index 0537da155..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentConfiguration.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDComponent;
-
-public class XSDToFragmentConfiguration {
-  private XSDComponent component_;
-  private int minOccurs_;
-  private int maxOccurs_;
-  private int style_;
-  private int partEncoding_;
-  private boolean isWSDLPart_;
-  private String wsdlPartName_;
-
-  public XSDToFragmentConfiguration() {
-    component_ = null;
-    minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
-    maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
-    style_ = FragmentConstants.STYLE_DOCUMENT;
-    partEncoding_ = FragmentConstants.ENCODING_LITERAL;
-    isWSDLPart_ = false;
-    wsdlPartName_ = null;
-  }
-
-  public void setXSDComponent(XSDComponent component) {
-    component_ = component;
-  }
-
-  public XSDComponent getXSDComponent() {
-    return component_;
-  }
-
-  public void setMinOccurs(int minOccurs) {
-    minOccurs_ = minOccurs;
-  }
-
-  public int getMinOccurs() {
-    return minOccurs_;
-  }
-
-  public void setMaxOccurs(int maxOccurs) {
-    maxOccurs_ = maxOccurs;
-  }
-
-  public int getMaxOccurs() {
-    return maxOccurs_;
-  }
-  
-  public void setStyle(int style) {
-    style_ = style;
-  }
-  
-  public int getStyle() {
-    return style_;
-  }
-
-  public void setPartEncoding(int partEncoding) {
-    partEncoding_ = partEncoding;
-  }
-
-  public int getPartEncoding() {
-    return partEncoding_;
-  }
-
-  public void setIsWSDLPart(boolean isWSDLPart) {
-    isWSDLPart_ = isWSDLPart;
-  }
-
-  public boolean getIsWSDLPart() {
-    return isWSDLPart_;
-  }
-  
-  public void setWSDLPartName(String wsdlPartName) {
-    wsdlPartName_ = wsdlPartName;
-  }
-  
-  public String getWSDLPartName() {
-    return wsdlPartName_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
deleted file mode 100644
index e6f934247..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentController.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.*;
-
-import java.util.Hashtable;
-
-public class XSDToFragmentController {
-  private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
-  private XSDLiteralXMLEncodingToFragmentMapper xsdLiteralMapper_;
-  private XSDSOAPEncodingToFragmentMapper xsdSoapMapper_;
-  private Hashtable xsdToFragmentCache_;
-
-  public XSDToFragmentController() {
-    wsdlToXSDMapper_ = null;
-    xsdLiteralMapper_ = null;
-    xsdSoapMapper_ = null;
-    xsdToFragmentCache_ = new Hashtable();
-  }
-
-  public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    wsdlToXSDMapper_ = wsdlToXSDMapper;
-  }
-
-  public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
-    return wsdlToXSDMapper_;
-  }
-
-  private XSDLiteralXMLEncodingToFragmentMapper getXSDLiteralMapper() {
-    if (xsdLiteralMapper_ == null)
-      xsdLiteralMapper_ = new XSDLiteralXMLEncodingToFragmentMapper(this, wsdlToXSDMapper_);
-    return xsdLiteralMapper_;
-  }
-
-  private XSDSOAPEncodingToFragmentMapper getXSDSOAPMapper() {
-    if (xsdSoapMapper_ == null)
-      xsdSoapMapper_ = new XSDSOAPEncodingToFragmentMapper(this, wsdlToXSDMapper_);
-    return xsdSoapMapper_;
-  }
-
-  public IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name) {
-    IXSDFragment frag = getCachedFragment(id);
-    if (frag != null)
-      return frag;
-    frag = getNewFragment(config, id, name);
-    if (frag != null)
-      addToCache(id, frag);
-    return frag;
-  }
-
-  public IXSDFragment getCachedFragment(String id) {
-    return (IXSDFragment)xsdToFragmentCache_.get(id);
-  }
-
-  public IXSDFragment getNewFragment(XSDToFragmentConfiguration config, String id, String name) {
-    switch (config.getPartEncoding())
-    {
-      case FragmentConstants.ENCODING_SOAP:
-        return getXSDSOAPMapper().getFragment(config,id,name);      
-      case FragmentConstants.ENCODING_LITERAL:
-      case FragmentConstants.ENCODING_URL:
-      default:
-        return getXSDLiteralMapper().getFragment(config,id,name);
-    }
-  }
-
-  public void addToCache(String id, IXSDFragment frag) {
-    xsdToFragmentCache_.put(id, frag);
-  }
-
-  public void removeFromCache(String id) {
-    xsdToFragmentCache_.remove(id);
-  }
-
-  public void emptyCache() {
-    xsdToFragmentCache_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
deleted file mode 100644
index abe31ae30..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/XSDToFragmentMapper.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd.WSDLPartsToXSDTypeMapper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public abstract class XSDToFragmentMapper {
-  private XSDToFragmentController controller_;
-  private WSDLPartsToXSDTypeMapper wsdlToXSDMapper_;
-
-  public XSDToFragmentMapper(XSDToFragmentController controller, WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    controller_ = controller;
-    wsdlToXSDMapper_ = wsdlToXSDMapper;
-  }
-
-  public void setController(XSDToFragmentController controller) {
-    controller_ = controller;
-  }
-
-  public XSDToFragmentController getController() {
-    return controller_;
-  }
-
-  public void setWSDLPartsToXSDTypeMapper(WSDLPartsToXSDTypeMapper wsdlToXSDMapper) {
-    wsdlToXSDMapper_ = wsdlToXSDMapper;
-  }
-
-  public WSDLPartsToXSDTypeMapper getWSDLPartsToXSDTypeMapper() {
-    return wsdlToXSDMapper_;
-  }
-
-  protected IXSDFragment getXSDDefaultFragment(XSDToFragmentConfiguration config, String id, String name) {
-    return new XSDDefaultFragment(id, name, config);
-  }
-
-  protected IXSDFragment getXSDEmptyFragment(XSDToFragmentConfiguration config, String id, String name) {
-    return new XSDEmptyFragment(id, name, config);
-  }
-
-  public abstract IXSDFragment getFragment(XSDToFragmentConfiguration config, String id, String name);
-
-  protected XSDToFragmentConfiguration resolveXSDComponent(XSDToFragmentConfiguration config)
-  {
-    XSDComponent component = config.getXSDComponent();
-    if (!isComponentResolvable(component) && (component instanceof XSDNamedComponent))
-    {
-      XSDComponent resolvedComponent = getWSDLPartsToXSDTypeMapper().resolveXSDNamedComponent((XSDNamedComponent)component);
-      if (resolvedComponent != null)
-        config.setXSDComponent(resolvedComponent);
-    }
-    return config;
-  }
-
-  protected boolean isComponentResolvable(XSDComponent component)
-  {
-    if (component == null)
-      return false;
-    XSDSchema schema = component.getSchema();
-    if (schema == null)
-      return false;
-    if (schema.getTargetNamespace() == null)
-      return false;
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
deleted file mode 100644
index 3217007dc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/Fragment.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IFragment;
-
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-public abstract class Fragment implements IFragment {
-  private String id_;
-  private String name_;
-  private Hashtable params_;
-
-  public Fragment(String id, String name) {
-    id_ = id;
-    name_ = name;
-    params_ = new Hashtable();
-  }
-
-  public void setID(String id) {
-    id_ = id;
-  }
-
-  public String getID() {
-    return id_;
-  }
-
-  public void setName(String name) {
-    name_ = name;
-  }
-
-  public String getName() {
-    return name_;
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String[] params = parser.getParameterValues(getID());
-    setParameterValues(getID(), params);
-    return validateAllParameterValues();
-  }
-
-  public void setParameterValues(String paramKey, String[] params) {
-    if (params == null)
-      params_.remove(paramKey);
-    else
-      params_.put(paramKey, params);
-  }
-
-  public void setParameterValues(String paramKey, Vector params) {
-    if (params == null)
-      params_.remove(paramKey);
-    else {
-      String[] paramsArray = new String[params.size()];
-      for (int i = 0; i < paramsArray.length; i++) {
-        paramsArray[i] = params.get(i).toString();
-      }
-      setParameterValues(paramKey, paramsArray);
-    }
-  }
-
-  public String[] getParameterValues(String paramKey) {
-    return (String[])params_.get(paramKey);
-  }
-
-  public String getParameterValue(String paramKey, int paramIndex) {
-    String[] params = getParameterValues(paramKey);
-    if (params != null && paramIndex < params.length)
-      return params[paramIndex];
-    else
-      return null;
-  }
-
-  public boolean validateAllParameterValues() {
-    Enumeration paramKeys = params_.keys();
-    while (paramKeys != null && paramKeys.hasMoreElements()) {
-      if (!validateParameterValues((String)paramKeys.nextElement()))
-        return false;
-    }
-    return true;
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    String[] params = getParameterValues(paramKey);
-    for (int i = 0; params != null && i < params.length; i++) {
-      if (!validateParameterValue(paramKey, i))
-        return false;
-    }
-    return true;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
deleted file mode 100644
index c6459dec5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayFixFragment extends SOAPEncArrayFragment {
-  public SOAPEncArrayFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
deleted file mode 100644
index 911c4fc04..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayFragment.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncArrayFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.emf.common.util.EList;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import java.util.Vector;
-import java.util.Hashtable;
-
-public abstract class SOAPEncArrayFragment extends XSDGroupSeqFragment implements ISOAPEncArrayFragment
-{
-  public SOAPEncArrayFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup)
-  {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    removeGroupIDs();
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    for (int i = 0; i < instanceDocumentsCopy.length; i++)
-    {
-      IXSDFragment soapEncArrayTypeFrag = (getGroupMemberFragments(createSOAPEncArrayInstance()))[0];
-      Vector instancesVector = new Vector();
-      NodeList nl = instanceDocumentsCopy[i].getChildNodes();
-      for (int j = 0; j < nl.getLength(); j++)
-      {
-        Node node = nl.item(j);
-        if (node instanceof Element)
-          instancesVector.add(node);
-        else
-          paramsValid = false;
-      }
-      Element[] childInstanceDocuments = new Element[instancesVector.size()];
-      instancesVector.copyInto(childInstanceDocuments);
-      if (!soapEncArrayTypeFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, soapEncArrayTypeFrag.getName())))
-        paramsValid = false;
-    }
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    String[] groupIDs = getGroupIDs();
-    Element[] instanceDocument = new Element[groupIDs.length];
-    StringBuffer attrName = new StringBuffer();
-    StringBuffer attrValue = new StringBuffer();
-//    StringBuffer attrArrayTypeName = new StringBuffer();
-//    StringBuffer attrArrayTypeValue = new StringBuffer();
-    for (int i = 0; i < instanceDocument.length; i++)
-    {
-      int numInstances = 0;
-      instanceDocument[i] = doc.createElement(getInstanceDocumentTagName(namespaceTable));
-      IXSDFragment fragment = (getGroupMemberFragments(groupIDs[i]))[0];
-      Element[] fragmentInstanceDocuments = fragment.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      for (int j = 0; j < fragmentInstanceDocuments.length; j++)
-      {
-        if (fragmentInstanceDocuments[j] != null)
-          instanceDocument[i].appendChild(fragmentInstanceDocuments[j]);
-        numInstances++;
-      }
-      String soapURI = FragmentConstants.URI_SOAP;
-      String soapPrefix = getPrefixFromNamespaceURI(soapURI, namespaceTable);
-      String soapEncArrayTypeURI = getXSDTypeDefinition().getTargetNamespace();
-      String soapEncArrayTypePrefix = getPrefixFromNamespaceURI(soapEncArrayTypeURI, namespaceTable);
-      // Set the arrayType attribute
-      attrName.setLength(0);
-      attrName.setLength(0);
-      attrName.append(soapPrefix);
-      attrName.append(FragmentConstants.COLON);
-      attrName.append(FragmentConstants.SOAP_ENC_ARRAY_TYPE);
-      attrValue.setLength(0);
-      attrValue.append(soapEncArrayTypePrefix);
-      attrValue.append(FragmentConstants.COLON);
-      attrValue.append(getXSDTypeDefinition().getName());
-      attrValue.append(FragmentConstants.LEFT_SQUARE_BRACKET);
-      attrValue.append(numInstances);
-      attrValue.append(FragmentConstants.RIGHT_SQUARE_BRACKET);
-      instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
-    }
-    if (genXSIType)
-    {
-//	  TODO: Used to call the plugin's ignoreSchemaForSOAPArrays()method.
-	  boolean ignoreSchemaForSOAPArrays = true;
-      if (ignoreSchemaForSOAPArrays)
-      {
-        for (int i = 0; i < instanceDocument.length; i++)
-        {
-          String xsiURI = FragmentConstants.URI_XSI;
-          String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
-          String xsiTypeURI = FragmentConstants.URI_SOAP;
-          String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
-          attrName.setLength(0);
-          attrName.append(xsiPrefix).append(FragmentConstants.COLON).append(FragmentConstants.XSI_TYPE);
-          attrValue.setLength(0);
-          attrValue.append(xsiTypePrefix).append(FragmentConstants.COLON);
-          attrValue.append(FragmentConstants.QNAME_LOCAL_NAME_ARRAY);
-          instanceDocument[i].setAttribute(attrName.toString(), attrValue.toString());
-        }
-      }
-      else
-        return addXSIType(instanceDocument, namespaceTable);
-    }
-    return instanceDocument;
-  }
-
-  public String createSOAPEncArrayInstance()
-  {
-    if (getXSDTypeDefinition() != null)
-    {
-      String groupID = genID();
-      String[] groupMemberID = {genID()};
-      int minOccurs = 0;
-      int maxOccurs = FragmentConstants.UNBOUNDED;
-      XSDElementDeclaration elementDecl = null;
-      if (getXSDModelGroup() != null)
-      {
-        XSDParticle groupOwner = (XSDParticle)getXSDModelGroup().getContainer();
-        int groupMin = groupOwner.getMinOccurs();
-        int groupMax = groupOwner.getMaxOccurs();
-        int elementMin = 0;
-        int elementMax = FragmentConstants.UNBOUNDED;
-        EList xsdParticles = getXSDModelGroup().getParticles();
-        if (xsdParticles.size() > 0)
-        {
-          XSDParticleContent xsdParticleContent = ((XSDParticle)xsdParticles.get(0)).getContent();
-          if (xsdParticleContent instanceof XSDElementDeclaration)
-          {
-            elementDecl = (XSDElementDeclaration)xsdParticleContent;
-            XSDParticle elementOwner = (XSDParticle)elementDecl.getContainer();
-            elementMin = elementOwner.getMinOccurs();
-            elementMax = elementOwner.getMaxOccurs();
-          }
-        }
-        if (groupMin >= 0 && elementMin >= 0)
-          minOccurs = groupMin * elementMin;
-        if (groupMax >= 0 && groupMax != FragmentConstants.UNBOUNDED && elementMax >= 0 && elementMax != FragmentConstants.UNBOUNDED)
-          maxOccurs = groupMax * elementMax;
-      }
-      XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-      XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-      xsdConfig.setXSDComponent(getXSDTypeDefinition());
-      xsdConfig.setMinOccurs(minOccurs);
-      xsdConfig.setMaxOccurs(maxOccurs);
-      xsdConfig.setStyle(thisConfig.getStyle());
-      xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-      xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-      String name = (elementDecl != null) ? elementDecl.getName() : getXSDTypeDefinition().getName();
-      IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, groupMemberID[0], name);
-      addFragment(groupMemberID[0], frag);
-      setGroupMemberIDs(groupID, groupMemberID);
-      return groupID;
-    }
-    else
-      return null;
-  }
-
-  public String createGroupSeqInstance()
-  {
-    return createSOAPEncArrayInstance();
-  }
-
-  public String createInstance()
-  {
-    return createSOAPEncArrayInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
deleted file mode 100644
index f177ee62b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncArrayRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class SOAPEncArrayRangeFragment extends SOAPEncArrayFragment {
-  public SOAPEncArrayRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
deleted file mode 100644
index 66d20de75..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/SOAPEncodingWrapperFragment.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.ISOAPEncodingWrapperFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-import org.w3c.dom.*;
-import java.util.Vector;
-import java.util.Hashtable;
-
-public class SOAPEncodingWrapperFragment extends XSDDelegationFragment implements ISOAPEncodingWrapperFragment
-{
-  private static final String ID = "id";
-  private static final String HREF = "href";
-  private static final String POUND = "#";
-
-  private Hashtable uriReferenceTable_;
-
-  public SOAPEncodingWrapperFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name, null);
-    uriReferenceTable_ = null;
-  }
-
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
-  {
-    getXSDDelegationFragment().setXSDToFragmentConfiguration(config);
-  }
-
-  public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
-  {
-    return getXSDDelegationFragment().getXSDToFragmentConfiguration();
-  }
-
-  public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
-  {
-    getXSDDelegationFragment().setXSDTypeDefinition(typeDef);
-  }
-
-  public XSDTypeDefinition getXSDTypeDefinition()
-  {
-    return getXSDDelegationFragment().getXSDTypeDefinition();
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    for (int i = 0; i < instanceDocuments.length; i++)
-      instanceDocuments[i] = resolveURIReferences(uriReferenceTable_, instanceDocuments[i]);
-    return getXSDDelegationFragment().setParameterValuesFromInstanceDocuments(instanceDocuments);
-  }
-
-  public void setURIReferences(Hashtable uriReferences)
-  {
-    uriReferenceTable_ = uriReferences;
-  }
-
-  public static Hashtable parseURIReferences(Element element, boolean overwrites)
-  {
-    Hashtable uriReferences = new Hashtable();
-    parseURIReferences(uriReferences, element, overwrites);
-    return uriReferences;
-  }
-
-  private static boolean parseURIReferences(Hashtable uriReferences, Element element, boolean overwrites)
-  {
-    boolean resolved = true;
-    if (element != null)
-    {
-      URIReference ref = null;
-      String id = element.getAttribute(ID);
-      resolved = !element.hasAttribute(HREF);
-      if (id != null && id.length() > 0 && (overwrites || !uriReferences.contains(id)))
-      {
-        ref = new URIReference(element, true);
-        uriReferences.put(id, ref);
-      }
-      NodeList nl = element.getChildNodes();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        Node node = nl.item(i);
-        if (node instanceof Element)
-          resolved = parseURIReferences(uriReferences, (Element)node, overwrites) && resolved;
-      }
-      if (ref != null)
-        ref.setResolved(resolved);
-    }
-    return resolved;
-  }
-
-  public static Element resolveURIReferences(Hashtable uriReferences, Element element)
-  {
-    if (uriReferences != null && !uriReferences.isEmpty())
-      return resolveURIReferences(uriReferences, element.getOwnerDocument(), element, new Vector());
-    else
-      return element;
-  }
-
-  private static Element resolveURIReferences(Hashtable uriReferences, Document doc, Element element, Vector usedIds)
-  {
-    String href = element.getAttribute(HREF);
-    Element resolvedElement = element;
-    boolean resolved = false;
-    if (href != null && href.length() > 0)
-    {
-      URIReference ref = null;
-      if (href.indexOf(POUND) != -1)
-        href = href.substring(1, href.length());
-      if (!usedIds.contains(href))
-      {
-        ref = (URIReference)uriReferences.get(href);
-        if (ref != null)
-        {
-          usedIds.add(href);
-          Element elementRef = ref.getRefElement();
-          resolved = ref.getResolved();
-          resolvedElement = doc.createElement(element.getTagName());
-          NodeList nl = elementRef.getChildNodes();
-          for (int i = 0; i < nl.getLength(); i++)
-          {
-            Node node = nl.item(i);
-            if (node != null)
-              resolvedElement.appendChild(doc.importNode(node, true));
-          }
-        }
-      }
-    }
-    if (!resolved)
-    {
-      NodeList nl = resolvedElement.getChildNodes();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        Node node = nl.item(i);
-        if (node instanceof Element)
-        {
-          Element child = resolveURIReferences(uriReferences, resolvedElement.getOwnerDocument(), (Element)node, usedIds);
-		  if (child != node)
-            resolvedElement.replaceChild(child, node);
-        }
-      }
-    }
-    if (href != null)
-      usedIds.remove(href);
-    return resolvedElement;
-  }
-
-  private static class URIReference
-  {
-    private Element ref_;
-    private boolean resolved_;
-
-    public URIReference(Element ref, boolean resolved)
-    {
-      ref_ = ref;
-      resolved_ = resolved;
-    }
-
-    public Element getRefElement()
-    {
-      return ref_;
-    }
-
-    public void setRefElement(Element ref)
-    {
-      ref_ = ref;
-    }
-
-    public boolean getResolved()
-    {
-      return resolved_;
-    }
-
-    public void setResolved(boolean resolved)
-    {
-      resolved_ = resolved;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
deleted file mode 100644
index 9b3fd0941..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFixFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexFixFragment extends XSDComplexFragment {
-  public XSDComplexFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
deleted file mode 100644
index 0d12f82ff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexFragment.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDComplexFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.XSDTypeDefinitionUtil;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDComplexFinal;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.List;
-
-public abstract class XSDComplexFragment extends XSDMapFragment implements IXSDComplexFragment
-{
-  public XSDComplexFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
-  {
-    super(id, name, config, controller);
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    if (complexTypeContent instanceof XSDTypeDefinition)
-      return setParamsForXSDTypeDef(instanceDocumentsCopy) && paramsValid;
-    else
-      return setParamsForXSDParticle(instanceDocumentsCopy) && paramsValid;
-  }
-
-  private boolean setParamsForXSDTypeDef(Element[] instanceDocuments)
-  {
-    boolean paramsValid = true;
-    removeAllFragments();
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      IXSDFragment childFrag = getFragment(createInstance());
-      Element[] childInstanceDocuments = new Element[1];
-      childInstanceDocuments[0] = instanceDocuments[i];
-      if (!childFrag.setParameterValuesFromInstanceDocuments(setElementsTagName(childInstanceDocuments, childFrag.getName())))
-        paramsValid = false;
-    }
-    return paramsValid;
-  }
-
-  private boolean setParamsForXSDParticle(Element[] instanceDocuments)
-  {
-    boolean paramsValid = true;
-    removeAllFragments();
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      IXSDFragment childFrag = getFragment(createInstance());
-      Vector instancesVector = new Vector();
-      NodeList nl = instanceDocuments[i].getChildNodes();
-      for (int j = 0; j < nl.getLength(); j++)
-      {
-        Node node = nl.item(j);
-        if (node instanceof Element)
-          instancesVector.add(node);
-        else
-          paramsValid = false;
-      }
-      Element[] childInstanceDocuments = new Element[instancesVector.size()];
-      instancesVector.copyInto(childInstanceDocuments);
-      if (!childFrag.setParameterValuesFromInstanceDocuments(childInstanceDocuments))
-        paramsValid = false;
-    }
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    Element[] instanceDocuments;
-    String tagName = getInstanceDocumentTagName(namespaceTable);
-    if (complexTypeContent instanceof XSDTypeDefinition)
-      instanceDocuments = genInstancesForXSDTypeDef(genXSIType, namespaceTable, tagName, doc);
-    else
-      instanceDocuments = genInstancesForXSDParticle(genXSIType, namespaceTable, tagName, doc);
-    return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-  }
-
-  private Element[] genInstancesForXSDTypeDef(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
-  {
-    IXSDFragment[] fragments = getAllFragments();
-    Vector instanceDocumentsCopy = new Vector();
-    for (int i = 0; i < fragments.length; i++)
-    {
-      Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      if (fragmentInstances.length > 0)
-        instanceDocumentsCopy.add(fragmentInstances[0]);
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
-    }
-    return setElementsTagName(instanceDocuments, tagName);
-  }
-
-  private Element[] genInstancesForXSDParticle(boolean genXSIType, Hashtable namespaceTable, String tagName, Document doc)
-  {
-    IXSDFragment[] childFrags = getAllFragments();
-    Element[] instanceDocuments = new Element[childFrags.length];
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      Element[] childInstances = childFrags[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      Element instanceDocument = doc.createElement(tagName);
-      for (int j = 0; j < childInstances.length; j++)
-      {
-        if (childInstances[j] != null)
-          instanceDocument.appendChild(childInstances[j]);
-      }
-      instanceDocuments[i] = instanceDocument;
-    }
-    return instanceDocuments;
-  }
-
-  private XSDModelGroup getXSDModelGroup(XSDParticle xsdParticle)
-  {
-    if (xsdParticle != null)
-    {
-      XSDParticleContent xsdParticleContent = xsdParticle.getContent();
-      if (xsdParticleContent != null)
-      {
-        if (xsdParticleContent instanceof XSDModelGroupDefinition)
-        {
-          XSDModelGroupDefinition xsdModelGroupDef = (XSDModelGroupDefinition)xsdParticleContent;
-          if (xsdModelGroupDef.isModelGroupDefinitionReference())
-            xsdModelGroupDef = xsdModelGroupDef.getResolvedModelGroupDefinition();
-          return xsdModelGroupDef.getModelGroup();
-        }
-        else if (xsdParticleContent instanceof XSDModelGroup)
-          return (XSDModelGroup)xsdParticleContent;
-      }
-    }
-    return null;
-  }
-
-  private List getInheritedParticles(XSDComplexTypeDefinition complexType)
-  {
-    Vector v = new Vector();
-    if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
-    {
-      XSDTypeDefinition extType = complexType.getBaseType();
-      if (extType != null && !(extType instanceof XSDComplexTypeDefinition))
-      {
-        String namespace = extType.getTargetNamespace();
-        String localname = extType.getName();
-        if (namespace != null && localname != null)
-        {
-          XSDNamedComponent xsdNamedComp = getXSDToFragmentController().getWSDLPartsToXSDTypeMapper().getXSDTypeFromSchema(namespace, localname, false);
-          if (xsdNamedComp instanceof XSDComplexTypeDefinition)
-          {
-            extType = (XSDComplexTypeDefinition)xsdNamedComp;
-          }
-        }
-      }
-      if (extType != null && extType != complexType && extType instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeContent extTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent((XSDComplexTypeDefinition)extType);
-        if (extTypeContent instanceof XSDParticle)
-        {
-          XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)extTypeContent);
-          if (xsdModelGroup != null)
-          {
-            v.addAll(getInheritedParticles((XSDComplexTypeDefinition)extType));
-            v.addAll(xsdModelGroup.getParticles());
-          }
-        }
-      }
-    }
-    return v;
-  }
-
-  private void gatherInheritedParticles(XSDComplexTypeDefinition complexType)
-  {
-    if (complexType.getDerivationMethod().getValue() == XSDComplexFinal.EXTENSION)
-    {
-      XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-      if (complexTypeContent instanceof XSDParticle)
-      {
-        XSDModelGroup xsdModelGroup = getXSDModelGroup((XSDParticle)complexTypeContent);
-        if (xsdModelGroup != null)
-        {
-          List inheritedParticles = getInheritedParticles(complexType);
-          List particles = xsdModelGroup.getParticles();
-          particles.addAll(0, inheritedParticles);
-        }
-      }
-    }
-  }
-
-  public String createComplexInstance()
-  {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition)getXSDTypeDefinition();
-    gatherInheritedParticles(complexType);
-    XSDComplexTypeContent complexTypeContent = XSDTypeDefinitionUtil.getXSDComplexTypeContent(complexType);
-    XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-    XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-    xsdConfig.setXSDComponent(complexTypeContent);
-    xsdConfig.setStyle(thisConfig.getStyle());
-    xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-    xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-    String newID = genID();
-    addFragment(newID, getXSDToFragmentController().getFragment(xsdConfig, newID, newID));
-    return newID;
-  }
-
-  public String createInstance()
-  {
-    return createComplexInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
deleted file mode 100644
index c3453ce18..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDComplexRangeFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDComplexRangeFragment extends XSDComplexFragment {
-  public XSDComplexRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDComplexRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
deleted file mode 100644
index 981aca99f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDefaultFragment.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.util.Vector;
-import java.util.Hashtable;
-
-public class XSDDefaultFragment extends XSDFragment {
-  public XSDDefaultFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String[] param = new String[1];
-    param[0] = parser.getParameter(getID());
-    setParameterValues(getID(), param);
-    return isElement(addRootElement(param[0]));
-  }
-
-  private String addRootElement(String element) {
-    StringBuffer sb = new StringBuffer();
-    sb.append(FragmentConstants.ROOT_ELEMENT_START_TAG);
-    sb.append(element);
-    sb.append(FragmentConstants.ROOT_ELEMENT_END_TAG);
-    return sb.toString();
-  }
-
-  private boolean isElement(String elementString) {
-    try {
-      return (XMLUtils.stringToElement(elementString) != null);
-    }
-    catch (Throwable t) {
-      return false;
-    }
-  }
-
-  public boolean validateAllParameterValues() {
-    String param = getParameterValue(getID(), 0);
-    return (param == null || isElement(addRootElement(param)));
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    String param = getParameterValue(getID(), 0);
-    return (param == null || isElement(addRootElement(param)));
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    String param = getParameterValue(getID(), 0);
-    return (param == null || isElement(addRootElement(param)));
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    StringBuffer sb = new StringBuffer();
-    boolean paramValid = true;
-    for (int i = 0; i < instanceDocuments.length; i++) {
-      String instanceString = XMLUtils.serialize(instanceDocuments[i], true);
-      if (instanceString != null && instanceString.length() > 0)
-        sb.append(instanceString);
-      else
-        paramValid = false;
-    }
-    String[] param = {sb.toString()};
-    setParameterValues(getID(), param);
-    return paramValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    String param = getParameterValue(getID(), 0);
-    if (param == null)
-      return new Element[0];
-    Element root;
-    try {
-      root = (Element)doc.importNode(XMLUtils.stringToElement(addRootElement(param)), true);
-    }
-    catch (Throwable t) {
-      return new Element[0];
-    }
-    NodeList nl = root.getChildNodes();
-    Vector instanceDocumentVector = new Vector();
-    for (int i = 0; i < nl.getLength(); i++) {
-      Node node = nl.item(i);
-      if (node instanceof Element)
-        instanceDocumentVector.add(node);
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentVector.size()];
-    for (int i = 0; i < instanceDocuments.length; i++) {
-      instanceDocuments[i] = (Element)instanceDocumentVector.get(i);
-    }
-    return instanceDocuments;
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDDefaultRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDDefaultWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
deleted file mode 100644
index dc03c29e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDDelegationFragment.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDDelegationFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import java.util.Vector;
-import java.util.Hashtable;
-
-public class XSDDelegationFragment extends XSDFragment implements IXSDDelegationFragment
-{
-  private IXSDFragment xsdFragment_;
-
-  public XSDDelegationFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name, config);
-    xsdFragment_ = null;
-  }
-
-  public void setName(String name) {
-    super.setName(name);
-    if (xsdFragment_ != null)
-      xsdFragment_.setName(name);
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    return xsdFragment_.processParameterValues(parser);
-  }
-
-  public void setParameterValues(String paramKey, String[] params)
-  {
-    xsdFragment_.setParameterValues(paramKey, params);
-  }
-
-  public void setParameterValues(String paramKey, Vector params)
-  {
-    xsdFragment_.setParameterValues(paramKey, params);
-  }
-
-  public String[] getParameterValues(String paramKey)
-  {
-    return xsdFragment_.getParameterValues(paramKey);
-  }
-
-  public String getParameterValue(String paramKey, int paramIndex)
-  {
-    return xsdFragment_.getParameterValue(paramKey, paramIndex);
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    return xsdFragment_.validateAllParameterValues();
-  }
-
-  public boolean validateParameterValues(String paramKey)
-  {
-    return xsdFragment_.validateParameterValues(paramKey);
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex)
-  {
-    return xsdFragment_.validateParameterValue(paramKey, paramIndex);
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    return xsdFragment_.setParameterValuesFromInstanceDocuments(instanceDocuments);
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    return xsdFragment_.genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-  }
-
-  public String getInformationFragment()
-  {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment()
-  {
-    return "/wsdl/fragment/XSDDelegationRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment()
-  {
-    return "/wsdl/fragment/XSDDelegationWFragmentJSP.jsp";
-  }
-
-  public void setXSDDelegationFragment(IXSDFragment xsdFragment)
-  {
-    xsdFragment_ = xsdFragment;
-  }
-
-  public IXSDFragment getXSDDelegationFragment()
-  {
-    return xsdFragment_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
deleted file mode 100644
index 1baaff75d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDElementFragment.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDElementFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDForm;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.util.Vector;
-import java.util.Hashtable;
-
-public class XSDElementFragment extends XSDDelegationFragment implements IXSDElementFragment
-{
-  private int minOccurs_;
-  private int maxOccurs_;
-
-  public XSDElementFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name, config);
-    if (config != null)
-    {
-      minOccurs_ = config.getMinOccurs();
-      maxOccurs_ = config.getMaxOccurs();
-    }
-    else
-    {
-      minOccurs_ = FragmentConstants.DEFAULT_MIN_OCCURS;
-      maxOccurs_ = FragmentConstants.DEFAULT_MAX_OCCURS;
-    }
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    IXSDFragment elementTypeFragment = getXSDDelegationFragment();
-    if (!elementTypeFragment.processParameterValues(parser))
-      return false;
-    String[] params = getParameterValues(elementTypeFragment.getID());
-    if (params != null && !withinRange(params.length))
-      return false;
-    return true;
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    IXSDFragment elementTypeFragment = getXSDDelegationFragment();
-    String[] params = getParameterValues(elementTypeFragment.getID());
-    if (params != null && !withinRange(params.length))
-      return false;
-    if (!elementTypeFragment.validateAllParameterValues())
-      return false;
-    return true;
-  }
-
-  public boolean validateParameterValues(String paramKey)
-  {
-    String[] params = getParameterValues(paramKey);
-    if (params != null && !withinRange(params.length))
-      return false;
-    if (!getXSDDelegationFragment().validateParameterValues(paramKey))
-      return false;
-    return true;
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex)
-  {
-    if (!withinRange(paramIndex + 1))
-      return false;
-    XSDElementDeclaration xsdElement = (XSDElementDeclaration)getXSDToFragmentConfiguration().getXSDComponent();
-    String param = getParameterValue(paramKey, paramIndex);
-    if (param != null && param.length() <= 0 && !xsdElement.isNillable())
-      return false;
-    if (!getXSDDelegationFragment().validateParameterValue(paramKey, paramIndex))
-      return false;
-    return true;
-  }
-
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
-  {
-    super.setXSDToFragmentConfiguration(config);
-    minOccurs_ = config.getMinOccurs();
-    maxOccurs_ = config.getMaxOccurs();
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = instanceDocuments;
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    String wsdlPartName = config.getWSDLPartName();
-    if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0 && instanceDocumentsCopy.length == 1 && wsdlPartName.equals(instanceDocumentsCopy[0].getTagName()))
-    {
-      NodeList nl = instanceDocumentsCopy[0].getChildNodes();
-      Vector childElements = new Vector();
-      for (int i = 0; i < nl.getLength(); i++)
-      {
-        Node node = nl.item(i);
-        if (node.getNodeType() == Node.ELEMENT_NODE)
-          childElements.add(node);
-      }
-      instanceDocumentsCopy = (Element[])childElements.toArray(new Element[0]);
-    }
-    IXSDFragment elementTypeFragment = getXSDDelegationFragment();
-    instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocumentsCopy, getName());
-    return elementTypeFragment.setParameterValuesFromInstanceDocuments(setElementsTagName(instanceDocumentsCopy, elementTypeFragment.getName()));
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    Element[] instanceDocuments = getXSDDelegationFragment().genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-    instanceDocuments = setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    String wsdlPartName = config.getWSDLPartName();
-    if (config.getIsWSDLPart() && config.getStyle() == FragmentConstants.STYLE_RPC && wsdlPartName != null && wsdlPartName.length() > 0)
-    {
-      Element[] instanceDocumentsCopy = instanceDocuments;
-      instanceDocuments = new Element[1];
-      instanceDocuments[0] = doc.createElement(wsdlPartName);
-      for (int i = 0; i < instanceDocumentsCopy.length; i++)
-      {
-        if (instanceDocumentsCopy[i] != null)
-          instanceDocuments[0].appendChild(instanceDocumentsCopy[i]);
-      }
-    }
-    return instanceDocuments;
-  }
-
-  protected boolean isInstanceNamespaceQualified()
-  {
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    if (config.getPartEncoding() == FragmentConstants.ENCODING_LITERAL)
-    {
-      XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
-      if (xsdElement.isGlobal())
-        return true;
-      else
-      {
-        if (xsdElement.isSetForm())
-          return (xsdElement.getForm().getValue() == XSDForm.QUALIFIED);
-        else
-          return (xsdElement.getSchema().getElementFormDefault().getValue() == XSDForm.QUALIFIED);
-      }
-    }
-    else
-      return false;
-  }
-
-  protected String getInstanceDocumentTagName(Hashtable namespaceTable)
-  {
-    XSDToFragmentConfiguration config = getXSDToFragmentConfiguration();
-    XSDElementDeclaration xsdElement = (XSDElementDeclaration)config.getXSDComponent();
-    StringBuffer tagName = new StringBuffer();
-    if (isInstanceNamespaceQualified())
-    {
-      String nsURI = null;
-      // port to org.eclipse.xsd
-      if (xsdElement.getResolvedElementDeclaration() != null)
-        nsURI = xsdElement.getResolvedElementDeclaration().getTargetNamespace();
-      else
-        nsURI = xsdElement.getTargetNamespace();
-      if (nsURI != null && nsURI.length() > 0)
-      {
-        String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
-        tagName.append(prefix);
-        tagName.append(FragmentConstants.COLON);
-      }
-    }
-    String xsdElementName = xsdElement.getName();
-    if (xsdElementName == null || xsdElementName.length() <= 0)
-    {
-      // port to org.eclipse.xsd
-      if (xsdElement.getResolvedElementDeclaration() != null)
-        xsdElementName = xsdElement.getResolvedElementDeclaration().getName();
-      else
-        xsdElementName = getName();
-    }
-    tagName.append(xsdElementName);
-    return tagName.toString();
-  }
-
-  private boolean withinRange(int size)
-  {
-    if (size < minOccurs_)
-      return false;
-    if (maxOccurs_ != FragmentConstants.UNBOUNDED && size > maxOccurs_)
-      return false;
-    return true;
-  }
-
-  public void setMinOccurs(int minOccurs)
-  {
-    minOccurs_ = minOccurs;
-  }
-
-  public int getMinOccurs()
-  {
-    return minOccurs_;
-  }
-
-  public void setMaxOccurs(int maxOccurs)
-  {
-    maxOccurs_ = maxOccurs;
-  }
-
-  public int getMaxOccurs()
-  {
-    return maxOccurs_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
deleted file mode 100644
index 0f164220e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDEmptyFragment.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.util.Vector;
-
-public class XSDEmptyFragment extends XSDFragment {
-  private int occurance_;
-
-  public XSDEmptyFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-    occurance_ = 0;
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String occurance = parser.getParameter(getID());
-    try {
-      occurance_ = Integer.parseInt(occurance);
-      return validateAllParameterValues();
-    }
-    catch (Throwable t) {
-      occurance_ = -1;
-      return false;
-    }
-  }
-
-  public void setParameterValues(String paramKey, String[] params) {
-  }
-
-  public void setParameterValues(String paramKey, Vector params) {
-  }
-
-  public String[] getParameterValues(String paramKey) {
-    if (occurance_ < 0)
-      return null;
-    else {
-      String[] params = new String[occurance_];
-      for (int i = 0; i < params.length; i++) {
-        params[i] = "";
-      }
-      return params;
-    }
-  }
-
-  public String getParameterValue(String paramKey, int paramIndex) {
-    if (paramIndex >= 0 && paramIndex < occurance_)
-      return "";
-    else
-      return null;
-  }
-
-  public boolean validateAllParameterValues() {
-    XSDToFragmentConfiguration xsdConfig = getXSDToFragmentConfiguration();
-    int min = xsdConfig.getMinOccurs();
-    int max = xsdConfig.getMaxOccurs();
-    return (occurance_ >= 0 && occurance_ >= min && (max == FragmentConstants.UNBOUNDED || occurance_ <= max));
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    return validateAllParameterValues();
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    return validateAllParameterValues();
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    boolean paramsValid = true;
-    for (int i = 0; i < instanceDocumentsCopy.length; i++) {
-      NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
-      if (nodeList.getLength() > 1)
-        paramsValid = false;
-      else if (nodeList.getLength() != 0) {
-        Node node = nodeList.item(0);
-        if (node.getNodeType() != Node.TEXT_NODE || !isWhitespace(node.getNodeValue()))
-          paramsValid = false;
-      }
-    }
-    occurance_ = instanceDocumentsCopy.length;
-    return paramsValid && validateAllParameterValues();
-  }
-
-  private boolean isWhitespace(String s) {
-    char[] chars = s.toCharArray();
-    for (int i = 0; i < chars.length; i++) {
-      if (!Character.isWhitespace(chars[i]) || !Character.isSpaceChar(chars[i]))
-        return false;
-    }
-    return true;
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDEmptyWFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDEmptyRFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
deleted file mode 100644
index ecdda4a49..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDFragment.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDForm;
-import java.util.Vector;
-import java.util.Hashtable;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Attr;
-
-public abstract class XSDFragment extends Fragment implements IXSDFragment
-{
-  private XSDToFragmentConfiguration config_;
-  private XSDTypeDefinition typeDef_;
-  private int seed_;
-
-  public XSDFragment(String id, String name, XSDToFragmentConfiguration config)
-  {
-    super(id, name);
-    config_ = config;
-    if (config_ != null)
-    {
-      XSDComponent component = config.getXSDComponent();
-      if (component instanceof XSDTypeDefinition)
-        typeDef_ = (XSDTypeDefinition)component;
-      else
-        typeDef_ = null;
-    }
-    seed_ = 0;
-  }
-
-  public void setXSDToFragmentConfiguration(XSDToFragmentConfiguration config)
-  {
-    config_ = config;
-    if (config_ != null)
-    {
-      XSDComponent component = config.getXSDComponent();
-      if (component instanceof XSDTypeDefinition)
-        setXSDTypeDefinition((XSDTypeDefinition)component);
-    }
-  }
-
-  public XSDToFragmentConfiguration getXSDToFragmentConfiguration()
-  {
-    return config_;
-  }
-
-  public void setXSDTypeDefinition(XSDTypeDefinition typeDef)
-  {
-    typeDef_ = typeDef;
-  }
-
-  public XSDTypeDefinition getXSDTypeDefinition()
-  {
-    return typeDef_;
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    String[] params = new String[instanceDocumentsCopy.length];
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    for (int i = 0; i < instanceDocumentsCopy.length; i++)
-    {
-      params[i] = "";
-      NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
-      if (nodeList.getLength() > 0)
-      {
-        Node node = nodeList.item(0);
-        if (nodeList.getLength() > 1)
-          paramsValid = false;
-        if (node.getNodeType() != Node.TEXT_NODE)
-          paramsValid = false;
-        else
-          params[i] = node.getNodeValue();
-      }
-      else
-        paramsValid = false;
-    }
-    setParameterValues(getID(), params);
-    return paramsValid && validateAllParameterValues();
-  }
-
-  protected Element[] getInstanceDocumentsByTagName(Element[] instanceDocuments, String tagName)
-  {
-    if (instanceDocuments == null)
-      return new Element[0];
-    Vector instancesCopy = new Vector();
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      if (instanceDocuments[i] == null)
-        continue;
-      String instanceTagName = trimPrefix(instanceDocuments[i].getTagName());
-      if (instanceTagName.equals(tagName))
-        instancesCopy.add(instanceDocuments[i]);
-    }
-    Element[] instances = new Element[instancesCopy.size()];
-    instancesCopy.copyInto(instances);
-    return instances;
-  }
-
-  protected String trimPrefix(String s)
-  {
-    String sCopy = new String(s);
-    int colonIndex = sCopy.indexOf(FragmentConstants.COLON);
-    if (colonIndex != -1 && colonIndex + 1 < sCopy.length() && !((String.valueOf(sCopy.charAt(colonIndex + 1))).equals(FragmentConstants.COLON)))
-      sCopy = sCopy.substring(colonIndex + 1, sCopy.length());
-    return sCopy;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    String[] params = getParameterValues(getID());
-    if (params == null)
-      return new Element[0];
-    Element[] instanceDocuments = new Element[params.length];
-    String tagName = getInstanceDocumentTagName(namespaceTable);
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      Element instanceDocument = doc.createElement(tagName);
-      Node textNode = doc.createTextNode(params[i]);
-      instanceDocument.appendChild(textNode);
-      instanceDocuments[i] = instanceDocument;
-    }
-    return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-  }
-
-  public String genID()
-  {
-    StringBuffer newID = new StringBuffer();
-    newID.append(getID());
-    newID.append(FragmentConstants.ID_SEPERATOR);
-    newID.append(seed_++);
-    return newID.toString();
-  }
-
-  protected boolean isInstanceNamespaceQualified()
-  {
-    XSDSchema xsdSchema = config_.getXSDComponent().getSchema();
-    return (!config_.getIsWSDLPart() && config_.getPartEncoding() == FragmentConstants.ENCODING_LITERAL && xsdSchema.getElementFormDefault().getValue() == XSDForm.QUALIFIED);
-  }
-
-  protected String getInstanceDocumentTagName(Hashtable namespaceTable)
-  {
-    StringBuffer tagName = new StringBuffer();
-    if (isInstanceNamespaceQualified())
-    {
-      String nsURI = config_.getXSDComponent().getSchema().getTargetNamespace();
-      String prefix = getPrefixFromNamespaceURI(nsURI, namespaceTable);
-      tagName.append(prefix);
-      tagName.append(FragmentConstants.COLON);
-    }
-    tagName.append(getName());
-    return tagName.toString();
-  }
-
-  protected Element[] addXSIType(Element[] instanceDocuments, Hashtable namespaceTable)
-  {
-    XSDComponent xsdComponent = config_.getXSDComponent();
-    if (instanceDocuments != null && (xsdComponent instanceof XSDNamedComponent))
-    {
-      String xsdComponentName = ((XSDNamedComponent)xsdComponent).getName();
-      if (xsdComponentName != null && xsdComponentName.length() > 0)
-      {
-        for (int i = 0; i < instanceDocuments.length; i++)
-        {
-          if (instanceDocuments[i] == null)
-            continue;
-          String xsiURI = FragmentConstants.URI_XSI;
-          String xsiPrefix = getPrefixFromNamespaceURI(xsiURI, namespaceTable);
-          String xsiTypeURI = xsdComponent.getSchema().getTargetNamespace();
-          String xsiTypePrefix = getPrefixFromNamespaceURI(xsiTypeURI, namespaceTable);
-          ;
-          StringBuffer attrName = new StringBuffer();
-          attrName.append(xsiPrefix);
-          attrName.append(FragmentConstants.COLON);
-          attrName.append(FragmentConstants.XSI_TYPE);
-          StringBuffer attrValue = new StringBuffer();
-          attrValue.append(xsiTypePrefix);
-          attrValue.append(FragmentConstants.COLON);
-          attrValue.append(xsdComponentName);
-          instanceDocuments[i].setAttribute(attrName.toString(), attrValue.toString());
-        }
-      }
-    }
-    return instanceDocuments;
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    if (!super.validateAllParameterValues())
-      return false;
-    String[] params = getParameterValues(getID());
-    int length = (params != null) ? params.length : 0;
-    int min = config_.getMinOccurs();
-    int max = config_.getMaxOccurs();
-    return (length >= min && (max == FragmentConstants.UNBOUNDED || length <= max));
-  }
-
-  protected String getPrefixFromNamespaceURI(String nsURI, Hashtable namespaceTable)
-  {
-    String prefix = (String)namespaceTable.get(nsURI);
-    int i = 0;
-    while (prefix == null || prefix.length() <= 0)
-    {
-      StringBuffer prefixCopy = new StringBuffer();
-      prefixCopy.append(FragmentConstants.QNAME_PREFIX);
-      prefixCopy.append(String.valueOf(i));
-      i++;
-      if (!namespaceTable.contains(prefixCopy.toString()))
-      {
-        namespaceTable.put(nsURI, prefixCopy.toString());
-        prefix = prefixCopy.toString();
-      }
-    }
-    return prefix;
-  }
-
-  protected Element setElementTagName(Element e, String tagName)
-  {
-    if (!e.getTagName().equals(tagName))
-    {
-      try
-      {
-        Document doc = e.getOwnerDocument();
-        NodeList children = e.getChildNodes();
-        NamedNodeMap attributes = e.getAttributes();
-        Element eCopy = doc.createElement(tagName);
-        for (int i = 0; i < children.getLength(); i++)
-        {
-          Node child = children.item(i);
-          if (child != null)
-          {
-            eCopy.appendChild(child);
-            // When you append a node from one element to another,
-            // the original element will lose its reference to this node,
-            // therefore, the size of the node list will decrease by 1.
-            i--;
-          }
-        }
-        for (int j = 0; j < attributes.getLength(); j++)
-        {
-          Node attr = attributes.item(j);
-          if (attr != null && (attr instanceof Attr))
-          {
-            Attr attribute = (Attr)attr;
-            eCopy.setAttribute(attribute.getName(), attribute.getValue());
-          }
-        }
-        return eCopy;
-      }
-      catch (Exception exception)
-      {
-      }
-    }
-    return e;
-  }
-
-  protected Element[] setElementsTagName(Element[] e, String tagName)
-  {
-    Element[] eCopy = new Element[e.length];
-    for (int i = 0; i < eCopy.length; i++)
-    {
-      eCopy[i] = setElementTagName(e[i], tagName);
-    }
-    return eCopy;
-  }
-
-  protected boolean internalEquals(Element[] instanceDocumentsCopy, Element[] instanceDocuments)
-  {
-    if (!config_.getIsWSDLPart())
-    {
-      int length = (instanceDocuments != null) ? instanceDocuments.length : 0;
-      int lengthCopy = (instanceDocumentsCopy != null) ? instanceDocumentsCopy.length : 0;
-      return (length == lengthCopy);
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
deleted file mode 100644
index 414e3fe97..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupAllFragment.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupAllFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-import org.w3c.dom.Element;
-import java.util.Vector;
-
-public class XSDGroupAllFragment extends XSDGroupFragment implements IXSDGroupAllFragment {
-  private String groupID_;
-
-  public XSDGroupAllFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-    groupID_ = null;
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    String groupID = parser.getParameter(getID());
-    if (groupID_ != null && groupID != null && groupID_.equals(groupID)) {
-      setGroupMemberIDsOrdering(parser.getParameterValues(groupID_));
-      boolean valuesValid = true;
-      IXSDFragment[] groupMemberFragments = getGroupMemberFragments(groupID_);
-      for (int i = 0; i < groupMemberFragments.length; i++) {
-        if (groupMemberFragments[i] != null && !groupMemberFragments[i].processParameterValues(parser))
-          valuesValid = false;
-      }
-      return valuesValid;
-    }
-    else {
-      groupID_ = null;
-      removeGroupIDs();
-      return true;
-    }
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    removeGroupIDs();
-    boolean paramsValid = true;
-    if (instanceDocuments != null && instanceDocuments.length > 0) {
-      groupID_ = createInstance();
-      IXSDFragment[] groupMemberFrags = getGroupMemberFragments(groupID_);
-      String[] groupMemberIDsOrder = new String[groupMemberFrags.length];
-      int orderIndex = 0;
-      for (int i = 0; i < instanceDocuments.length; i++) {
-        boolean paramsAssigned = false;
-        for (int j = 0; j < groupMemberFrags.length; j++) {
-          if (groupMemberFrags[j] != null && groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
-            Element[] childInstance = {instanceDocuments[i]};
-            if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(childInstance))
-              paramsValid = false;
-            groupMemberIDsOrder[orderIndex] = groupMemberFrags[j].getID();
-            orderIndex++;
-            paramsAssigned = true;
-            groupMemberFrags[j] = null;
-            break;
-          }
-        }
-        if (!paramsAssigned)
-          paramsValid = false;
-      }
-      for (int k = 0; k < groupMemberFrags.length; k++) {
-        if (groupMemberFrags[k] != null) {
-          groupMemberIDsOrder[orderIndex] = groupMemberFrags[k].getID();
-          orderIndex++;
-        }
-      }
-      setGroupMemberIDsOrdering(groupMemberIDsOrder);
-    }
-    return paramsValid;
-  }
-
-  public String getGroupAllInstance() {
-    if (groupID_ == null)
-      groupID_ = createGroupInstance();
-    return groupID_;
-  }
-
-  public String createInstance() {
-    return getGroupAllInstance();
-  }
-
-  public boolean setGroupMemberIDsOrdering(String[] groupMemberIDs) {
-    if (groupMemberIDs == null)
-      return false;
-    String[] existingGroupMemberIDs = getGroupMemberIDs(groupID_);
-    if (existingGroupMemberIDs.length != groupMemberIDs.length)
-      return false;
-    Vector existingGroupMemberIDsVector = new Vector();
-    for (int i = 0; i < existingGroupMemberIDs.length; i++) {
-      existingGroupMemberIDsVector.add(existingGroupMemberIDs[i]);
-    }
-    for (int j = 0; j < groupMemberIDs.length; j++) {
-      if (!existingGroupMemberIDsVector.remove(groupMemberIDs[j]))
-        return false;
-    }
-    if (setFragmentsOrder(groupMemberIDs)) {
-      setGroupMemberIDs(groupID_, groupMemberIDs);
-      return true;
-    }
-    else
-      return false;
-  }
-
-  public boolean moveUpGroupMemberID(String groupMemberID) {
-    String[] groupMemberIDs = getGroupMemberIDs(groupID_);
-    if (groupMemberID.equals(groupMemberIDs[0]))
-      return false;
-    for (int i = 1; i < groupMemberIDs.length; i++) {
-      if (groupMemberID.equals(groupMemberIDs[i])) {
-        groupMemberIDs[i] = groupMemberIDs[i - 1];
-        groupMemberIDs[i - 1] = groupMemberID;
-        if (setFragmentsOrder(groupMemberIDs)) {
-          setGroupMemberIDs(groupID_, groupMemberIDs);
-          return true;
-        }
-        else
-          return false;
-      }
-    }
-    return false;
-  }
-
-  public boolean moveDownGroupMemberID(String groupMemberID) {
-    String[] groupMemberIDs = getGroupMemberIDs(groupID_);
-    if (groupMemberID.equals(groupMemberIDs[groupMemberIDs.length - 1]))
-      return false;
-    for (int i = 0; i < groupMemberIDs.length - 1; i++) {
-      if (groupMemberID.equals(groupMemberIDs[i])) {
-        groupMemberIDs[i] = groupMemberIDs[i + 1];
-        groupMemberIDs[i + 1] = groupMemberID;
-        if (setFragmentsOrder(groupMemberIDs)) {
-          setGroupMemberIDs(groupID_, groupMemberIDs);
-          return true;
-        }
-        else
-          return false;
-      }
-    }
-    return false;
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
deleted file mode 100644
index 4f6d724cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceFixFragment extends XSDGroupChoiceFragment {
-  public XSDGroupChoiceFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
deleted file mode 100644
index d755cf9e7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceFragment.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupChoiceFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDModelGroup;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public abstract class XSDGroupChoiceFragment extends XSDGroupFragment implements IXSDGroupChoiceFragment {
-  private XSDParticle[] choices_;
-  private Hashtable choiceIndexes_;
-
-  public XSDGroupChoiceFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-    choices_ = null;
-    choiceIndexes_ = new Hashtable();
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    super.processParameterValues(parser);
-    String[] groupIDs = getGroupIDs();
-    choiceIndexes_.clear();
-    boolean paramsValid = true;
-    for (int i = 0; i < groupIDs.length; i++) {
-      String selectedChoiceFragID = parser.getParameter(groupIDs[i]);
-      int choiceIndex = 0;
-      IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
-      for (int j = 0; j < choiceFrags.length; j++) {
-        if (choiceFrags[j].getID().equals(selectedChoiceFragID)) {
-          choiceIndex = j;
-          paramsValid = (paramsValid && choiceFrags[j].validateAllParameterValues());
-          break;
-        }
-      }
-      setChoiceIndex(groupIDs[i], choiceIndex);
-    }
-    return paramsValid;
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    removeGroupIDs();
-    choiceIndexes_.clear();
-    boolean paramsValid = true;
-    if (instanceDocuments != null) {
-      for (int i = 0; i < instanceDocuments.length; i++) {
-        String groupID = createGroupChoiceInstance(0);
-        IXSDFragment[] choiceFrags = getGroupMemberFragments(groupID);
-        for (int j = 0; j < choiceFrags.length; j++) {
-          if (choiceFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
-            XSDToFragmentConfiguration xsdConfig = choiceFrags[j].getXSDToFragmentConfiguration();
-            Element[] childInstances = getInstanceDocumentPartition(instanceDocuments, i, xsdConfig.getMinOccurs(), xsdConfig.getMaxOccurs());
-            if (!choiceFrags[j].setParameterValuesFromInstanceDocuments(childInstances))
-              paramsValid = false;
-            setChoiceIndex(groupID, j);
-            if (childInstances.length > 0)
-              i = i + childInstances.length - 1; // minus 1 because there's an i++ in the outer for loop
-            break;
-          }
-        }
-      }
-    }
-    return paramsValid;
-  }
-
-  private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int minSize, int maxSize) {
-    String tagName = instanceDocuments[start].getTagName();
-    int size = 1;
-    for (int i = start + 1; i < instanceDocuments.length; i++) {
-      if (instanceDocuments[i].getTagName().equals(tagName))
-        size++;
-      else
-        break;
-    }
-    if (maxSize != FragmentConstants.UNBOUNDED && size > maxSize) {
-      size = size - minSize;
-      if (size > maxSize)
-        size = maxSize;
-    }
-    Element[] subset = new Element[size];
-    for (int j = 0; j < subset.length; j++) {
-      subset[j] = instanceDocuments[start + j];
-    }
-    return subset;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    Vector instanceDocumentsCopy = new Vector();
-    String[] groupIDs = getGroupIDs();
-    for (int i = 0; i < groupIDs.length; i++) {
-      IXSDFragment[] choiceFrags = getGroupMemberFragments(groupIDs[i]);
-      int choiceIndex = getChoiceIndex(groupIDs[i]);
-      Element[] choiceFragInstances = choiceFrags[choiceIndex].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      for (int j = 0; j < choiceFragInstances.length; j++) {
-        instanceDocumentsCopy.add(choiceFragInstances[j]);
-      }
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    instanceDocumentsCopy.copyInto(instanceDocuments);
-    return instanceDocuments;
-  }
-
-  public XSDParticle[] getChoices() {
-    if (choices_ == null) {
-      EList particles = getXSDModelGroup().getParticles();
-      choices_ = new XSDParticle[particles.size()];
-      for (int i = 0; i < choices_.length; i++) {
-        choices_[i] = (XSDParticle)particles.get(i);
-      }
-    }
-    return choices_;
-  }
-
-  public String createGroupChoiceInstance(int choiceIndex) {
-    getChoices();
-    if (choiceIndex < 0 || choiceIndex > choices_.length - 1)
-      return null;
-    String groupID = createGroupInstance();
-    setChoiceIndex(groupID, choiceIndex);
-    return groupID;
-  }
-
-  public String createInstance() {
-    return createGroupChoiceInstance(0);
-  }
-
-  public int getChoiceIndex(String groupID) {
-    Integer index = (Integer)choiceIndexes_.get(groupID);
-    if (index != null)
-      return index.intValue();
-    else
-      return 0;
-  }
-
-  public void setChoiceIndex(String groupID, int choiceIndex) {
-    choiceIndexes_.put(groupID, new Integer(choiceIndex));
-  }
-
-  public boolean validateAllParameterValues()
-  {
-    String[] groupIDs = getGroupIDs();
-    for (int i = 0; i < groupIDs.length; i++)
-    {
-      int selectionIndex = getChoiceIndex(groupIDs[i]);
-      if (!getGroupMemberFragments(groupIDs[i])[selectionIndex].validateAllParameterValues())
-        return false;
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
deleted file mode 100644
index ca3bffb4c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupChoiceRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupChoiceRangeFragment extends XSDGroupChoiceFragment {
-  public XSDGroupChoiceRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
deleted file mode 100644
index 485716ed5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupFragment.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDParticleContent;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public abstract class XSDGroupFragment extends XSDMapFragment implements IXSDGroupFragment {
-  private XSDModelGroup xsdModelGroup_;
-  private Vector groupIDsOrder_;
-  private Hashtable groupIDs_;
-  
-  public XSDGroupFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller);
-    xsdModelGroup_ = xsdModelGroup;
-    groupIDsOrder_ = new Vector();
-    groupIDs_ = new Hashtable();
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    boolean valuesValid = true;
-    String[] params = parser.getParameterValues(getID());
-    Vector frags = new Vector();
-    Vector groupIDsOrderCopy = new Vector();
-    Hashtable groupIDsCopy = new Hashtable();
-    for (int i = 0; params != null && i < params.length; i++) {
-      if (params[i] != null) {
-        groupIDsOrderCopy.add(params[i]);
-        groupIDsCopy.put(params[i], getGroupMemberIDs(params[i]));
-        IXSDFragment[] groupMemberFragments = getGroupMemberFragments(params[i]);
-        for (int j = 0; j < groupMemberFragments.length; j++) {
-          if (groupMemberFragments[j] != null) {
-            frags.add(groupMemberFragments[j]);
-            if (!groupMemberFragments[j].processParameterValues(parser))
-              valuesValid = false;
-          }
-        }
-      }
-    }
-    groupIDsOrder_ = groupIDsOrderCopy;
-    groupIDs_ = groupIDsCopy;
-    removeAllFragments();
-    addFragments(frags);
-    return valuesValid;
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    removeGroupIDs();
-    boolean paramsValid = true;
-    String prevGroupID = null;
-    String currGroupID = null;
-    int groupMemberIndex = 0;
-    for (int i = 0; i < instanceDocuments.length; ) {
-      if (currGroupID == null) {
-        String newGroupID = createInstance();
-        prevGroupID = currGroupID;
-        currGroupID = newGroupID;
-      }
-      Element[] instancePartition = null;
-      int j = groupMemberIndex;
-      boolean paramsAssigned = false;
-      int wildcardFragIndex = -1;
-      do {
-        IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
-        XSDComponent xsdComponent = groupMemberFrags[j].getXSDToFragmentConfiguration().getXSDComponent();
-        if (xsdComponent instanceof XSDWildcard) {
-          if (wildcardFragIndex < 0)
-            wildcardFragIndex = j;
-        }
-        else if (groupMemberFrags[j].getName().equals(trimPrefix(instanceDocuments[i].getTagName()))) {
-          instancePartition = getInstanceDocumentPartition(instanceDocuments, i, groupMemberFrags[j].getXSDToFragmentConfiguration().getMaxOccurs());
-          if (!groupMemberFrags[j].setParameterValuesFromInstanceDocuments(instancePartition))
-            paramsValid = false;
-          paramsAssigned = true;
-        }
-        if (j == groupMemberFrags.length - 1) {
-          j = 0;
-          String newGroupID;
-          if (!paramsAssigned)
-            newGroupID = createInstance();
-          else
-            newGroupID = null;
-          prevGroupID = currGroupID;
-          currGroupID = newGroupID;
-        }
-        else
-          j++;
-      } while (!paramsAssigned && j != groupMemberIndex);
-      groupMemberIndex = j;
-      if (!paramsAssigned) {
-        instancePartition = getInstanceDocumentPartition(instanceDocuments, i, FragmentConstants.UNBOUNDED);
-        if (wildcardFragIndex >= 0) {
-          if (wildcardFragIndex >= groupMemberIndex) {
-            removeGroupID(currGroupID);
-            currGroupID = prevGroupID;
-          }
-          groupMemberIndex = wildcardFragIndex;
-          IXSDFragment[] groupMemberFrags = getGroupMemberFragments(currGroupID);
-          if (!groupMemberFrags[wildcardFragIndex].setParameterValuesFromInstanceDocuments(instancePartition))
-            paramsValid = false;
-          paramsAssigned = true;
-        }
-        else if (currGroupID != null && (prevGroupID == null || !currGroupID.equals(prevGroupID))) {
-          paramsValid = false;
-          removeGroupID(currGroupID);
-          currGroupID = prevGroupID;
-        }
-      }
-      i = i + instancePartition.length;
-    }
-    return paramsValid;
-  }
-
-  private Element[] getInstanceDocumentPartition(Element[] instanceDocuments, int start, int maxSize) {
-    String tagName = instanceDocuments[start].getTagName();
-    int size = 1;
-    for (int i = start + 1; i < instanceDocuments.length; i++) {
-      if (maxSize != FragmentConstants.UNBOUNDED && size >= maxSize)
-        break;
-      else if (instanceDocuments[i].getTagName().equals(tagName))
-        size++;
-      else
-        break;
-    }
-    Element[] subset = new Element[size];
-    for (int j = 0; j < subset.length; j++) {
-      subset[j] = instanceDocuments[start + j];
-    }
-    return subset;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    IXSDFragment[] groupMemberFragments = getAllFragments();
-    Vector instanceDocumentsCopy = new Vector();
-    for (int i = 0; i < groupMemberFragments.length; i++) {
-      Element[] fragmentInstances = groupMemberFragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      for (int j = 0; j < fragmentInstances.length; j++) {
-        instanceDocumentsCopy.add(fragmentInstances[j]);
-      }
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    for (int k = 0; k < instanceDocuments.length; k++) {
-      instanceDocuments[k] = (Element)instanceDocumentsCopy.get(k);
-    }
-    return instanceDocuments;
-  }
-
-  public void setXSDModelGroup(XSDModelGroup xsdModelGroup) {
-    xsdModelGroup_ = xsdModelGroup;
-  }
-
-  public XSDModelGroup getXSDModelGroup() {
-    return xsdModelGroup_;
-  }
-
-  public String[] getGroupIDs() {
-    String[] groupIDs = new String[groupIDsOrder_.size()];
-    for (int i = 0; i < groupIDs.length; i++) {
-      groupIDs[i] = (String)groupIDsOrder_.get(i);
-    }
-    return groupIDs;
-  }
-
-  protected void removeGroupIDs() {
-    removeAllFragments();
-    groupIDsOrder_.clear();
-    groupIDs_.clear();
-  }
-
-  protected void removeGroupID(String groupID) {
-    String[] memberFragIDs = getGroupMemberIDs(groupID);
-    removeFragments(memberFragIDs);
-    groupIDsOrder_.remove(groupID);
-    groupIDs_.remove(groupID);
-  }
-
-  protected void setGroupMemberIDs(String groupID, String[] groupMemberIDs) {
-    if (groupID != null) {
-      if (!groupIDsOrder_.contains(groupID))
-        groupIDsOrder_.add(groupID);
-      if (groupMemberIDs != null)
-        groupIDs_.put(groupID, groupMemberIDs);
-      else
-        groupIDs_.put(groupID, new String[0]);
-    }
-  }
-
-  protected void setGroupMemberFragments(String groupID, IXSDFragment[] groupMemberFragments) {
-    addFragments(groupMemberFragments);
-    String[] ids = new String[groupMemberFragments.length];
-    for (int i = 0; i < ids.length; i++) {
-      ids[i] = groupMemberFragments[i].getID();
-    }
-    setGroupMemberIDs(groupID, ids);
-  }
-
-  public String[] getGroupMemberIDs(String groupID) {
-    if (groupID != null) {
-      String[] groupMemberIDs = (String[])groupIDs_.get(groupID);
-      if (groupMemberIDs != null)
-        return groupMemberIDs;
-    }
-    return new String[0];
-  }
-
-  public IXSDFragment[] getGroupMemberFragments(String groupID) {
-    String[] groupMemberIDs = getGroupMemberIDs(groupID);
-    IXSDFragment[] groupMemberFragments = new IXSDFragment[groupMemberIDs.length];
-    for (int i = 0; i < groupMemberFragments.length; i++) {
-      groupMemberFragments[i] = getFragment(groupMemberIDs[i]);
-    }
-    return groupMemberFragments;
-  }
-
-  protected String createGroupInstance() {
-    String groupID = genID();
-    EList particles = getXSDModelGroup().getParticles();
-    String[] groupMemberIDs = new String[particles.size()];
-    for (int i = 0; i < particles.size(); i++) {
-      XSDParticle xsdParticle = (XSDParticle)particles.get(i);
-      XSDParticleContent xsdParticleContent = xsdParticle.getContent();
-      XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-      XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-      if (xsdParticleContent instanceof XSDComponent)
-        xsdConfig.setXSDComponent((XSDComponent)xsdParticleContent);
-      else
-        xsdConfig.setXSDComponent(null);
-      xsdConfig.setStyle(thisConfig.getStyle());
-      xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-      xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-      groupMemberIDs[i] = genID();
-      addFragment(groupMemberIDs[i], getXSDToFragmentController().getFragment(xsdConfig, groupMemberIDs[i], groupMemberIDs[i]));
-    }
-    setGroupMemberIDs(groupID, groupMemberIDs);
-    return groupID;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
deleted file mode 100644
index 31a1a372c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqFixFragment extends XSDGroupSeqFragment {
-  public XSDGroupSeqFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
deleted file mode 100644
index e30813040..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqFragment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDGroupSeqFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public abstract class XSDGroupSeqFragment extends XSDGroupFragment implements IXSDGroupSeqFragment {
-  public XSDGroupSeqFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String createGroupSeqInstance() {
-    return createGroupInstance();
-  }
-
-  public String createInstance() {
-    return createGroupSeqInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
deleted file mode 100644
index afb6a59fb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDGroupSeqRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class XSDGroupSeqRangeFragment extends XSDGroupSeqFragment {
-  public XSDGroupSeqRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller, XSDModelGroup xsdModelGroup) {
-    super(id, name, config, controller, xsdModelGroup);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDGroupRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
deleted file mode 100644
index 1cd330cf1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDMapFragment.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDMapFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Enumeration;
-
-public abstract class XSDMapFragment extends XSDFragment implements IXSDMapFragment {
-  private XSDToFragmentController controller_;
-  private Vector fragmentsOrder_;
-  private Hashtable fragments_;
-
-  public XSDMapFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config);
-    controller_ = controller;
-    fragmentsOrder_ = new Vector();
-    fragments_ = new Hashtable();
-  }
-
-  public boolean processParameterValues(MultipartFormDataParser parser) throws MultipartFormDataException {
-    boolean valuesValid = true;
-    String[] params = parser.getParameterValues(getID());
-    Vector frags = new Vector();
-    if (params != null) {
-      for (int i = 0; i < params.length; i++) {
-        if (params[i] != null) {
-          IXSDFragment frag = getFragment(params[i]);
-          if (frag != null) {
-            frags.add(frag);
-            if (!frag.processParameterValues(parser))
-              valuesValid = false;
-          }
-        }
-      }
-    }
-    removeAllFragments();
-    addFragments(frags);
-    return valuesValid;
-  }
-
-  public void setParameterValues(String paramKey, String[] params) {
-    IXSDFragment frag = getFragment(paramKey);
-    if (frag != null)
-      frag.setParameterValues(paramKey, params);
-  }
-
-  public String[] getParameterValues(String paramKey) {
-    IXSDFragment frag = getFragment(paramKey);
-    return (frag != null) ? frag.getParameterValues(paramKey) : null;
-  }
-
-  public boolean validateAllParameterValues() {
-    IXSDFragment[] fragments = getAllFragments();
-    for (int i = 0; i < fragments.length; i++) {
-      if (!fragments[i].validateAllParameterValues())
-        return false;
-    }
-    return true;
-  }
-
-  public boolean validateParameterValues(String paramKey) {
-    IXSDFragment frag = getFragment(paramKey);
-    return (frag != null) ? frag.validateParameterValues(paramKey) : true;
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    IXSDFragment frag = getFragment(paramKey);
-    return (frag != null) ? frag.validateParameterValue(paramKey, paramIndex) : true;
-  }
-
-  public void setXSDToFragmentController(XSDToFragmentController controller) {
-    controller_ = controller;
-  }
-
-  public XSDToFragmentController getXSDToFragmentController() {
-    return controller_;
-  }
-
-  protected void addFragment(String id, IXSDFragment frag) {
-    addFragment(id, frag, true);
-  }
-
-  protected void addFragments(String[] id, IXSDFragment[] frags) {
-    addFragments(id, frags, true);
-  }
-
-  protected void addFragment(IXSDFragment frag) {
-    addFragment(frag, true);
-  }
-
-  protected void addFragments(IXSDFragment[] frags) {
-    addFragments(frags, true);
-  }
-
-  protected void addFragments(Vector frags) {
-    addFragments(frags, true);
-  }
-
-  protected void addFragment(String id, IXSDFragment frag, boolean addToController) {
-    fragmentsOrder_.add(id);
-    fragments_.put(id, frag);
-    controller_.addToCache(id, frag);
-  }
-
-  protected void addFragments(String[] id, IXSDFragment[] frags, boolean addToController) {
-    for (int i = 0; i < id.length && i < frags.length; i++) {
-      addFragment(id[i], frags[i], addToController);
-    }
-  }
-
-  protected void addFragment(IXSDFragment frag, boolean addToController) {
-    addFragment(frag.getID(), frag, addToController);
-  }
-
-  protected void addFragments(IXSDFragment[] frags, boolean addToController) {
-    for (int i = 0; i < frags.length; i++) {
-      addFragment(frags[i].getID(), frags[i], addToController);
-    }
-  }
-
-  protected void addFragments(Vector frags, boolean addToController) {
-    Iterator it = frags.iterator();
-    while (it.hasNext()) {
-      Object obj = it.next();
-      if (obj instanceof IXSDFragment) {
-        IXSDFragment frag = (IXSDFragment)obj;
-        addFragment(frag.getID(), frag, addToController);
-      }
-    }
-  }
-
-  public String[] getFragmentsOrder() {
-    String[] fragmentsOrder = new String[fragmentsOrder_.size()];
-    for (int i = 0; i < fragmentsOrder.length; i++) {
-      fragmentsOrder[i] = (String)fragmentsOrder_.get(i);
-    }
-    return fragmentsOrder;
-  }
-
-  protected boolean setFragmentsOrder(String[] fragmentsOrder) {
-    if (fragmentsOrder.length != fragmentsOrder_.size())
-      return false;
-    Vector fragmentsOrderCopy = new Vector(fragmentsOrder_);
-    for (int i = 0; i < fragmentsOrder.length; i++) {
-      if (!fragmentsOrderCopy.remove(fragmentsOrder[i]))
-        return false;
-    }
-    fragmentsOrder_.clear();
-    for (int j = 0; j < fragmentsOrder.length; j++) {
-      fragmentsOrder_.add(fragmentsOrder[j]);
-    }
-    return true;
-  }
-
-  public IXSDFragment getFragment(String id) {
-    return (IXSDFragment)fragments_.get(id);
-  }
-
-  public IXSDFragment[] getFragments(String[] ids) {
-    IXSDFragment[] frags = new IXSDFragment[ids.length];
-    for (int i = 0; i < frags.length; i++) {
-      frags[i] = getFragment(ids[i]);
-    }
-    return frags;
-  }
-
-  public IXSDFragment[] getAllFragments() {
-    IXSDFragment[] fragments = new IXSDFragment[fragmentsOrder_.size()];
-    for (int i = 0; i < fragmentsOrder_.size(); i++) {
-      fragments[i] = getFragment((String)fragmentsOrder_.get(i));
-    }
-    return fragments;
-  }
-
-  protected void removeFragment(String id) {
-    removeFragment(id, true);
-  }
-
-  protected void removeFragments(String[] ids) {
-    removeFragments(ids, true);
-  }
-
-  protected void removeAllFragments() {
-    removeAllFragments(true);
-  }
-
-  protected void removeFragment(String id, boolean removeFromController) {
-    fragmentsOrder_.remove(id);
-    fragments_.remove(id);
-    if (removeFromController)
-      controller_.removeFromCache(id);
-  }
-
-  protected void removeFragments(String[] ids, boolean removeFromController) {
-    for (int i = 0; i < ids.length; i++) {
-      removeFragment(ids[i], removeFromController);
-    }
-  }
-
-  protected void removeAllFragments(boolean removeFromController) {
-    if (removeFromController)
-    {
-      Enumeration ids = fragments_.keys();
-      while (ids.hasMoreElements())
-      {
-        String id = (String)ids.nextElement();
-        controller_.removeFromCache(id);
-      }
-    }
-    fragmentsOrder_.clear();
-    fragments_.clear();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
deleted file mode 100644
index ebf6ba524..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeFixFragment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeFixFragment extends XSDSimpleAtomicFixFragment {
-  private int calendarType_;
-  public XSDSimpleAtomicDateTimeFixFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
-    super(id, name, config);
-    calendarType_ = calendarType;
-  }
-  
-  public String getWriteFragment() {
-    StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp?");
-    fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
-    return fragmentLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
deleted file mode 100644
index add26d0af..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicDateTimeRangeFragment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicDateTimeRangeFragment extends XSDSimpleAtomicRangeFragment {
-  private int calendarType_;
-  public XSDSimpleAtomicDateTimeRangeFragment(String id, String name, XSDToFragmentConfiguration config, int calendarType) {
-    super(id, name, config);
-    calendarType_ = calendarType;
-  }
-
-  public String getWriteFragment() {
-    StringBuffer fragmentLink = new StringBuffer("/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp?");
-    fragmentLink.append(ActionInputs.CALENDAR_TYPE).append('=').append(calendarType_);
-    return fragmentLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
deleted file mode 100644
index 1e0155eaa..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFixFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*;
-import org.eclipse.emf.common.util.EList;
-
-public class XSDSimpleAtomicEnumFixFragment extends XSDSimpleAtomicEnumFragment {
-  public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
-    super(id, name, config, elist);
-  }
-  
-  public XSDSimpleAtomicEnumFixFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
-  {
-    super(id, name, config, v);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
deleted file mode 100644
index 919cd4af1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumFragment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*;
-import org.eclipse.xsd.*;
-
-public abstract class XSDSimpleAtomicEnumFragment extends XSDSimpleAtomicFragment {
-  private OptionVector optionVector_;
-  public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
-    super(id, name, config);
-    optionVector_ = new OptionVector();
-    for (int i=0;i<elist.size();i++)
-    {
-      String enumValue = ((XSDEnumerationFacet)elist.get(i)).getLexicalValue();
-      optionVector_.addOption(enumValue,enumValue);
-    }
-  }
-  
-  public XSDSimpleAtomicEnumFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
-  {
-    super(id, name, config);
-    optionVector_ = new OptionVector();
-    for (int i=0;i<v.size();i++)
-      optionVector_.addOption(v.getDisplayValue(i),v.getValue(i));
-  }
-  
-  public final OptionVector getOptionVector()
-  {
-    return optionVector_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
deleted file mode 100644
index 5a74bbd62..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicEnumRangeFragment.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util.*;
-import org.eclipse.emf.common.util.EList;
-
-public class XSDSimpleAtomicEnumRangeFragment extends XSDSimpleAtomicEnumFragment {
-  public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, EList elist) {
-    super(id, name, config, elist);
-  }
-  
-  public XSDSimpleAtomicEnumRangeFragment(String id, String name, XSDToFragmentConfiguration config, OptionVector v)
-  {
-    super(id, name, config, v);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
deleted file mode 100644
index 5c8dddfcf..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFixFragment.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicFixFragment extends XSDSimpleAtomicFragment {
-  public XSDSimpleAtomicFixFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
deleted file mode 100644
index d82a1d83f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicFragment.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.*;
-import org.eclipse.xsd.*;
-
-public abstract class XSDSimpleAtomicFragment extends XSDFragment implements IXSDSimpleAtomicFragment {
-  public XSDSimpleAtomicFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public boolean validateParameterValue(String paramKey, int paramIndex) {
-    String param = getParameterValue(paramKey, paramIndex);
-    if (param != null && !((XSDSimpleTypeDefinition)getXSDTypeDefinition()).isValidLiteral(param))
-      return false;
-    else
-      return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
deleted file mode 100644
index e3bbd7600..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleAtomicRangeFragment.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-
-public class XSDSimpleAtomicRangeFragment extends XSDSimpleAtomicFragment {
-  public XSDSimpleAtomicRangeFragment(String id, String name, XSDToFragmentConfiguration config) {
-    super(id, name, config);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
deleted file mode 100644
index e265bac5b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFixFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListFixFragment extends XSDSimpleListFragment {
-  public XSDSimpleListFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
deleted file mode 100644
index 3246215df..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListFragment.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import java.util.StringTokenizer;
-import java.util.Hashtable;
-
-public abstract class XSDSimpleListFragment extends XSDMapFragment implements IXSDSimpleListFragment
-{
-  public XSDSimpleListFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller)
-  {
-    super(id, name, config, controller);
-  }
-
-  public void setName(String name)
-  {
-    super.setName(name);
-    IXSDFragment[] fragments = getAllFragments();
-    for (int i = 0; i < fragments.length; i++)
-    {
-      fragments[i].setName(name);
-    }
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments)
-  {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    String[] params = new String[instanceDocumentsCopy.length];
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    for (int i = 0; i < instanceDocumentsCopy.length; i++)
-    {
-      params[i] = "";
-      NodeList nodeList = instanceDocumentsCopy[i].getChildNodes();
-      if (nodeList.getLength() > 0)
-      {
-        Node node = nodeList.item(0);
-        if (nodeList.getLength() > 1)
-          paramsValid = false;
-        if (node.getNodeType() != Node.TEXT_NODE)
-          paramsValid = false;
-        else
-          params[i] = node.getNodeValue();
-      }
-      else
-        paramsValid = false;
-    }
-    removeAllFragments();
-    for (int i = 0; i < params.length; i++)
-    {
-      IXSDFragment childFrag = getFragment(createListInstance());
-      StringTokenizer st = new StringTokenizer(params[i].trim());
-      String[] childParams = new String[st.countTokens()];
-      for (int j = 0; j < childParams.length; j++)
-      {
-        childParams[j] = st.nextToken();
-      }
-      childFrag.setParameterValues(childFrag.getID(), childParams);
-      paramsValid = paramsValid && childFrag.validateAllParameterValues();
-    }
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc)
-  {
-    IXSDFragment[] fragments = getAllFragments();
-    Element[] instanceDocuments = new Element[fragments.length];
-    String tagName = getInstanceDocumentTagName(namespaceTable);
-    for (int i = 0; i < fragments.length; i++)
-    {
-      Element instanceDocument = doc.createElement(tagName);
-      StringBuffer listValue = new StringBuffer();
-      String[] params = fragments[i].getParameterValues(fragments[i].getID());
-      for (int j = 0; params != null && j < params.length; j++)
-      {
-        if (j != 0)
-          listValue.append(FragmentConstants.LIST_SEPERATOR);
-        listValue.append(params[j]);
-      }
-      Node textNode = doc.createTextNode(listValue.toString());
-      instanceDocument.appendChild(textNode);
-      instanceDocuments[i] = instanceDocument;
-    }
-    return (genXSIType ? addXSIType(instanceDocuments, namespaceTable) : instanceDocuments);
-  }
-
-  public String createListInstance()
-  {
-    String newID = genID();
-    XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition)getXSDTypeDefinition();
-    int min = 0;
-    int max = FragmentConstants.UNBOUNDED;
-    XSDLengthFacet xsdLengthFacet = simpleType.getLengthFacet();
-    // port to org.eclipse.xsd
-    if (xsdLengthFacet != null)
-    {
-      min = xsdLengthFacet.getValue();
-      max = xsdLengthFacet.getValue();
-    }
-    else
-    {
-      XSDMinLengthFacet xsdMinLengthFacet = simpleType.getMinLengthFacet();
-      XSDMaxLengthFacet xsdMaxLengthFacet = simpleType.getMaxLengthFacet();
-      // port to org.eclipse.xsd
-      if (xsdMinLengthFacet != null)
-        min = xsdMinLengthFacet.getValue();
-      if (xsdMaxLengthFacet != null)
-        max = xsdMaxLengthFacet.getValue();
-    }
-    XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-    XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-    xsdConfig.setXSDComponent(simpleType.getItemTypeDefinition());
-    xsdConfig.setStyle(thisConfig.getStyle());
-    xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-    xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-    xsdConfig.setMinOccurs(min);
-    xsdConfig.setMaxOccurs(max);
-    IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
-    frag.setID(newID);
-    frag.setName(getName());
-    addFragment(newID, frag);
-    return newID;
-  }
-
-  public String createInstance()
-  {
-    return createListInstance();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
deleted file mode 100644
index aeb95054f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleListRangeFragment.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleListRangeFragment extends XSDSimpleListFragment {
-  public XSDSimpleListRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp";
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
deleted file mode 100644
index b6c2242f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFixFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionFixFragment extends XSDSimpleUnionFragment {
-  public XSDSimpleUnionFixFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
deleted file mode 100644
index a5a06a6c0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionFragment.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleUnionFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import java.util.Vector;
-import java.util.Hashtable;
-
-public abstract class XSDSimpleUnionFragment extends XSDMapFragment implements IXSDSimpleUnionFragment {
-  private XSDSimpleTypeDefinition[] memberTypes_;
-
-  public XSDSimpleUnionFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-    memberTypes_ = null;
-  }
-
-  public void setName(String name) {
-    super.setName(name);
-    IXSDFragment[] fragments = getAllFragments();
-    for (int i = 0; i < fragments.length; i++) {
-      fragments[i].setName(name);
-    }
-  }
-
-  public boolean setParameterValuesFromInstanceDocuments(Element[] instanceDocuments) {
-    Element[] instanceDocumentsCopy = getInstanceDocumentsByTagName(instanceDocuments, getName());
-    int numTypes = getMemberTypeDefinitions().length;
-    boolean paramsValid = internalEquals(instanceDocumentsCopy, instanceDocuments);
-    Vector memberFragments = new Vector();
-    for (int i = 0; i < instanceDocumentsCopy.length; i++) {
-      IXSDFragment compatibleFrag = null;
-      for (int j = 0; j < numTypes; j++) {
-        IXSDFragment memberFrag = getFragment(createUnionInstance(j));
-        Element[] memberInstanceDocument = new Element[1];
-        memberInstanceDocument[0] = setElementTagName(instanceDocumentsCopy[i], memberFrag.getName());
-        if (memberFrag.setParameterValuesFromInstanceDocuments(memberInstanceDocument)) {
-          if (memberFrag.validateAllParameterValues()) {
-            compatibleFrag = memberFrag;
-            break;
-          }
-          else if (compatibleFrag == null)
-            compatibleFrag = memberFrag;
-        }
-      }
-      if (compatibleFrag != null)
-        memberFragments.add(compatibleFrag);
-      else
-        paramsValid = false;
-    }
-    removeAllFragments();
-    addFragments(memberFragments);
-    return paramsValid;
-  }
-
-  public Element[] genInstanceDocumentsFromParameterValues(boolean genXSIType, Hashtable namespaceTable, Document doc) {
-    IXSDFragment[] fragments = getAllFragments();
-    Vector instanceDocumentsCopy = new Vector();
-    for (int i = 0; i < fragments.length; i++) {
-      Element[] fragmentInstances = fragments[i].genInstanceDocumentsFromParameterValues(genXSIType, namespaceTable, doc);
-      if (fragmentInstances.length > 0)
-        instanceDocumentsCopy.add(fragmentInstances[0]);
-    }
-    Element[] instanceDocuments = new Element[instanceDocumentsCopy.size()];
-    for (int i = 0; i < instanceDocuments.length; i++) {
-      instanceDocuments[i] = (Element)instanceDocumentsCopy.get(i);
-    }
-    return setElementsTagName(instanceDocuments, getInstanceDocumentTagName(namespaceTable));
-  }
-
-  public XSDSimpleTypeDefinition[] getMemberTypeDefinitions() {
-    if (memberTypes_ == null) {
-      EList memberTypes = ((XSDSimpleTypeDefinition)getXSDTypeDefinition()).getMemberTypeDefinitions();
-      memberTypes_ = new XSDSimpleTypeDefinition[memberTypes.size()];
-      for (int i = 0; i < memberTypes_.length; i++) {
-        memberTypes_[i] = (XSDSimpleTypeDefinition)memberTypes.get(i);
-      }
-    }
-    return memberTypes_;
-  }
-
-  public String createUnionInstance(int memberTypeIndex) {
-    getMemberTypeDefinitions();
-    if (memberTypeIndex < 0 || memberTypeIndex > memberTypes_.length - 1)
-      return null;
-    String newID = genID();
-    XSDToFragmentConfiguration thisConfig = getXSDToFragmentConfiguration();
-    XSDToFragmentConfiguration xsdConfig = new XSDToFragmentConfiguration();
-    xsdConfig.setXSDComponent(memberTypes_[memberTypeIndex]);
-    xsdConfig.setStyle(thisConfig.getStyle());
-    xsdConfig.setPartEncoding(thisConfig.getPartEncoding());
-    xsdConfig.setWSDLPartName(thisConfig.getWSDLPartName());
-    IXSDFragment frag = getXSDToFragmentController().getFragment(xsdConfig, newID, getName());
-    frag.setID(newID);
-    frag.setName(getName());
-    addFragment(newID, frag);
-    return newID;
-  }
-
-  public String createInstance() {
-    return createUnionInstance(0);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
deleted file mode 100644
index ec2bb8d02..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/impl/XSDSimpleUnionRangeFragment.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.impl;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentConfiguration;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.XSDToFragmentController;
-
-public class XSDSimpleUnionRangeFragment extends XSDSimpleUnionFragment {
-  public XSDSimpleUnionRangeFragment(String id, String name, XSDToFragmentConfiguration config, XSDToFragmentController controller) {
-    super(id, name, config, controller);
-  }
-
-  public String getInformationFragment() {
-    return "/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp";
-  }
-
-  public String getReadFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp";
-  }
-
-  public String getWriteFragment() {
-    return "/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
deleted file mode 100644
index 5519e744d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/HTTPUtil.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.Hashtable;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.apache.axis.Constants;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleAtomicFragment;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDSimpleListFragment;
-import org.w3c.dom.Element;
-
-public class HTTPUtil
-{
-  private HTTPUtil()
-  {
-  }
-
-  public static String genURLEncodedParameters(IXSDFragment fragment)
-  {
-    if (fragment instanceof IXSDSimpleListFragment)
-      return genURLEncodedParamsFromListFragment((IXSDSimpleListFragment)fragment);
-    else if (fragment instanceof IXSDSimpleAtomicFragment)
-      return genURLEncodedParamsFromAtomicFragment((IXSDSimpleAtomicFragment)fragment);
-    else
-      return genURLEncodedXMLParameters(fragment);
-  }
-
-  private static String genURLEncodedParamsFromAtomicFragment(IXSDSimpleAtomicFragment fragment)
-  {
-    StringBuffer urlEncodedParam = new StringBuffer();
-    String[] params = fragment.getParameterValues(fragment.getID());
-    for (int i = 0; i < params.length; i++)
-    {
-      urlEncodedParam.append(URLUtils.encode(fragment.getName()));
-      urlEncodedParam.append("=");
-      urlEncodedParam.append(URLUtils.encode(params[i]));
-      if (i < params.length - 1)
-        urlEncodedParam.append("&");
-    }
-    return urlEncodedParam.toString();
-  }
-
-  private static String genURLEncodedParamsFromListFragment(IXSDSimpleListFragment fragment)
-  {
-    StringBuffer urlEncodedParam = new StringBuffer();
-    IXSDFragment[] childFrags = fragment.getAllFragments();
-    for (int i = 0; i < childFrags.length; i++)
-    {
-      urlEncodedParam.append(URLUtils.encode(fragment.getName()));
-      urlEncodedParam.append("=");
-      String[] params = childFrags[i].getParameterValues(childFrags[i].getID());
-      StringBuffer paramBuffer = new StringBuffer();
-      for (int j = 0; j < params.length; j++)
-      {
-        paramBuffer.append(params[j]);
-        if (j < params.length - 1)
-          paramBuffer.append(FragmentConstants.LIST_SEPERATOR);
-      }
-      urlEncodedParam.append(URLUtils.encode(paramBuffer.toString()));
-      if (i < childFrags.length - 1)
-        urlEncodedParam.append("&");
-    }
-    return urlEncodedParam.toString();
-  }
-
-  private static String genURLEncodedXMLParameters(IXSDFragment fragment)
-  {
-    StringBuffer urlEncodedParam = new StringBuffer();
-    Hashtable soapEnvelopeNamespaceTable = new Hashtable();
-    soapEnvelopeNamespaceTable.put(Constants.URI_SOAP11_ENV, Constants.NS_PREFIX_SOAP_ENV);
-    soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSI, Constants.NS_PREFIX_SCHEMA_XSI);
-    soapEnvelopeNamespaceTable.put(Constants.URI_2001_SCHEMA_XSD, Constants.NS_PREFIX_SCHEMA_XSD);
-    Element[] instanceDocuments = new Element[0];
-    try
-    {
-      instanceDocuments = fragment.genInstanceDocumentsFromParameterValues(true, soapEnvelopeNamespaceTable, XMLUtils.createNewDocument(null));
-    }
-    catch (ParserConfigurationException pce)
-    {
-    }
-    for (int i = 0; i < instanceDocuments.length; i++)
-    {
-      urlEncodedParam.append(URLUtils.encode(fragment.getName()));
-      urlEncodedParam.append("=");
-      urlEncodedParam.append(URLUtils.encode(XMLUtils.serialize(instanceDocuments[i], true)));
-      if (i < instanceDocuments.length - 1)
-        urlEncodedParam.append("&");
-    }
-    return urlEncodedParam.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
deleted file mode 100644
index 1d165c097..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/OptionVector.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import java.util.*;
-
-public class OptionVector
-{
-  private Vector options_;
-  
-  public OptionVector()
-  {
-    options_ = new Vector();
-  }
-  
-  public void addOption(String displayValue,String value)
-  {
-    options_.addElement(new Option(displayValue,value));
-  }
-  
-  public String getDisplayValue(int position)
-  {
-    Option option = (Option)options_.elementAt(position);
-    return option.getDisplayValue();
-  }
-  
-  public String getValue(int position)
-  {
-    Option option = (Option)options_.elementAt(position);
-    return option.getValue();
-  }
-  
-  public int size()
-  {
-    return options_.size();
-  }
-  
-  private final class Option
-  {
-    private String displayValue_;
-    private String value_;
-    public Option(String displayValue,String value)
-    {
-      displayValue_ = displayValue;
-      value_ = value;
-    }
-    
-    public final String getDisplayValue()
-    {
-      return displayValue_;
-    }
-    
-    public final String getValue()
-    {
-      return value_;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
deleted file mode 100644
index ed9622d2d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/fragment/util/XSDTypeDefinitionUtil.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.util;
-
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComplexTypeContent;
-
-public class XSDTypeDefinitionUtil {
-  private XSDTypeDefinitionUtil() {
-  }
-
-  public static boolean isXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
-    if (type == null)
-      return false;
-    String ns = type.getTargetNamespace();
-    return (ns != null && ns.equals(FragmentConstants.URI_XSD));
-  }
-  
-  public static boolean isRootTypeDefinition(XSDTypeDefinition type) {
-    if (type == null)
-      return true;
-    XSDTypeDefinition baseType = type.getBaseType();
-    if (baseType == null)
-      return true;
-    String typeNS = type.getTargetNamespace();
-    String baseTypeNS = baseType.getTargetNamespace();
-    String typeName = type.getName();
-    String baseTypeName = baseType.getName();
-    boolean sameNS;
-    boolean sameName;
-    if (typeNS == null && baseTypeNS == null)
-      sameNS = true;
-    else if (typeNS != null && baseTypeNS != null && typeNS.equals(baseTypeNS))
-      sameNS = true;
-    else
-      sameNS = false;
-    if (typeName == null && baseTypeName == null)
-      sameName = true;
-    else if (typeName != null && baseTypeName != null && typeName.equals(baseTypeName))
-      sameName = true;
-    else
-      sameName = false;
-    return (sameNS && sameName);
-  }
-  
-  public static XSDTypeDefinition resolveToXSDBuiltInTypeDefinition(XSDTypeDefinition type) {
-    if (type == null)
-      return null;
-    XSDTypeDefinition currType = type;
-    while (!isXSDBuiltInTypeDefinition(currType)) {
-      if (isRootTypeDefinition(currType))
-        return null;
-      currType = currType.getBaseType();
-    }
-    return currType;
-  }
-
-  public static boolean isSoapEncArray(XSDTypeDefinition type) {
-    XSDTypeDefinition currType = type;
-    if (currType != null)
-    while(currType != null) {
-      String ns = currType.getTargetNamespace();
-      String name = currType.getName();
-      if (FragmentConstants.URI_SOAP.equals(ns) && FragmentConstants.QNAME_LOCAL_NAME_ARRAY.equals(name))
-        return true;
-      else if (isRootTypeDefinition(currType))
-        return false;
-      else
-        currType = currType.getBaseType();
-    }
-    return false;
-  }
-
-  /**
-   * Returns the complex type content given a complex type.
-   * If complexType is a user defined type:
-   *   This method will return the user defined complex content of this type or the content of the extended
-   *   or derived type iff the extended or derived type is not a built-in XSD type (for example, xsd:anyType).
-   * If complexType is a built-in XSD type:
-   *   It will return the complex content of this built-in XSD complex type.  It will not return the
-   *   complex content of its extended or derived type.
-   * @param complexType XSDComplexTypeDefinition complex type.
-   * @return XSDComplexTypeContent XSDComplexTypeContent the resolved complex type content.
-  **/
-  public static XSDComplexTypeContent getXSDComplexTypeContent(XSDComplexTypeDefinition complexType)
-  {
-    if (!isXSDBuiltInTypeDefinition(complexType))
-    {
-      XSDTypeDefinition type = complexType;
-      while (!isXSDBuiltInTypeDefinition(type) && (type instanceof XSDComplexTypeDefinition))
-      {
-        XSDComplexTypeContent complexTypeContent = ((XSDComplexTypeDefinition)type).getContent();
-        if (complexTypeContent != null)
-          return complexTypeContent;
-        if (isRootTypeDefinition(type))
-          return null;
-        type = type.getBaseType();
-      }
-      return null;
-    }
-    else
-      return complexType.getContent();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
deleted file mode 100644
index e60ca2e9a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/DetailsTool.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public abstract class DetailsTool extends FormTool {
-
-  public String formLink_;
-
-  public DetailsTool(ToolManager toolManager, String alt, String formLink) {
-    super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    formLink_ = formLink;
-  }
-
-  protected void initDefaultProperties() {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getFormLink() {
-    return formLink_;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
deleted file mode 100644
index 77c8ef9f4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/InvokeWSDLOperationTool.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.*;
-
-public class InvokeWSDLOperationTool extends FormTool {
-
-  private String fragmentViewID_;
-  private String fragmentNameAnchorID_;
-  private String endPoint_;
-
-  public InvokeWSDLOperationTool(ToolManager toolManager, String alt) {
-    super(toolManager, "wsdl/images/invoke_wsdl_operation_enabled.gif", "wsdl/images/invoke_wsdl_operation_highlighted.gif", alt);
-    fragmentViewID_ = FragmentConstants.FRAGMENT_VIEW_SWITCH_SOURCE_TO_FORM;
-    fragmentNameAnchorID_ = null;
-    endPoint_ = null;
-  }
-
-  protected void initDefaultProperties() {
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getFormLink() {
-    StringBuffer formLink = new StringBuffer();
-    formLink.append("wsdl/forms/InvokeWSDLOperationForm.jsp");
-    String nameAnchorID = getFragmentNameAnchorID();
-    if (nameAnchorID != null && nameAnchorID.length() > 0) {
-      formLink.append("#");
-      formLink.append(nameAnchorID);
-      setFragmentNameAnchorID(null);
-    }
-    return formLink.toString();
-  }
-
-  public String getFormActionLink(int operationType,String fragmentViewID)
-  {
-    switch (operationType)
-    {
-      case WSDLOperationElement.OPERATION_TYPE_SOAP:
-        if (fragmentViewID.equals(FragmentConstants.FRAGMENT_VIEW_SWITCH_FORM_TO_SOURCE))
-          return "wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp";
-        else
-          return "wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp";
-      case WSDLOperationElement.OPERATION_TYPE_HTTP_GET:
-        return "wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp";
-      case WSDLOperationElement.OPERATION_TYPE_HTTP_POST:
-      default:
-        return "wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp";
-    }
-  }
-
-  public String getFragmentViewID() {
-    return fragmentViewID_;
-  }
-
-  public void setFragmentViewID(String fragmentViewID) {
-    fragmentViewID_ = fragmentViewID;
-  }
-
-  public String getFragmentNameAnchorID() {
-    return fragmentNameAnchorID_;
-  }
-
-  public void setFragmentNameAnchorID(String fragmentNameAnchorID) {
-    fragmentNameAnchorID_ = fragmentNameAnchorID;
-  }
-
-  public String getEndPoint()
-  {
-    return endPoint_;
-  }
-
-  public void setEndPoint(String endPoint)
-  {
-    endPoint_ = endPoint;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
deleted file mode 100644
index d352109b5..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/OpenWSDLTool.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class OpenWSDLTool extends FormTool {
-
-    public OpenWSDLTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsdl/images/open_wsdl_enabled.gif", "wsdl/images/open_wsdl_highlighted.gif", alt);
-    }
-
-    protected void initDefaultProperties() {
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsdl/forms/OpenWSDLForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
deleted file mode 100644
index 470babde4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/SOAPMessageQueue.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-import java.util.*;
-
-public class SOAPMessageQueue extends MessageQueue
-{
-  private Vector cachedMessageList_;
-
-  public SOAPMessageQueue()
-  {
-    super();
-    cachedMessageList_ = new Vector();
-  }
-
-  public void clear()
-  {
-    cachedMessageList_.removeAllElements();
-    messageList_.removeAllElements();
-  }
-
-  public String getMessagesFromList()
-  {
-    if (messageList_.size() == 0)
-      copyMessages(cachedMessageList_,messageList_);
-    else
-      copyMessages(messageList_,cachedMessageList_);
-    return super.getMessagesFromList();
-  }
-
-  private final void copyMessages(Vector sourceList,Vector destList)
-  {
-    for (int i=0;i<sourceList.size();i++)
-      destList.addElement(sourceList.elementAt(i));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
deleted file mode 100644
index 271d671b7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLAddToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLAddToFavoritesAction;
-
-public class WSDLAddToFavoritesTool extends ActionTool {
-  public WSDLAddToFavoritesTool(ToolManager toolManager, String alt) {
-    super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return WSDLAddToFavoritesAction.getActionLink(selectedNode.getNodeId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
deleted file mode 100644
index 4b90d81e6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingDetailsTool.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLBindingDetailsTool extends DetailsTool {
-
-  public WSDLBindingDetailsTool(ToolManager toolManager, String alt) {
-    super(toolManager, alt, "wsdl/forms/WSDLBindingDetailsForm.jsp");
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
deleted file mode 100644
index f3315139e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLBindingNode.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-// WSDL binding node for the WSDL Navigator Tree View
-public class WSDLBindingNode extends WSDLNavigatorNode
-{
-  public WSDLBindingNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_binding_node.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
-          WSDLOperationNode wsdlOperationNode = new WSDLOperationNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlOperationNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_OPERATION)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-    setVisibilityOfChildren(false);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new WSDLBindingDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_BINDING_DETAILS"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java
deleted file mode 100644
index 279eadff7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLDetailsTool.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLDetailsTool extends DetailsTool {
-
-  public static final int FORM_VIEW_ID = 0;
-  public static final int SOURCE_VIEW_ID = 1;
-
-  private int viewId_;
-
-  public WSDLDetailsTool(ToolManager toolManager, String alt) {
-    super(toolManager, alt, "wsdl/forms/WSDLDetailsForm.jsp");
-    viewId_ = FORM_VIEW_ID;
-  }
-
-  public int getViewId() {
-    return viewId_;
-  }
-
-  public void setViewId(int viewId) {
-    if (viewId == FORM_VIEW_ID || viewId == SOURCE_VIEW_ID)
-      viewId_ = viewId;
-  }
-
-  public void toggleViewId() {
-    if (viewId_ == FORM_VIEW_ID)
-      viewId_ = SOURCE_VIEW_ID;
-    else
-      viewId_ = FORM_VIEW_ID;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
deleted file mode 100644
index 3b191a3b4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.WSDLImportWSDLToFileSystemAction;
-
-public class WSDLImportWSDLToFileSystemTool extends ImportToFileSystemTool {
-  public WSDLImportWSDLToFileSystemTool(ToolManager toolManager,String alt) {
-    super(toolManager,alt);
-  }
-
-  public final String getSelectToolActionHref(boolean forHistory) {
-    Node node = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getActionLink() {
-    Node node = toolManager_.getNode();
-    return WSDLImportWSDLToFileSystemAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId());
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 5dccc9500..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
-  public WSDLImportWSDLToWorkbenchTool(ToolManager toolManager,String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node node = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink() {
-    return "wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
deleted file mode 100644
index 36f9780eb..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SelectWSDLPropertiesToolAction;
-
-public class WSDLLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-  public WSDLLaunchWebServiceWizardTool(ToolManager toolManager,String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node node = toolManager_.getNode();
-    return SelectWSDLPropertiesToolAction.getActionLink(node.getNodeId(),toolId_,node.getViewId(),node.getViewToolId(),forHistory);
-  }
-
-  public final String getFormLink() {
-    return "wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
deleted file mode 100644
index 39af7e79c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLMainNode.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-// Root node for the WSDL Navigator Tree View
-public class WSDLMainNode extends WSDLNavigatorNode
-{
-  public WSDLMainNode(TreeElement element,NodeManager nodeManager)
-  {
-    super(element,nodeManager,1,"images/root_main.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL)) {
-          WSDLNode wsdlNode = new WSDLNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new OpenWSDLTool(toolManager_, wsdlPerspective.getMessage("ALT_OPEN_WSDL"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
deleted file mode 100644
index 45db89bb7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNavigatorNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.*;
-
-public abstract class WSDLNavigatorNode extends Node
-{
-  public WSDLNavigatorNode(TreeElement element,NodeManager nodeManager,int nodeDepth,String imagePath)
-  {
-    super(element,nodeManager,nodeDepth,imagePath);
-  }
-
-  // wsdl/actions/ToggleWSDLNavigatorNodeAction.jsp?nodeId=...
-  public final String getToggleNodeActionHref()
-  {
-    return ToggleWSDLNavigatorNodeAction.getActionLink(nodeId_,isOpen_);
-  }
-
-  // wsdl/actions/SelectWSDLNavigatorNodeAction.jsp?nodeId=...
-  public final String getLinkActionHref()
-  {
-    return SelectWSDLNavigatorNodeAction.getActionLink(nodeId_,false);
-  } 
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
deleted file mode 100644
index c5ffb765f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLNode.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-// WSDL node for the WSDL Navigator Tree View
-public class WSDLNode extends WSDLNavigatorNode
-{
-  public WSDLNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"images/wsdl.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
-          WSDLServiceNode wsdlServiceNode = new WSDLServiceNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlServiceNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_SERVICE)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-    setVisibilityOfChildren(false);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new WSDLDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_DETAILS"));
-    new WSDLImportWSDLToWorkbenchTool(toolManager_, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-    new WSDLImportWSDLToFileSystemTool(toolManager_, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-    new WSDLLaunchWebServiceWizardTool(toolManager_, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-    new WSDLAddToFavoritesTool(toolManager_, wsdlPerspective.getMessage("ALT_ADD_WSDL_TO_FAVORITES"));
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
deleted file mode 100644
index 611c96efd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLOperationNode.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-// WSDL operation node for the WSDL Navigator Tree View
-public class WSDLOperationNode extends WSDLNavigatorNode
-{
-  public WSDLOperationNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_operation_node.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-      }
-    });
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new InvokeWSDLOperationTool(toolManager_, wsdlPerspective.getMessage("ALT_INVOKE_WSDL_OPERATION"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
deleted file mode 100644
index 18202cf92..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLPerspective.java
+++ /dev/null
@@ -1,372 +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.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-
-import javax.servlet.ServletContext;
-import javax.wsdl.Service;
-
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryRegistryImpl;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Perspective;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.SwitchPerspectiveFromWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.UpdateWSDLBindingAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.BindingTypes;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.WSDLActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLBindingElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLServiceElement;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-public class WSDLPerspective extends Perspective
-{
-  public static final int STATUS_CONTENT_DEFAULT = 0;
-  public static final int STATUS_CONTENT_RESULT_FORM = 1;
-  public static final int STATUS_CONTENT_RESULT_SOURCE = 2;
-
-  private BasicModel model_;
-  private NodeManager nodeManager_;
-  private String perspectiveContentFramesetCols_;
-  private String savedPerspectiveContentFramesetCols_;
-  private String actionsContainerFramesetRows_;
-  private String savedActionsContainerFramesetRows_;
-  private int statusContentType_;
-
-  private SOAPMessageQueue soapRequestQueue_;
-  private SOAPMessageQueue soapResponseQueue_;
-  private Node operationNode_;
-
-  static
-  {
-    // Initialize the XSD subsystem.
-    (new ResourceFactoryRegistryImpl()).getExtensionToFactoryMap().put("xsd",new XSDResourceFactoryImpl());
-    // port to org.eclipse.xsd
-    // Init.init();
-    EcorePackageImpl.init();
-    XSDPackageImpl.init();
-  }
-
-  public WSDLPerspective(Controller controller)
-  {
-    super("wsdl",controller);
-  }
-
-  public final void initPerspective(ServletContext application)
-  {
-    model_ = new BasicModel("wsdlModel");
-    TreeElement treeElement = new TreeElement(getMessage("NODE_NAME_WSDL_MAIN"), model_);
-    model_.setRootElement(treeElement);
-    nodeManager_ = new NodeManager(controller_);
-    WSDLMainNode wsdlMainNode = new WSDLMainNode(treeElement, nodeManager_);
-    nodeManager_.setRootNode(wsdlMainNode);
-
-    // Starting frameset sizes.
-    if (!DirUtils.isRTL())
-      perspectiveContentFramesetCols_ = "30%,*";
-    else
-      perspectiveContentFramesetCols_ = "*,30%";
-    savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-    actionsContainerFramesetRows_ = "75%,*";
-    savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-
-    // Message status pane
-    statusContentType_ = STATUS_CONTENT_DEFAULT;
-    soapRequestQueue_ = new SOAPMessageQueue();
-    soapResponseQueue_ = new SOAPMessageQueue();
-    operationNode_ = null;
-  }
-
-  public final void preloadWSDL(String[] wsdlURLs) {
-    if (wsdlURLs != null) {
-      for (int i = 0; i < wsdlURLs.length; i++) {
-        OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-        Hashtable propertyTable = openWSDLAction.getPropertyTable();
-        String decodedWSDLURL = URLUtils.decode(wsdlURLs[i]);
-        propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, decodedWSDLURL);
-        openWSDLAction.run();
-      }
-      if (wsdlURLs.length > 0)
-        controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
-    }
-  }
-  
-  public final void preloadEndpoints(String[] wsdlURLs, String[] endpoints)
-  {
-    if (wsdlURLs != null && wsdlURLs.length > 0 && endpoints != null && endpoints.length > 0)
-    {
-      String wsdlURL = wsdlURLs[0];
-      Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
-      for (Iterator wsdlNodesIterator = wsdlNodes.iterator(); wsdlNodesIterator.hasNext();)
-      {
-        Node wsdlNode = (Node)wsdlNodesIterator.next();
-        if (wsdlNode.getNodeName().equals(wsdlURL))
-        {
-          Vector serviceNodes = wsdlNode.getChildNodes();
-          for (Iterator serviceNodesIterator = serviceNodes.iterator(); serviceNodesIterator.hasNext();)
-          {
-            Node serviceNode = (Node)serviceNodesIterator.next();
-            Vector bindingNodes = serviceNode.getChildNodes();
-            String[] nodeIds = new String[bindingNodes.size()];
-            for (int i = 0; i < nodeIds.length; i++)
-              nodeIds[i] = String.valueOf(((Node)bindingNodes.get(i)).getNodeId());
-            UpdateWSDLBindingAction action = new UpdateWSDLBindingAction(controller_);
-            Hashtable propertyTable = new Hashtable();
-            propertyTable.put(ActionInputs.NODEID, nodeIds);
-            propertyTable.put(WSDLActionInputs.END_POINT, endpoints);
-            action.setPropertyTable(propertyTable);
-            action.execute(false);
-          }
-          return;
-        }
-      }
-    }
-  }
-  
-  public final void preselectServiceOrBinding(String[] wsdlURLs,String[] serviceQNameStrings,String[] bindingNameStrings)
-  {
-    if (wsdlURLs != null && wsdlURLs.length > 0)
-    {
-      String wsdlURL = wsdlURLs[0];
-      if (serviceQNameStrings != null && serviceQNameStrings.length > 0)
-        preselectService(wsdlURL,serviceQNameStrings[0]);
-      else
-      {
-        if (bindingNameStrings != null && bindingNameStrings.length > 0)
-          preselectBinding(wsdlURL,bindingNameStrings[0]);
-      }
-    }
-  }
-  
-  private final void preselectService(String wsdlURL,String serviceQNameString)
-  {
-    Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
-    for (int i=0;i<wsdlNodes.size();i++)
-    {
-      Node wsdlNode = (Node)wsdlNodes.elementAt(i);
-      if (wsdlNode.getNodeName().equals(wsdlURL))
-      {
-        Vector serviceNodes = wsdlNode.getChildNodes();
-        for (int j=0;j<serviceNodes.size();j++)
-        {
-          Node serviceNode = (Node)serviceNodes.elementAt(j);
-          WSDLServiceElement serviceElement = (WSDLServiceElement)serviceNode.getTreeElement();
-          Service service = serviceElement.getService();
-          if (service.getQName().toString().equals(serviceQNameString))
-          {
-            nodeManager_.setSelectedNodeId(serviceNode.getNodeId());
-            nodeManager_.makeSelectedNodeVisible();
-            controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
-            return;
-          }
-        }
-      }
-    }
-  }
-  
-  private final void preselectBinding(String wsdlURL,String bindingNameString)
-  {
-    Vector wsdlNodes = nodeManager_.getRootNode().getChildNodes();
-    for (int i=0;i<wsdlNodes.size();i++)
-    {
-      Node wsdlNode = (Node)wsdlNodes.elementAt(i);
-      if (wsdlNode.getNodeName().equals(wsdlURL))
-      {
-        Vector serviceNodes = wsdlNode.getChildNodes();
-        for (int j=0;j<serviceNodes.size();j++)
-        {
-          Node serviceNode = (Node)serviceNodes.elementAt(j);
-          Vector bindingNodes = serviceNode.getChildNodes();
-          for (int k=0;k<bindingNodes.size();k++)
-          {
-            Node bindingNode = (Node)bindingNodes.elementAt(k);
-            WSDLBindingElement bindingElement = (WSDLBindingElement)bindingNode.getTreeElement();
-            if (bindingElement.getBinding().getQName().toString().equals(bindingNameString))
-            {
-              nodeManager_.setSelectedNodeId(bindingNode.getNodeId());
-              nodeManager_.makeSelectedNodeVisible();
-              controller_.setCurrentPerspective(ActionInputs.PERSPECTIVE_WSDL);
-              return;
-            }
-          }
-        }          
-      }
-    }    
-  }
-
-  public NodeManager getNodeManager()
-  {
-    return nodeManager_;
-  }
-
-  public String getPerspectiveContentPage()
-  {
-    return "wsdl/wsdl_perspective_content.jsp";
-  }
-
-  public int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_WSDL;
-  }
-
-  public String getPanesFile()
-  {
-    return "wsdl/scripts/wsdlpanes.jsp";
-  }
-
-  public String getFramesetsFile()
-  {
-    return "wsdl/scripts/wsdlframesets.jsp";
-  }
-
-  public String getProcessFramesetsForm()
-  {
-    return "wsdl/forms/ProcessWSDLFramesetsForm.jsp";
-  }
-
-  public String getTreeContentVar()
-  {
-    return "wsdlNavigatorContent";
-  }
-
-  public String getTreeContentPage()
-  {
-    return "wsdl/wsdl_navigator_content.jsp";
-  }
-
-  public String getPropertiesContainerVar()
-  {
-    return "wsdlPropertiesContainer";
-  }
-
-  public String getPropertiesContainerPage()
-  {
-    return "wsdl/wsdl_properties_container.jsp";
-  }
-
-  public String getStatusContentVar()
-  {
-    return "wsdlStatusContent";
-  }
-
-  public String getStatusContentPage()
-  {
-    return "wsdl/wsdl_status_content.jsp";
-  }
-
-  public final String getPerspectiveContentFramesetCols()
-  {
-    return perspectiveContentFramesetCols_;
-  }
-
-  public final void setPerspectiveContentFramesetCols(String cols)
-  {
-    perspectiveContentFramesetCols_ = cols;
-  }
-
-  public final void setSavedPerspectiveContentFramesetCols(String cols)
-  {
-    savedPerspectiveContentFramesetCols_ = cols;
-  }
-
-  public final String getSavedPerspectiveContentFramesetCols()
-  {
-    return savedPerspectiveContentFramesetCols_;
-  }
-
-  public final String getActionsContainerFramesetRows()
-  {
-    return actionsContainerFramesetRows_;
-  }
-
-  public final void setActionsContainerFramesetRows(String rows)
-  {
-    actionsContainerFramesetRows_ = rows;
-  }
-
-  public final void setSavedActionsContainerFramesetRows(String rows)
-  {
-    savedActionsContainerFramesetRows_ = rows;
-  }
-
-  public final String getSavedActionsContainerFramesetRows()
-  {
-    return savedActionsContainerFramesetRows_;
-  }
-
-  public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    return SwitchPerspectiveFromWSDLAction.getFormActionLink(targetPerspectiveId,forHistory);
-  }
-
-  public final int getStatusContentType()
-  {
-    return statusContentType_;
-  }
-
-  public final void setStatusContentType(int statusContentType)
-  {
-    statusContentType_ = statusContentType;
-  }
-
-  public final SOAPMessageQueue getSOAPRequestQueue()
-  {
-    return soapRequestQueue_;
-  }
-
-  public final SOAPMessageQueue getSOAPResponseQueue()
-  {
-    return soapResponseQueue_;
-  }
-
-  public final Node getOperationNode()
-  {
-    return operationNode_;
-  }
-
-  public final void setOperationNode(Node operationNode)
-  {
-    operationNode_ = operationNode;
-  }
-
-  public final String getSOAPEnvelopeXMLLink(int soapEnvelopeType)
-  {
-    StringBuffer link = new StringBuffer("wsdl/soap_envelope_xml.jsp?");
-    link.append(WSDLActionInputs.SOAP_ENVELOPE_TYPE).append('=').append(soapEnvelopeType);
-    return link.toString();
-  }
-
-  public final String getBindingTypeString(int bindingType)
-  {
-    switch (bindingType)
-    {
-      case BindingTypes.SOAP:
-        return getMessage("FORM_LABEL_BINDING_TYPE_SOAP");
-      case BindingTypes.HTTP_GET:
-        return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_GET");
-      case BindingTypes.HTTP_POST:
-        return getMessage("FORM_LABEL_BINDING_TYPE_HTTP_POST");
-      default:
-        return getMessage("FORM_LABEL_BINDING_TYPE_UNSUPPORTED");
-    }
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
deleted file mode 100644
index 457fe9b61..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceDetailsTool.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-
-public class WSDLServiceDetailsTool extends DetailsTool {
-
-  public WSDLServiceDetailsTool(ToolManager toolManager, String alt) {
-    super(toolManager, alt, "wsdl/forms/WSDLServiceDetailsForm.jsp");
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
deleted file mode 100644
index 5937378b8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/perspective/WSDLServiceNode.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.*;
-
-// WSDL service node for the WSDL Navigator Tree View
-public class WSDLServiceNode extends WSDLNavigatorNode
-{
-  public WSDLServiceNode(TreeElement element,NodeManager nodeManager,int nodeDepth)
-  {
-    super(element,nodeManager,nodeDepth,"wsdl/images/wsdl_service_node.gif");
-    element.addListener(new ElementAdapter()
-    {
-      public void relAdded(RelAddEvent event)
-      {
-        String rel = event.getOutBoundRelName();
-        if (rel.equals(WSDLModelConstants.REL_WSDL_BINDING)) {
-          WSDLBindingNode wsdlBindingNode = new WSDLBindingNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-          addChild(wsdlBindingNode);
-        }
-      }
-
-      public void relRemoved(RelRemoveEvent event)
-      {
-        TreeElement childElement = null;
-        if (event.getInBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
-          childElement = (TreeElement)event.getInboundElement();
-        }
-        if (event.getOutBoundRelName().equals(WSDLModelConstants.REL_WSDL_BINDING)) {
-          childElement = (TreeElement)event.getOutBoundElement();
-        }
-        removeChildNode(childElement);
-      }
-    });
-    setVisibilityOfChildren(false);
-  }
-
-  protected final void initTools()
-  {
-    Controller controller = nodeManager_.getController();
-    WSDLPerspective wsdlPerspective = controller.getWSDLPerspective();
-    new WSDLServiceDetailsTool(toolManager_, wsdlPerspective.getMessage("ALT_WSDL_SERVICE_DETAILS"));
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
deleted file mode 100644
index 8b85259db..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transformer/FragmentTransformer.java
+++ /dev/null
@@ -1,99 +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.wst.ws.internal.explorer.platform.wsdl.transformer;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Vector;
-import javax.wsdl.Part;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.constants.FragmentConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.datamodel.WSDLOperationElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.fragment.IXSDFragment;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class FragmentTransformer implements ITransformer
-{
-  protected Controller controller;
-
-  public FragmentTransformer(Controller controller)
-  {
-    this.controller = controller;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append("<root>");
-    WSDLOperationElement operElement = (WSDLOperationElement)controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
-    Iterator it = operElement.getOrderedBodyParts().iterator();
-    while (it.hasNext())
-    {
-      Part part = (Part)it.next();
-      IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
-      Element[] elements = new Element[0];
-      try
-      {
-        elements = frag.genInstanceDocumentsFromParameterValues(!operElement.isUseLiteral(), new Hashtable(), XMLUtils.createNewDocument(null));
-      }
-      catch (ParserConfigurationException pce)
-      {
-      }
-      for (int i = 0; i < elements.length; i++)
-        sb.append(XMLUtils.serialize(elements[i], true));
-    }
-    sb.append("</root>");
-    properties.put(FragmentConstants.SOURCE_CONTENT, sb.toString());
-    return properties;
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    String source = (String) properties.get(FragmentConstants.SOURCE_CONTENT);
-    if (source != null)
-    {
-      try
-      {
-        Element root = XMLUtils.stringToElement(source);
-        if (root != null)
-        {
-          NodeList childNodes = root.getChildNodes();
-          Vector childrenVector = new Vector();
-          for (int i = 0; i < childNodes.getLength(); i++)
-          {
-            Node child = childNodes.item(i);
-            if (child instanceof Element)
-              childrenVector.add(child);
-          }
-          Element[] children = (Element[])childrenVector.toArray(new Element[0]);
-          WSDLOperationElement operElement = (WSDLOperationElement) controller.getWSDLPerspective().getNodeManager().getSelectedNode().getTreeElement();
-          Iterator it = operElement.getOrderedBodyParts().iterator();
-          while (it.hasNext())
-          {
-            Part part = (Part)it.next();
-            IXSDFragment frag = (IXSDFragment)operElement.getFragment(part);
-            frag.setParameterValuesFromInstanceDocuments(children);
-          }
-        }
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return properties;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
deleted file mode 100644
index 8724cf363..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/ChunkedInputStream.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class ChunkedInputStream extends FilterInputStream
-{
-  protected long chunkSize = 0l;
-  protected volatile boolean closed = false;
-  private static final int maxCharLong = (Long.toHexString(Long.MAX_VALUE)).toString().length();
-
-  private ChunkedInputStream()
-  {
-    super(null);
-  }
-
-  public ChunkedInputStream(InputStream is)
-  {
-    super(is);
-  }
-
-  public int read() throws IOException
-  {
-    byte[] d = new byte[1];
-    int rc = read(d, 0, 1);
-    return rc > 0 ? (d[0] & 0xFF) : rc;
-  }
-
-  public int read(byte[] b) throws IOException
-  {
-    return read(b, 0, b.length);
-  }
-
-  public synchronized int read(byte[] b, int off, int len) throws IOException
-  {
-    if (closed)
-      return -1;
-
-    int totalread = 0;
-    int bytesread = 0;
-    try
-    {
-      do
-      {
-        if (chunkSize < 1L)
-        {
-          if (0l == getChunked())
-          {
-            if (totalread == 0)
-              return -1;
-            else
-              return totalread;
-          }
-        }
-        bytesread = in.read(b, off + totalread, Math.min(len - totalread, (int) Math.min(chunkSize, Integer.MAX_VALUE)));
-        if (bytesread > 0)
-        {
-          totalread += bytesread;
-          chunkSize -= bytesread;
-        }
-      }
-      while (len - totalread > 0 && bytesread > -1);
-    }
-    catch (IOException e)
-    {
-      closed = true;
-      throw e;
-    }
-    return totalread;
-  }
-
-  public long skip(final long n) throws IOException
-  {
-    if (closed)
-      return 0;
-    long skipped = 0l;
-    byte[] b = new byte[1024];
-    int bread = -1;
-    do
-    {
-      bread = read(b, 0, b.length);
-      if (bread > 0)
-        skipped += bread;
-    }
-    while (bread != -1 && skipped < n);
-    return skipped;
-  }
-
-  public int available() throws IOException
-  {
-    if (closed)
-      return 0;
-    int rc = (int) Math.min(chunkSize, Integer.MAX_VALUE);
-    return Math.min(rc, in.available());
-  }
-
-  protected long getChunked() throws IOException
-  {
-    //StringBuffer buf= new StringBuffer(1024);
-    byte[] buf = new byte[maxCharLong + 2];
-    int bufsz = 0;
-    chunkSize = -1L;
-    int c = -1;
-    do
-    {
-      c = in.read();
-      if (c > -1)
-      {
-        if (c != '\r' && c != '\n' && c != ' ' && c != '\t')
-        {
-          buf[bufsz++] = ((byte) c);
-        }
-      }
-    }
-    while (c > -1 && (c != '\n' || bufsz == 0) && bufsz < buf.length);
-    if (c < 0)
-    {
-      closed = true;
-    }
-    String sbuf = new String(buf, 0, bufsz);
-    if (bufsz > maxCharLong)
-    {
-      closed = true;
-      throw new IOException("Chunked input stream failed to receive valid chunk size:" + sbuf);
-    }
-    try
-    {
-      chunkSize = Long.parseLong(sbuf, 16);
-    }
-    catch (NumberFormatException ne)
-    {
-      closed = true;
-      throw new IOException("'" + sbuf + "' " + ne.getMessage());
-    }
-    if (chunkSize < 1L)
-      closed = true;
-    if (chunkSize != 0L && c < 0)
-    {
-      //If chunk size is zero try and be tolerant that there maybe no cr or lf
-      // at the end.
-      throw new IOException("HTTP Chunked stream closed in middle of chunk.");
-    }
-    if (chunkSize < 0L)
-      throw new IOException("HTTP Chunk size received " + chunkSize + " is less than zero.");
-    return chunkSize;
-  }
-
-  public void close() throws IOException
-  {
-    synchronized (this)
-    {
-      if (closed)
-        return;
-      closed = true;
-    }
-    byte[] b = new byte[1024];
-    int bread = -1;
-    do
-    {
-      bread = read(b, 0, b.length);
-    }
-    while (bread != -1);
-  }
-
-  /*
-   * public void mark(int readlimit)
-   * {
-   * }
-   */
-
-  public void reset() throws IOException
-  {
-    throw new IOException("Don't support marked streams");
-  }
-
-  public boolean markSupported()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.java
deleted file mode 100644
index 28588328d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPException.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.util.Map;
-
-public class HTTPException extends RuntimeException
-{
-  /**
-	 * Comment for <code>serialVersionUID</code>
-	 */
-	private static final long serialVersionUID = 3256438105900134961L;
-private int statusCode;
-  private String statusMessage;
-  private Map headers;
-  
-  public HTTPException(int statusCode, String statusMessage, Map headers)
-  {
-    super(statusMessage);
-    this.statusCode = statusCode;
-    this.statusMessage = statusMessage;
-    this.headers = headers;
-  }
-  
-  public int getStatusCode()
-  {
-    return statusCode;
-  }
-  
-  public String getStatusMessage()
-  {
-    return statusMessage;
-  }
-  
-  public Map getHeaders()
-  {
-    return headers;
-  }
-  
-  public String getHeader(String key)
-  {
-    Object value = headers.get(key);
-    if (value != null)
-      return value.toString();
-    else
-      return null;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
deleted file mode 100644
index 65b61afd4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPResponse.java
+++ /dev/null
@@ -1,91 +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.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-public class HTTPResponse
-{
-  private boolean statusSet;
-  private int statusCode;
-  private String statusMessage;
-  private Hashtable headers;
-  private byte[] payload;
-
-  public HTTPResponse()
-  {
-    reset();
-  }
-
-  public void reset()
-  {
-    statusSet = false;
-    statusCode = -1;
-    statusMessage = null;
-    if (headers != null)
-      headers.clear();
-    else
-      headers = new Hashtable();
-    payload = new byte[0];
-  }
-
-  public boolean isStatusSet()
-  {
-    return statusSet;
-  }
-
-  public int getStatusCode()
-  {
-    return statusCode;
-  }
-
-  public void setStatusCode(int statusCode)
-  {
-    statusSet = true;
-    this.statusCode = statusCode;
-  }
-
-  public String getStatusMessage()
-  {
-    return statusMessage;
-  }
-
-  public void setStatusMessage(String statusMessage)
-  {
-    this.statusMessage = statusMessage;
-  }
-
-  public void addHeader(String key, String value)
-  {
-    headers.put(key, value);
-  }
-
-  public String getHeader(String key)
-  {
-    return (String) headers.get(key);
-  }
-
-  public Map getHeaders()
-  {
-    return headers;
-  }
-
-  public byte[] getPayload()
-  {
-    return payload;
-  }
-
-  public void setPayload(byte[] payload)
-  {
-    this.payload = payload;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
deleted file mode 100644
index e35296562..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/transport/HTTPTransport.java
+++ /dev/null
@@ -1,494 +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.wst.ws.internal.explorer.platform.wsdl.transport;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils;
-
-import sun.misc.BASE64Encoder;
-
-import org.w3c.dom.Element;
-
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.Hashtable;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import javax.net.ssl.SSLSocketFactory;
-
-public class HTTPTransport
-{
-  private final String SYS_PROP_HTTPS_PROXY_HOST = "https.proxyHost";
-  private final String SYS_PROP_HTTPS_PROXY_PORT = "https.proxyPort";
-  private final String SYS_PROP_HTTP_PROXY_HOST = "http.proxyHost";
-  private final String SYS_PROP_HTTP_PROXY_PORT = "http.proxyPort";
-  private final String SYS_PROP_HTTP_PROXY_USER_NAME = "http.proxyUserName";
-  private final String SYS_PROP_HTTP_PROXY_PASSWORD = "http.proxyPassword";
-
-  private final String HTTP_METHOD = "POST";
-  private final String HTTP_VERSION = "HTTP/1.1";
-  private final String HTTP_HEADER_SOAP_ACTION = "SOAPAction";
-  public static final String HTTP_HEADER_AUTH = "Authorization";
-  public static final String HTTP_HEADER_WWW_AUTH = "WWW-Authenticate";
-  private final String HTTP_HEADER_PROXY_AUTH = "Proxy-authorization";
-  private final String HTTP_HEADER_COOKIE = "Cookie";
-  private final String HTTP_HEADER_COOKIE2 = "Cookie2";
-  private final String HTTP_HEADER_HOST = "Host";
-  private final String HTTP_HEADER_CONTENT_TYPE = "Content-Type";
-  public static final String HTTP_HEADER_CONTENT_LENGTH = "Content-Length";
-  private final String HTTP_HEADER_ACCEPT = "Accept";
-  private final String HTTP_HEADER_USER_AGENT = "User-Agent";
-  private final String HTTP_HEADER_CACHE_CONTROL = "Cache-Control";
-  private final String HTTP_HEADER_PRAGMA = "Pragma";
-  private final String HTTP_HEADER_TRANSFER_ENCODEING = "Transfer-Encoding";
-  private final String HTTP_HEADER_CONNECTION = "Connection";
-  
-  private final int HTTP_CODE_CONTINUE = 100;
-  //private final int HTTP_CODE_OK = 200;
-  private final int HTTP_CODE_EXCEPTION = 300;
-
-  private final String IBM_WEB_SERVICES_EXPLORER = "IBM Web Services Explorer";
-  private final String TEXT_XML = "text/xml";
-  private final String CONTENT_TYPE_VALUE = "text/xml; charset=utf-8";
-  private final String ACCEPT_VALUE = "application/soap+xml, application/dime, multipart/related, text/*";
-  public static final String BASIC = "Basic";
-  private final String NO_CACHE = "no-cache";
-  private final String CHUNKED = "chunked";
-  private final String CLOSE = "close";
-  private final String HTTPS = "https";
-  private final char QUOTE = '\"';
-  public static final char COLON = ':';
-  private final char SPACE = ' ';
-  private final char TAB = '\t';
-  private final char R = '\r';
-  private final char N = '\n';
-  private final char ROOT = '/';
-  private final String NEW_LINE = "\r\n";
-  private final String EMPTY_STRING = "";
-
-  private final int DEFAULT_HTTP_PORT = 80;
-  private final int DEFAULT_HTTPS_PORT = 443;
-  private final String DEFAULT_SOAP_ENCODING = "UTF-8";
-  private final String DEFAULT_HTTP_HEADER_ENCODING = "iso-8859-1";
-
-  private String httpBasicAuthUsername;
-  private String httpBasicAuthPassword;
-  private boolean maintainSession = false;
-  private String cookie;
-  private String cookie2;
-  private HTTPResponse httpResponse;
-
-  public String getHttpBasicAuthUsername()
-  {
-    return httpBasicAuthUsername;
-  }
-  
-  public void setHttpBasicAuthUsername(String httpBasicAuthUsername)
-  {
-    this.httpBasicAuthUsername = httpBasicAuthUsername;
-  }
-  
-  public String getHttpBasicAuthPassword()
-  {
-    return httpBasicAuthPassword;
-  }
-  
-  public void setHttpBasicAuthPassword(String httpBasicAuthPassword)
-  {
-    this.httpBasicAuthPassword = httpBasicAuthPassword;
-  }
-
-  private String getMethod(URL url)
-  {
-    StringBuffer sb = new StringBuffer(HTTP_METHOD);
-    sb.append(SPACE);
-    String httpProxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
-    String httpsProxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
-    if (httpProxyHost != null && httpProxyHost.length() > 0 && httpsProxyHost != null && httpsProxyHost.length() > 0)
-      sb.append(url.toString());
-    else
-    {
-      String file = url.getFile();
-      if (file != null && file.length() > 0)
-        sb.append(file);
-      else
-        sb.append(ROOT);
-    }
-    sb.append(SPACE);
-    sb.append(HTTP_VERSION);
-    sb.append(NEW_LINE);
-    return sb.toString();
-  }
-
-  private String getHost(URL url)
-  {
-    StringBuffer sb = new StringBuffer(HTTP_HEADER_HOST);
-    sb.append(COLON);
-    sb.append(SPACE);
-    sb.append(url.getHost());
-    sb.append(COLON);
-    int port = url.getPort();
-    if (port > 0)
-      sb.append(String.valueOf(port));
-    else if (url.getProtocol().equalsIgnoreCase(HTTPS))
-      sb.append(DEFAULT_HTTPS_PORT);
-    else
-      sb.append(DEFAULT_HTTP_PORT);
-    sb.append(NEW_LINE);
-    return sb.toString();
-  }
-  
-  private String getContentType()
-  {
-    return getHTTPHeader(HTTP_HEADER_CONTENT_TYPE, CONTENT_TYPE_VALUE);
-  }
-  
-  private String getContentLength(String payload)
-  {
-    return getHTTPHeader(HTTP_HEADER_CONTENT_LENGTH, String.valueOf(payload.length()));
-  }
-
-  private String getSOAPAction(String soapAction)
-  {
-    StringBuffer sb = new StringBuffer(HTTP_HEADER_SOAP_ACTION);
-    sb.append(COLON);
-    sb.append(SPACE);
-    sb.append(QUOTE);
-    if (soapAction != null)
-      sb.append(soapAction);
-    sb.append(QUOTE);
-    sb.append(NEW_LINE);
-    return sb.toString();
-  }
-  
-  private String getCookie()
-  {
-    if (maintainSession)
-      return getHTTPHeader(HTTP_HEADER_COOKIE, cookie);
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getCookie2()
-  {
-    if (maintainSession)
-      return getHTTPHeader(HTTP_HEADER_COOKIE2, cookie2);
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getWWWAuthentication()
-  {
-    if (httpBasicAuthUsername != null && httpBasicAuthPassword != null)
-    {
-      StringBuffer sb = new StringBuffer(httpBasicAuthUsername);
-      sb.append(COLON);
-      sb.append(httpBasicAuthPassword);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
-      sb.setLength(0);
-      sb.append(HTTP_HEADER_AUTH);
-      sb.append(COLON);
-      sb.append(SPACE);
-      sb.append(BASIC);
-      sb.append(SPACE);
-      sb.append(encodedUserNamePassword);
-      sb.append(NEW_LINE);
-      return sb.toString();
-    }
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getProxyAuthentication()
-  {
-    String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
-    String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
-    if (proxyUserName != null && proxyPassword != null)
-    {
-      StringBuffer sb = new StringBuffer(proxyUserName);
-      sb.append(COLON);
-      sb.append(proxyPassword);
-      BASE64Encoder encoder = new BASE64Encoder();
-      String encodedUserNamePassword = encoder.encode(sb.toString().getBytes());
-      sb.setLength(0);
-      sb.append(HTTP_HEADER_PROXY_AUTH);
-      sb.append(COLON);
-      sb.append(SPACE);
-      sb.append(BASIC);
-      sb.append(SPACE);
-      sb.append(encodedUserNamePassword);
-      sb.append(NEW_LINE);
-      return sb.toString();
-    }
-    else
-      return EMPTY_STRING;
-  }
-  
-  private String getAccept()
-  {
-    return getHTTPHeader(HTTP_HEADER_ACCEPT, ACCEPT_VALUE);
-  }
-  
-  private String getUserAgent()
-  {
-    return getHTTPHeader(HTTP_HEADER_USER_AGENT, IBM_WEB_SERVICES_EXPLORER);
-  }
-  
-  private String getCacheControl()
-  {
-    return getHTTPHeader(HTTP_HEADER_CACHE_CONTROL, NO_CACHE);
-  }
-  
-  private String getPragma()
-  {
-    return getHTTPHeader(HTTP_HEADER_PRAGMA, NO_CACHE);
-  }
-  
-  private String getConnection()
-  {
-    return getHTTPHeader(HTTP_HEADER_CONNECTION, CLOSE);
-  }
-  
-  private String getHTTPHeader(String key, String value)
-  {
-    if (value != null)
-    {
-      StringBuffer sb = new StringBuffer(key);
-      sb.append(COLON);
-      sb.append(SPACE);
-      sb.append(value);
-      sb.append(NEW_LINE);
-      return sb.toString();
-    }
-    else
-      return EMPTY_STRING;
-  }
-
-  public void send(URL url, String soapAction, String payload) throws UnknownHostException, IOException
-  {
-    StringBuffer httpHeader = new StringBuffer();
-    httpHeader.append(getMethod(url));
-    httpHeader.append(getHost(url));
-    httpHeader.append(getContentType());
-    httpHeader.append(getContentLength(payload));
-    httpHeader.append(getAccept());
-    httpHeader.append(getUserAgent());
-    httpHeader.append(getCacheControl());
-    httpHeader.append(getPragma());
-    httpHeader.append(getSOAPAction(soapAction));
-    httpHeader.append(getWWWAuthentication());
-    httpHeader.append(getProxyAuthentication());
-    httpHeader.append(getCookie());
-    httpHeader.append(getCookie2());
-    httpHeader.append(getConnection());
-    httpHeader.append(NEW_LINE); // new line between the HTTP header and the payload
-    Socket socket = buildSocket(url);
-    InputStream is = socket.getInputStream();
-    OutputStream os = socket.getOutputStream();
-    os.write(httpHeader.toString().getBytes(DEFAULT_HTTP_HEADER_ENCODING));
-    os.write(payload.getBytes(DEFAULT_SOAP_ENCODING));
-    os.flush();
-    httpResponse = new HTTPResponse();
-    readHTTPResponseHeader(is, httpResponse);
-    int code = httpResponse.getStatusCode();
-    if (code == HTTP_CODE_CONTINUE)
-    {
-      httpResponse.reset();
-      readHTTPResponseHeader(is, httpResponse);
-    }
-    readHTTPResponsePayload(is, httpResponse);
-    os.close();
-    is.close();
-    socket.close();
-    code = httpResponse.getStatusCode();
-    String contentType = httpResponse.getHeader(HTTP_HEADER_CONTENT_TYPE.toLowerCase());
-    if (code >= HTTP_CODE_EXCEPTION && (contentType == null || contentType.toLowerCase().indexOf(TEXT_XML.toLowerCase()) == -1))
-      throw new HTTPException(code, httpResponse.getStatusMessage(), httpResponse.getHeaders());
-  }
-
-  private void readHTTPResponseHeader(InputStream is, HTTPResponse resp) throws IOException
-  {
-    byte b = 0;
-    int len = 0;
-    int colonIndex = -1;
-    String key;
-    String value;
-    boolean readTooMuch = false;
-    ByteArrayOutputStream baos;
-    for (baos = new ByteArrayOutputStream(4096);;)
-    {
-      if (!readTooMuch)
-        b = (byte)is.read();
-      if (b == -1)
-        break;
-      readTooMuch = false;
-      if ((b != R) && (b != N))
-      {
-        if ((b == COLON) && (colonIndex == -1))
-          colonIndex = len;
-        len++;
-        baos.write(b);
-      }
-      else if (b == R)
-        continue;
-      else // b == N
-      {
-        if (len == 0)
-          break;
-        b = (byte)is.read();
-        readTooMuch = true;
-        // A space or tab at the begining of a line means the header continues.
-        if ((b == SPACE) || (b == TAB))
-          continue;
-        baos.close();
-        byte[] bArray = baos.toByteArray();
-        baos.reset();
-        if (colonIndex != -1)
-        {
-          key = new String(bArray, 0, colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
-          value = new String(bArray, colonIndex + 1, len - 1 - colonIndex, DEFAULT_HTTP_HEADER_ENCODING);
-          colonIndex = -1;
-        }
-        else
-        {
-          key = new String(bArray, 0, len, DEFAULT_HTTP_HEADER_ENCODING);
-          value = EMPTY_STRING;
-        }
-        if (!resp.isStatusSet())
-        {
-          // Reader status code
-          int start = key.indexOf(SPACE) + 1;
-          String s = key.substring(start).trim();
-          int end = s.indexOf(SPACE);
-          if (end != -1)
-            s = s.substring(0, end);
-          try
-          {
-            resp.setStatusCode(Integer.parseInt(s));
-          }
-          catch (NumberFormatException nfe)
-          {
-            resp.setStatusCode(-1);
-          }
-          resp.setStatusMessage(key.substring(start + end + 1));
-        }
-        else
-          resp.addHeader(key.toLowerCase().trim(), value.trim());
-        len = 0;
-      }
-    }
-    baos.close();
-  }
-
-  private void readHTTPResponsePayload(InputStream is, HTTPResponse resp) throws IOException
-  {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    try
-    {
-      byte b = (byte)is.read();
-      while (b != -1)
-      {
-        baos.write(b);
-        b = (byte)is.read();
-      }
-    }
-    catch (SocketTimeoutException ste)
-    {
-    }
-    baos.close();
-    resp.setPayload(baos.toByteArray());
-  }
-
-  public BufferedReader receive()
-  {
-    if (httpResponse != null)
-    {
-      try
-      {
-        byte[] payload = httpResponse.getPayload();
-        Element soapEnvelope = null;
-        if (CHUNKED.equalsIgnoreCase(httpResponse.getHeader(HTTP_HEADER_TRANSFER_ENCODEING.toLowerCase())))
-        {
-          ByteArrayInputStream bais = new ByteArrayInputStream(payload);
-          ChunkedInputStream cis = new ChunkedInputStream(bais);
-          ByteArrayOutputStream baos = new ByteArrayOutputStream();
-          byte b;
-          while ((b = (byte)cis.read()) != -1)
-            baos.write(b);
-          baos.close();
-          cis.close();
-          bais.close();
-          soapEnvelope = XMLUtils.byteArrayToElement(baos.toByteArray(), false);
-        }
-        else
-        {
-          soapEnvelope = XMLUtils.byteArrayToElement(payload, false);
-        }
-        // remove XML namespace declaration
-        if (soapEnvelope != null)
-          return new BufferedReader(new InputStreamReader(new ByteArrayInputStream(XMLUtils.serialize(soapEnvelope, true).getBytes(DEFAULT_SOAP_ENCODING))));
-      }
-      catch (Throwable t)
-      {
-      }
-    }
-    return null;
-  }
-
-  public Hashtable getHeaders()
-  {
-    Hashtable headers = new Hashtable();
-    if (httpResponse != null)
-      headers.putAll(httpResponse.getHeaders());
-    return headers;
-  }
-
-  private Socket buildSocket(URL url) throws UnknownHostException, IOException
-  {
-    Socket s = null;
-    String host = url.getHost();
-    int port = url.getPort();
-    String proxyHost = System.getProperty(SYS_PROP_HTTP_PROXY_HOST);
-    int proxyPort = Integer.getInteger(SYS_PROP_HTTP_PROXY_PORT, DEFAULT_HTTP_PORT).intValue();
-//    String proxyUserName = System.getProperty(SYS_PROP_HTTP_PROXY_USER_NAME);
-//    String proxyPassword = System.getProperty(SYS_PROP_HTTP_PROXY_PASSWORD);
-    if (url.getProtocol().equalsIgnoreCase(HTTPS))
-    {
-      proxyHost = System.getProperty(SYS_PROP_HTTPS_PROXY_HOST);
-      proxyPort = Integer.getInteger(SYS_PROP_HTTPS_PROXY_PORT, DEFAULT_HTTPS_PORT).intValue();
-      if (proxyHost != null && proxyHost.length() > 0)
-      {
-        // TODO:
-        // SSL with proxy server
-      }
-      else
-        s = SSLSocketFactory.getDefault().createSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT));
-      // Removing dependency on soap.jar
-      //  s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort);
-      // TODO:
-      // Build an SSL socket that supports proxyUser and proxyPassword,
-      // as demonstrated in the following (original) line of code:
-      //  s = SSLUtils.buildSSLSocket(host, (port > 0 ? port : DEFAULT_HTTPS_PORT), proxyHost, proxyPort, proxyUserName, proxyPassword);
-    }
-    else if (proxyHost != null && proxyHost.length() > 0)
-      s = new Socket(proxyHost, proxyPort);
-    else
-      s = new Socket(host, (port > 0 ? port : DEFAULT_HTTP_PORT));
-    return s;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
deleted file mode 100644
index 96259e20e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/util/SoapHelper.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.util;
-
-import org.eclipse.wst.ws.internal.explorer.platform.util.URLUtils;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.apache.axis.Constants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class SoapHelper
-{
-  private static Hashtable defaultSoapEnvelopeNamespaces_ = null;
-  
-  private static final void initDefaultSoapEnvelopeNamespaces()
-  {
-    defaultSoapEnvelopeNamespaces_ = new Hashtable();
-    defaultSoapEnvelopeNamespaces_.put(Constants.URI_SOAP11_ENV,Constants.NS_PREFIX_SOAP_ENV);
-    defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSI,Constants.NS_PREFIX_SCHEMA_XSI);
-    defaultSoapEnvelopeNamespaces_.put(Constants.URI_2001_SCHEMA_XSD,Constants.NS_PREFIX_SCHEMA_XSD);
-  }
-  
-  public static final void addDefaultSoapEnvelopeNamespaces(Hashtable soapEnvelopeNamespaces)
-  {
-    if (defaultSoapEnvelopeNamespaces_ == null)
-      initDefaultSoapEnvelopeNamespaces();
-    Enumeration defaultSoapEnvelopeNamespaceURIs = defaultSoapEnvelopeNamespaces_.keys();
-    while (defaultSoapEnvelopeNamespaceURIs.hasMoreElements())
-    {
-      String defaultSoapEnvelopeNamespaceURI = (String)defaultSoapEnvelopeNamespaceURIs.nextElement();
-      soapEnvelopeNamespaces.put(defaultSoapEnvelopeNamespaceURI,(String)defaultSoapEnvelopeNamespaces_.get(defaultSoapEnvelopeNamespaceURI));
-    }
-  }
-  
-  public static final boolean isDefaultSoapEnvelopeNamespace(String namespaceURI,String namespacePrefix)
-  {
-    if (defaultSoapEnvelopeNamespaces_ == null)
-      initDefaultSoapEnvelopeNamespaces();
-    if (defaultSoapEnvelopeNamespaces_.get(namespaceURI) != null)
-      return true;
-    return false;
-  }  
-  
-  public static final Element createSoapEnvelopeElement(Document doc,Hashtable soapEnvelopeNamespaceTable)
-  {
-    Element soapEnvelopeElement = doc.createElement("soapenv:Envelope");
-    Enumeration e = soapEnvelopeNamespaceTable.keys();
-    while (e.hasMoreElements())
-    {
-      String soapEnvelopeNamespaceURI = (String)e.nextElement();
-      StringBuffer soapEnvelopeNamespaceAttr = new StringBuffer("xmlns:");
-      soapEnvelopeNamespaceAttr.append((String)soapEnvelopeNamespaceTable.get(soapEnvelopeNamespaceURI));
-      soapEnvelopeElement.setAttribute(soapEnvelopeNamespaceAttr.toString(),soapEnvelopeNamespaceURI);      
-    }    
-    return soapEnvelopeElement;
-  }
-  
-  public static final Element createSoapBodyElement(Document doc)
-  {
-    return doc.createElement("soapenv:Body");
-  }
-  
-  public static final Element createRPCWrapperElement(Document doc,Hashtable soapEnvelopeNamespaceTable,String encodingNamespaceURI,String operationName, String encodingStyle)
-  {
-    int nsId = 0;
-    StringBuffer wrapperElementName = new StringBuffer();
-    String encodingNamespacePrefix = (String)soapEnvelopeNamespaceTable.get(encodingNamespaceURI);
-    if (encodingNamespacePrefix != null)
-      wrapperElementName.append(encodingNamespacePrefix);
-    else
-    {
-      // Loop until we generate a unique prefix.
-      do
-      {
-        wrapperElementName.setLength(0);
-        wrapperElementName.append("ns").append(nsId);
-        if (!soapEnvelopeNamespaceTable.containsValue(wrapperElementName.toString()))
-          break;
-        nsId++;
-      } while (true);
-    }    
-    String wrapperElementNamePrefix = wrapperElementName.toString();
-    wrapperElementName.append(':').append(operationName);
-    Element wrapperElement = doc.createElement(wrapperElementName.toString());
-    StringBuffer namespaceAttrName = new StringBuffer("xmlns:");
-    namespaceAttrName.append(wrapperElementNamePrefix);
-    wrapperElement.setAttribute(namespaceAttrName.toString(),encodingNamespaceURI);
-    if (encodingStyle != null)
-      wrapperElement.setAttribute("soapenv:encodingStyle",encodingStyle);
-    return wrapperElement;
-  }
-
-  public static final String encodeNamespaceDeclaration(String prefix, String uri)
-  {
-    StringBuffer sb = new StringBuffer();
-    sb.append(prefix);
-    sb.append(" ");
-    sb.append(uri);
-    String result = URLUtils.encode(sb.toString());
-    return result;
-  }
-
-  public static final String[] decodeNamespaceDeclaration(String s)
-  {
-    String sCopy = URLUtils.decode(s);
-    int index = sCopy.indexOf(" ");
-    String[] nsDecl = new String[2];
-    if (index != -1)
-    {
-      nsDecl[0] = sCopy.substring(0, index);
-      nsDecl[1] = sCopy.substring(index+1, sCopy.length());
-    }
-    else
-    {
-      nsDecl[0] = null;
-      nsDecl[1] = sCopy;
-    }
-    return nsDecl;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
deleted file mode 100644
index 47b452dc1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsdl/xsd/WSDLPartsToXSDTypeMapper.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsdl.xsd;
-
-import org.eclipse.xsd.*;
-
-import javax.xml.namespace.QName;
-import javax.wsdl.*;
-
-import java.util.*;
-
-public class WSDLPartsToXSDTypeMapper
-{
-  private final char POUND = '#';
-  private Vector xsdSchemaList_;
-  private Hashtable partToXSDCache_;
-
-  public WSDLPartsToXSDTypeMapper() {
-    xsdSchemaList_ = new Vector();
-    partToXSDCache_ = new Hashtable();
-  }
-
-  public void addSchemas(Vector schemaList) {
-    for (int i=0;i<schemaList.size();i++) {
-      Object schema = schemaList.elementAt(i);
-      if (schema != null)
-        xsdSchemaList_.addElement(schema);
-    }
-  }
-
-  public XSDNamedComponent getXSDType(Part part, String id) {
-    XSDNamedComponent component = getXSDTypeFromCache(id);
-    if (component != null)
-      return component;
-    component = getXSDTypeFromSchema(part);
-    if (component != null)
-      addToCache(id, component);
-    return component;
-  }
-
-  public XSDNamedComponent getXSDTypeFromCache(String id) {
-    return (XSDNamedComponent)partToXSDCache_.get(id);
-  }
-
-  public XSDNamedComponent getXSDTypeFromSchema(Part part) {
-    boolean isElementDeclaration = (part.getTypeName() == null);
-    QName qName = isElementDeclaration ? part.getElementName() : part.getTypeName();
-    return getXSDTypeFromSchema(qName.getNamespaceURI(), qName.getLocalPart(), isElementDeclaration);
-  }
-
-  public XSDNamedComponent getXSDTypeFromSchema(String namespaceURI, String localName, boolean isElementDeclaration) {
-    for (int i = 0; i < xsdSchemaList_.size(); i++) {
-      XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
-      Vector components = new Vector();
-      if (isElementDeclaration)
-        components.addAll(xsdSchema.getElementDeclarations());
-      else
-        components.addAll(xsdSchema.getTypeDefinitions());
-      for (Iterator it = components.iterator(); it.hasNext(); ) {
-        XSDNamedComponent component  = (XSDNamedComponent)it.next();
-        String compNSURI = component.getTargetNamespace();
-        String compLocalname = component.getName();
-        if (compNSURI != null && compLocalname != null && compNSURI.equals(namespaceURI) && compLocalname.equals(localName))
-          return component;
-      }
-    }
-    return null;
-  }
-
-  public XSDNamedComponent resolveXSDNamedComponent(XSDNamedComponent component)
-  {
-    if (component != null)
-    {
-      String uri = component.getURI();
-      String qname = component.getQName();
-      for (int i = 0; i < xsdSchemaList_.size(); i++)
-      {
-        XSDSchema xsdSchema = (XSDSchema)xsdSchemaList_.elementAt(i);
-        if (xsdSchema != null)
-        {
-          String targetNS = xsdSchema.getTargetNamespace();
-          if (targetNS != null && targetNS.equals(trimQName(uri, qname)))
-          {
-            XSDNamedComponent resolvedComponent = null;
-            if (component instanceof XSDTypeDefinition)
-              resolvedComponent = xsdSchema.resolveTypeDefinition(qname);
-            else if (component instanceof XSDElementDeclaration)
-              resolvedComponent = xsdSchema.resolveElementDeclaration(qname);
-            else if (component instanceof XSDModelGroupDefinition)
-              resolvedComponent = xsdSchema.resolveModelGroupDefinition(qname);
-            if (isComponentResolvable(resolvedComponent))
-              return resolvedComponent;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  private String trimQName(String uri, String qname)
-  {
-    int index = uri.indexOf(qname);
-    if (index != -1)
-    {
-      String ns = uri.substring(0, index);
-      if (ns.charAt(index-1) == POUND)
-        return ns.substring(0, index-1);
-      else
-        return ns;
-    }
-    else
-      return uri;
-  }
-
-  private void addToCache(String id, XSDNamedComponent component) {
-    partToXSDCache_.put(id,component);
-  }
-
-  protected boolean isComponentResolvable(XSDComponent component)
-  {
-    if (component == null)
-      return false;
-    XSDSchema schema = component.getSchema();
-    if (schema == null)
-      return false;
-    if (schema.getTargetNamespace() == null)
-      return false;
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
deleted file mode 100644
index 589481a5c..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToFavoritesAction.java
+++ /dev/null
@@ -1,94 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class AddBusinessToFavoritesAction extends AddToFavoritesAction
-{
-  public AddBusinessToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
-    WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
-    String businessName = wsilUddiBusinessElement.getName();
-    String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
-    String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
-    if (businessName == null)
-      businessName = businessKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    return favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDILinks().getElementWithViewId(viewID).getObject();
-    WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) obj;
-    String businessName = wsilUddiBusinessElement.getName();
-    String inquiryAPI = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
-    String businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
-    if (businessName == null)
-      businessName = businessKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_NAME, businessName);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_BUSINESS_KEY, businessKey);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", businessName));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_BUSINESS_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", businessName));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", businessName));
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
deleted file mode 100644
index 22b34b0b9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddBusinessToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,89 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindBusinessUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class AddBusinessToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddBusinessToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String inquiryURL = null;
-    String businessKey = null;
-    String businessName = null;
-    if (selectedElement instanceof WsilElement)
-    {
-      ListElement le = ((WsilElement) selectedElement).getAllUDDILinks().getElementWithViewId(viewID);
-      WsilUddiBusinessElement wsilUddiBusinessElement = (WsilUddiBusinessElement) le.getObject();
-      inquiryURL = wsilUddiBusinessElement.getUDDILinkInquiryAPI();
-      businessKey = wsilUddiBusinessElement.getUDDILinkBusinessKey();
-      businessName = wsilUddiBusinessElement.getName();
-      if (businessName == null)
-        businessName = businessKey;
-    }
-    else
-      return false;
-    // return false if unable to find or create a registry node/element in the
-    // UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", businessName));
-      return false;
-    }
-    // prepare the action
-    RegFindBusinessUUIDAction action = new RegFindBusinessUUIDAction(controller_);
-    // populate property table
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_BUSINESS_KEY, businessKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, businessName);
-    // run the action
-    if (!action.run())
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", businessName));
-      return false;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", businessName));
-      return true;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
deleted file mode 100644
index b79d4e1e0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToFavoritesAction.java
+++ /dev/null
@@ -1,94 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class AddServiceToFavoritesAction extends AddToFavoritesAction
-{
-  public AddServiceToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
-    WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
-    String serviceName = wsilUddiServiceElement.getName();
-    String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
-    String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
-    if (serviceName == null)
-      serviceName = serviceKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
-    return favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    Object obj = selectedElement.getAllUDDIServices().getElementWithViewId(viewID).getObject();
-    WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) obj;
-    String serviceName = wsilUddiServiceElement.getName();
-    String inquiryAPI = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
-    String serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
-    if (serviceName == null)
-      serviceName = serviceKey;
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_NAME, serviceName);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_INQUIRY_API, inquiryAPI);
-    table.put(FavoritesModelConstants.PROP_UDDI_SERVICE_KEY, serviceKey);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", serviceName));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_UDDI_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", serviceName));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", serviceName));
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
deleted file mode 100644
index 621f73d71..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddServiceToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,89 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.RegFindServiceUUIDAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class AddServiceToUDDIPerspectiveAction extends AddToUDDIPerspectiveAction
-{
-  public AddServiceToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    String inquiryURL = null;
-    String serviceKey = null;
-    String serviceName = null;
-    if (selectedElement instanceof WsilElement)
-    {
-      ListElement le = ((WsilElement) selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
-      WsilUddiServiceElement wsilUddiServiceElement = (WsilUddiServiceElement) le.getObject();
-      inquiryURL = wsilUddiServiceElement.getUDDIServiceInquiryAPI();
-      serviceKey = wsilUddiServiceElement.getUDDIServiceKey();
-      serviceName = wsilUddiServiceElement.getName();
-      if (serviceName == null)
-        serviceName = serviceKey;
-    }
-    else
-      return false;
-    // return false if unable to find or create a registry node/element in the
-    // UDDI perspective
-    if (!createRegistryInUDDIPerspective(inquiryURL, null, inquiryURL))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_UDDI_PERSPECTIVE", serviceName));
-      return false;
-    }
-    // prepare the action
-    RegFindServiceUUIDAction action = new RegFindServiceUUIDAction(controller_);
-    // populate property table
-    Hashtable propertyTable = action.getPropertyTable();
-    propertyTable.put(UDDIActionInputs.QUERY_INPUT_UUID_SERVICE_KEY, serviceKey);
-    propertyTable.put(UDDIActionInputs.QUERY_NAME, serviceName);
-    // run the action
-    if (!action.run())
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", serviceName));
-      return false;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_UDDI_PERSPECTIVE_SUCCESSFUL", serviceName));
-      return true;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
deleted file mode 100644
index 9808c3ff8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToFavoritesAction.java
+++ /dev/null
@@ -1,93 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.datamodel.FavoritesFolderElement;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.perspective.FavoritesPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import javax.servlet.http.*;
-
-public abstract class AddToFavoritesAction extends MultipleLinkAction {
-    protected NodeManager nodeManager_;
-
-    public AddToFavoritesAction(Controller controller)
-    {
-        super(controller);
-        nodeManager_ = controller.getWSILPerspective().getNodeManager();
-    }
-
-    public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-    {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.TOOLID);
-        actionLink.append('=');
-        actionLink.append(toolID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWID);
-        actionLink.append('=');
-        actionLink.append(viewID);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.VIEWTOOLID);
-        actionLink.append('=');
-        actionLink.append(viewToolID);
-        return actionLink.toString();
-    }
-
-    public static String getBaseActionLink() {
-        return "wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp";
-    }
-
-    public static AddToFavoritesAction newAction(HttpServletRequest request, Controller controller) {
-      String nodeID = request.getParameter(ActionInputs.NODEID);
-      NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-      Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
-      if (selectedTool instanceof ListWSDLServicesTool)
-        return new AddWSDLServiceToFavoritesAction(controller);
-      else if (selectedTool instanceof ListUDDIServicesTool)
-        return new AddServiceToFavoritesAction(controller);
-      else if (selectedTool instanceof ListUDDIBusinessTool)
-        return new AddBusinessToFavoritesAction(controller);
-      else
-        return new AddWSILToFavoritesAction(controller);
-    }
-
-    protected boolean addToFavorites(Hashtable table, String rel) {
-        FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-        NodeManager favNodeManager = favPerspective.getNodeManager();
-        TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-        Enumeration e = favRootElement.getElements(rel);
-        if (!e.hasMoreElements()) return false;
-        FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-        return favFolderElement.addFavorite(table);
-    }
-
-    protected boolean favoriteExists(Hashtable table, String rel) {
-        FavoritesPerspective favPerspective = controller_.getFavoritesPerspective();
-        NodeManager favNodeManager = favPerspective.getNodeManager();
-        TreeElement favRootElement = favNodeManager.getRootNode().getTreeElement();
-        Enumeration e = favRootElement.getElements(rel);
-        if (!e.hasMoreElements()) return false;
-        FavoritesFolderElement favFolderElement = (FavoritesFolderElement)e.nextElement();
-        return favFolderElement.favoriteExists(table);
-    }
-
-    public abstract boolean favoriteExists();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
deleted file mode 100644
index a3572247b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddToUDDIPerspectiveAction.java
+++ /dev/null
@@ -1,125 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.actions.OpenRegistryAction;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.constants.UDDIActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.datamodel.RegistryElement;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.RegistryNode;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.perspective.UDDIMainNode;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-import java.util.Hashtable;
-import java.util.Vector;
-import javax.servlet.http.*;
-
-public abstract class AddToUDDIPerspectiveAction extends MultipleLinkAction
-{
-  public AddToUDDIPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp";
-  }
-
-  public static Action newAction(HttpServletRequest request, Controller controller)
-  {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-    Tool selectedTool = nodeManager.getNode(Integer.parseInt(nodeID)).getToolManager().getSelectedTool();
-    if (selectedTool instanceof ListUDDIServicesTool)
-      return new AddServiceToUDDIPerspectiveAction(controller);
-    else if (selectedTool instanceof ListUDDIBusinessTool)
-      return new AddBusinessToUDDIPerspectiveAction(controller);
-    else
-      return new NullAction();
-  }
-
-  protected boolean createRegistryInUDDIPerspective(String inquiryAPI, String publishAPI, String registryName)
-  {
-    Vector registryNodes = getRegistryNodesByInquiryURL(inquiryAPI);
-    if (registryNodes != null)
-    {
-      // Always attempt to use an existing registry.
-      Node registryNode = (Node) registryNodes.elementAt(0);
-      NodeManager nodeManager = registryNode.getNodeManager();
-      nodeManager.setSelectedNodeId(registryNode.getNodeId());
-      return true;
-    }
-    // open the registry if it is not already opened in the UDDI perspective
-    OpenRegistryAction openRegAction = new OpenRegistryAction(controller_);
-    // populate the property table
-    Hashtable propertyTable = openRegAction.getPropertyTable();
-    if (Validator.validateString(registryName))
-      propertyTable.put(UDDIActionInputs.REGISTRY_NAME, registryName);
-    else
-      return false;
-    if (Validator.validateURL(inquiryAPI))
-      propertyTable.put(UDDIActionInputs.INQUIRY_URL, inquiryAPI);
-    else
-      return false;
-    // run the action
-    if (!openRegAction.run())
-      return false;
-    return true;
-  }
-
-  protected Vector getRegistryNodesByInquiryURL(String inquiryURL)
-  {
-    Vector registryNodes = null;
-    NodeManager navigatorManager = controller_.getUDDIPerspective().getNavigatorManager();
-    UDDIMainNode uddiMainNode = (UDDIMainNode) (navigatorManager.getRootNode());
-    Vector childNodes = uddiMainNode.getChildNodes();
-    for (int i = 0; i < childNodes.size(); i++)
-    {
-      Node childNode = (Node) childNodes.elementAt(i);
-      if (childNode instanceof RegistryNode)
-      {
-        RegistryElement regElement = (RegistryElement) childNode.getTreeElement();
-        if (regElement.getInquiryURL().equals(inquiryURL))
-        {
-          if (registryNodes == null)
-            registryNodes = new Vector();
-          registryNodes.addElement(childNode);
-        }
-      }
-    }
-    return registryNodes;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
deleted file mode 100644
index 9fa0a0f4e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSDLServiceToFavoritesAction.java
+++ /dev/null
@@ -1,82 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class AddWSDLServiceToFavoritesAction extends AddToFavoritesAction
-{
-  public AddWSDLServiceToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    String wsdlURL = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
-    return favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
-    return transformers;
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    String wsdlURL = getWsdlUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSDL_URL, wsdlURL);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsdlURL));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_WSDL_SERVICE_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsdlURL));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsdlURL));
-      return false;
-    }
-  }
-
-  private String getWsdlUrl()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    WsilWsdlServiceElement wsilWsdlServiceElement;
-    Object obj = selectedElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
-    wsilWsdlServiceElement = (WsilWsdlServiceElement) obj;
-    return wsilWsdlServiceElement.getWSDLServiceURL();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
deleted file mode 100644
index bb622d690..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/AddWSILToFavoritesAction.java
+++ /dev/null
@@ -1,66 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.favorites.constants.FavoritesModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-import java.util.Hashtable;
-
-public class AddWSILToFavoritesAction extends AddToFavoritesAction
-{
-  public AddWSILToFavoritesAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean favoriteExists()
-  {
-    String wsilURL = getWsilUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
-    return favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE);
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    String wsilURL = getWsilUrl();
-    Hashtable table = new Hashtable();
-    table.put(FavoritesModelConstants.PROP_WSIL_URL, wsilURL);
-    if (isMultipleLinkAction() && favoriteExists(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_FAVORITES_ALREADY_EXISTS", wsilURL));
-      return false;
-    }
-    if (addToFavorites(table, FavoritesModelConstants.REL_WSIL_FOLDER_NODE))
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_TO_FAVORITES_SUCCESSFUL", wsilURL));
-      return true;
-    }
-    else
-    {
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_TO_FAVORITES", wsilURL));
-      return false;
-    }
-  }
-
-  private String getWsilUrl()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement selectedElement = (WsilElement) selectedNode.getTreeElement();
-    return selectedElement.getWsilUrl();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
deleted file mode 100644
index 3615086cc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ClearWSILAction.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ClearNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class ClearWSILAction extends ClearNodeAction {
-
-    public ClearWSILAction(Controller controller)
-    {
-        super(controller, controller.getWSILPerspective().getNodeManager());
-        propertyTable_.put(ActionInputs.NODEID, String.valueOf(controller.getWSILPerspective().getNodeManager().getSelectedNodeId()));
-    }
-
-    public static String getActionLink(int nodeID)
-    {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/ClearWSILActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        return actionLink.toString();
-    }
-
-    public String getTreeContentVar() {
-        return "wsilNavigatorContent";
-    }
-
-    public String getTreeContentPage() {
-        return "wsil/wsil_navigator_content.jsp";
-    }
-
-    public String getPropertiesContainerVar() {
-        return "wsilPropertiesContainer";
-    }
-
-    public String getPropertiesContainerPage() {
-        return "wsil/wsil_properties_container.jsp";
-    }
-
-    public String getStatusContentVar() {
-        return "wsilStatusContent";
-    }
-
-    public String getStatusContentPage() {
-        return "wsil/wsil_status_content.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
deleted file mode 100644
index f6e63c7c7..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSDLToFileSystemAction.java
+++ /dev/null
@@ -1,147 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-import java.io.OutputStream;
-import javax.wsdl.Definition;
-import org.uddi4j.client.UDDIProxy;
-
-public class ImportWSDLToFileSystemAction extends ImportToFileSystemAction
-{
-  private Definition def_;
-  private String wsdlFileName_;
-  private NodeManager nodeManager_;
-
-  public ImportWSDLToFileSystemAction(Controller controller)
-  {
-    super(controller);
-    nodeManager_ = controller.getWSILPerspective().getNodeManager();
-  }
-
-  public static final String getActionLink(int nodeId, int toolId, int viewId, int viewToolId)
-  {
-    return ImportToFileSystemAction.getActionLink(nodeId, toolId, viewId, viewToolId, "wsil/actions/ImportWSDLToFileSystemActionJSP.jsp");
-  }
-
-  public boolean write(OutputStream os)
-  {
-    if (def_ != null)
-    {
-      return writeWSDLDefinition(os, def_);
-    }
-    else
-    {
-      return false;
-    }
-  }
-
-  public String getDefaultFileName()
-  {
-    return wsdlFileName_;
-  }
-
-  private boolean getWSDLFromURL()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-    ListManager wsilServices = wsilElement.getAllWSDLServices();
-    ListElement le = wsilServices.getElementWithViewId(viewID);
-    WsilWsdlServiceElement service = (WsilWsdlServiceElement)le.getObject();
-    String wsdlURL = service.getWSDLServiceURL();
-    wsdlFileName_ = WSDLFileNameHelper.getWSDLFileName(wsdlURL);
-    try
-    {
-      def_ = (new Uddi4jHelper()).getWSDLDefinition(wsdlURL);
-    }
-    catch (Exception e)
-    {
-      WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-      wsilPerspective.getMessageQueue().addMessage(e.getMessage());
-      return false;
-    }
-    return true;
-  }
-
-  private boolean getWSDLFromUDDIRegistry()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String)propertyTable_.get(ActionInputs.VIEWID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    WsilElement wsilElement = (WsilElement)selectedNode.getTreeElement();
-    ListManager wsilServices = wsilElement.getAllUDDIServices();
-    ListElement le = wsilServices.getElementWithViewId(viewID);
-    WsilUddiServiceElement service = (WsilUddiServiceElement)le.getObject();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    wsdlFileName_ = service.getName() + ".wsdl";
-    Uddi4jHelper uddi4jHelper = new Uddi4jHelper();
-    try
-    {
-      UDDIProxy proxy = null;
-      String inquiryURL = service.getUDDIServiceInquiryAPI();
-      if (inquiryURL != null)
-      {
-        proxy = new UDDIProxy();
-        proxy.setInquiryURL(inquiryURL);
-      }
-      def_ = uddi4jHelper.getWSDLDefinition(uddi4jHelper.getWSDL(service.getServiceDefinition(), proxy));
-    }
-    catch (Exception e)
-    {
-      // the wsdl representing this service is unreachable through the UDDI
-      // registry. We will try using the discovery URL instead.
-      try
-      {
-        def_ = uddi4jHelper.getWSDLDefinition(service.getUDDIServiceDiscoveryURL());
-        return true;
-      }
-      catch (Exception e2)
-      {
-      }
-      // if the discoveryURL also fails, return an error
-      wsilPerspective.getMessageQueue().addMessage(e.getMessage());
-      return false;
-    }
-    return true;
-  }
-
-  public boolean run()
-  {
-    int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-    if (selectedTool instanceof ListWSDLServicesTool)
-      return getWSDLFromURL();
-    else if (selectedTool instanceof ListUDDIServicesTool)
-      return getWSDLFromUDDIRegistry();
-    else
-      return false;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getWSILPerspective().getStatusContentVar();
-  }
-
-  public final String getStatusContentPage()
-  {
-    return controller_.getWSILPerspective().getStatusContentPage();
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
deleted file mode 100644
index 14ed0c31b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ImportWSILToFileSystemAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-
-import org.apache.wsil.WSILDocument;
-import java.io.OutputStream;
-
-public class ImportWSILToFileSystemAction extends ImportToFileSystemAction {
-    private WSILDocument wsilDoc_;
-    private WsilElement wsilElement_;
-    private NodeManager nodeManager_;
-
-    public ImportWSILToFileSystemAction(Controller controller) {
-        super(controller);
-        nodeManager_ = controller.getWSILPerspective().getNodeManager();
-    }
-
-    public static final String getActionLink(int nodeId,int toolId,int viewId,int viewToolId)
-    {
-      return ImportToFileSystemAction.getActionLink(nodeId,toolId,viewId,viewToolId,"wsil/actions/ImportWSILToFileSystemActionJSP.jsp");
-    }
-
-    public boolean write(OutputStream os) {
-        if (wsilDoc_ != null) {
-            return writeWSILDocument(os, wsilDoc_);
-        }
-        else {
-            return false;
-        }
-    }
-
-    public String getDefaultFileName() {
-        String wsilFileName = wsilElement_.getWsilUrl();
-        return wsilFileName.substring(wsilFileName.lastIndexOf('/') + 1, wsilFileName.length());
-    }
-
-    public boolean run() {
-        int nodeID = Integer.parseInt((String)propertyTable_.get(ActionInputs.NODEID));
-
-        Node selectedNode = nodeManager_.getNode(nodeID);
-        TreeElement selectedElement = selectedNode.getTreeElement();
-        if (selectedElement instanceof WsilElement) {
-            wsilElement_ = (WsilElement)selectedElement;
-            wsilDoc_ = ((WsilElement)selectedElement).getWSILDocument();
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getWSILPerspective().getStatusContentVar();
-    }
-
-    public final String getStatusContentPage()
-    {
-      return controller_.getWSILPerspective().getStatusContentPage();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
deleted file mode 100644
index b2b89c441..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/MultipleLinkAction.java
+++ /dev/null
@@ -1,105 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-
-import javax.servlet.http.*;
-
-public abstract class MultipleLinkAction extends LinkAction
-{
-  public MultipleLinkAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processLinkParameters(HttpServletRequest request)
-  {
-    String isMultipleLinkAction = request.getParameter(WsilActionInputs.MULTIPLE_LINK_ACTION);
-    if (isMultipleLinkAction != null)
-    {
-      propertyTable_.put(WsilActionInputs.MULTIPLE_LINK_ACTION, isMultipleLinkAction);
-      return processMultipleLinkActionParameters(request);
-    }
-    else
-    {
-      propertyTable_.remove(WsilActionInputs.MULTIPLE_LINK_ACTION);
-      String nodeIDString = request.getParameter(ActionInputs.NODEID);
-      String toolIDString = request.getParameter(ActionInputs.TOOLID);
-      String viewIDString = request.getParameter(ActionInputs.VIEWID);
-      String viewToolIDString = request.getParameter(ActionInputs.VIEWTOOLID);
-      if (nodeIDString != null)
-        propertyTable_.put(ActionInputs.NODEID, nodeIDString);
-      if (toolIDString != null)
-        propertyTable_.put(ActionInputs.TOOLID, toolIDString);
-      if (viewIDString != null)
-        propertyTable_.put(ActionInputs.VIEWID, viewIDString);
-      if (viewToolIDString != null)
-        propertyTable_.put(ActionInputs.VIEWTOOLID, viewToolIDString);
-      return true;
-    }
-  }
-
-  protected boolean processMultipleLinkActionParameters(HttpServletRequest request)
-  {
-    String nodeID = request.getParameter(ActionInputs.NODEID);
-    String[] viewIDs = request.getParameterValues(ActionInputs.VIEWID);
-    propertyTable_.put(ActionInputs.NODEID, nodeID);
-    propertyTable_.put(ActionInputs.VIEWID, viewIDs);
-    if (viewIDs.length == 0)
-      return false;
-    else
-      return true;
-  }
-  
-  protected boolean isMultipleLinkAction()
-  {
-    return propertyTable_.containsKey(WsilActionInputs.MULTIPLE_LINK_ACTION);
-  }
-  
-  protected String[] getViewIds()
-  {
-    Object object = propertyTable_.get(ActionInputs.VIEWID);
-    if (object == null)
-      return new String[0];
-    else if (object.getClass().isArray())
-      return (String[])object;
-    else
-      return new String[] {(String)object};
-  }
-
-  public boolean run()
-  {
-    return (isMultipleLinkAction()) ? executeMultipleLinkAction() : executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    boolean result = false;
-    String[] viewIds = getViewIds();
-    if (viewIds != null && viewIds.length > 0)
-    {
-      for (int i = 0; i < viewIds.length; i++)
-      {
-        propertyTable_.put(ActionInputs.VIEWID, viewIds[i]);
-        if (executeSingleLinkAction())
-          result = true;
-      }
-    }
-    propertyTable_.put(ActionInputs.VIEWID, viewIds);
-    return result;
-  }
-
-  protected abstract boolean executeSingleLinkAction();
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
deleted file mode 100644
index ce471544b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/NullAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-
-import javax.servlet.http.*;
-
-public class NullAction extends Action
-{
-  public NullAction()
-  {
-  }
-
-  public boolean populatePropertyTable(HttpServletRequest request)
-  {
-    return true;
-  }
-
-  public boolean run()
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
deleted file mode 100644
index e384f80b9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILAction.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.FormAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataException;
-import org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-import org.apache.wsil.WSILDocument;
-
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Iterator;
-
-public class OpenWSILAction extends FormAction
-{
-
-  public OpenWSILAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String wsilURL = parser.getParameter(WsilActionInputs.WSIL_URL);
-    String inspectionType = parser.getParameter(WsilActionInputs.WSIL_INSPECTION_TYPE);
-    FormTool formTool = getSelectedFormTool();
-    propertyTable_.put(WsilActionInputs.WSIL_URL, wsilURL);
-    if (inspectionType != null && inspectionType.length() > 0)
-      propertyTable_.put(WsilActionInputs.WSIL_INSPECTION_TYPE, inspectionType);
-    formTool.updatePropertyTable(propertyTable_);
-    return true;
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-  }
-
-  public boolean run()
-  {
-    String wsilURL = (String)propertyTable_.get(WsilActionInputs.WSIL_URL);
-    int inspectionType = Integer.parseInt((String)propertyTable_.get(WsilActionInputs.WSIL_INSPECTION_TYPE));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue msgQueue = wsilPerspective.getMessageQueue();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement root = rootNode.getTreeElement();
-    WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
-    if (wsilElement == null)
-    {
-      WebServicesParserExt parser = new WebServicesParserExt(wsilURL);
-      try
-      {
-        parser.parse(WebServicesParser.PARSE_NONE);
-        WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(wsilURL);
-        int type = wsEntity.getType();
-        if (type == WebServiceEntity.TYPE_HTML)
-          return openHTML(wsEntity.getChildren(), inspectionType);
-        else if (type == WebServiceEntity.TYPE_WSIL)
-          return openWSIL(wsilURL, parser.getWSILDocument(wsilURL), inspectionType);
-        else
-          msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_INVALID_WSIL_URL", wsilURL));
-      }
-      catch (Throwable t)
-      {
-        msgQueue.addMessage(t.getMessage());
-      }
-      return false;
-    }
-    else
-    {
-      preselectWSILNode(nodeManager, rootNode.getChildNode(wsilElement).getNodeId(), inspectionType);
-      msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
-      return true;
-    }
-  }
-
-  private boolean openHTML(List wsils, int inspectionType)
-  {
-    int nodeId = -1;
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue msgQueue = wsilPerspective.getMessageQueue();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement root = rootNode.getTreeElement();
-    for (Iterator it = wsils.iterator(); it.hasNext();)
-    {
-      WebServiceEntity wsilEntity = (WebServiceEntity)it.next();
-      String wsilURL = wsilEntity.getURI();
-      WsilElement wsilElement = getOpenedWSIL(root, wsilURL);
-      if (wsilElement == null)
-      {
-        try
-        {
-          WSILDocument wsilDoc = WSILDocument.newInstance();
-          wsilDoc.read(wsilURL);
-          wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
-          root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
-          nodeId = rootNode.getChildNode(wsilElement).getNodeId();
-          msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
-        }
-        catch (Throwable t)
-        {
-          msgQueue.addMessage(t.getMessage());
-        }
-      }
-      else
-      {
-        msgQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_ALREADY_OPENED", wsilURL));
-        nodeId = rootNode.getChildNode(wsilElement).getNodeId();
-      }
-    }
-    if (nodeId != -1)
-    {
-      preselectWSILNode(nodeManager, nodeId, inspectionType);
-      return true;
-    }
-    else
-      return false;
-  }
-
-  private boolean openWSIL(String wsilURL, WSILDocument wsilDoc, int inspectionType)
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue msgQueue = wsilPerspective.getMessageQueue();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node rootNode = nodeManager.getRootNode();
-    TreeElement root = rootNode.getTreeElement();
-    WsilElement wsilElement = new WsilElement(wsilURL, root.getModel(), wsilDoc, wsilURL);
-    root.connect(wsilElement, WsilModelConstants.REL_WSIL, ModelConstants.REL_OWNER);
-    int nodeId = rootNode.getChildNode(wsilElement).getNodeId();
-    msgQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_OPEN_WSIL_SUCCESSFUL", wsilURL));
-    preselectWSILNode(nodeManager, nodeId, inspectionType);
-    return true;
-  }
-
-  private void preselectWSILNode(NodeManager nodeManager, int nodeId, int inspectionType)
-  {
-    nodeManager.setSelectedNodeId(nodeId);
-    Node selectedNode = nodeManager.getNode(nodeId);
-    selectedNode.setViewId(ActionInputs.VIEWTOOLID_DEFAULT);
-    ToolManager toolManager = selectedNode.getToolManager();
-    toolManager.setSelectedToolId(inspectionType);
-    addToHistory(ActionInputs.PERSPECTIVE_WSIL, SelectWSILToolAction.getActionLink(nodeId, inspectionType, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, true));        
-  }
-
-  private WsilElement getOpenedWSIL(TreeElement root, String wsilURL)
-  {
-    Enumeration e = root.getElements(WsilModelConstants.REL_WSIL);
-    while (e.hasMoreElements())
-    {
-      WsilElement wsilElement = (WsilElement)e.nextElement();
-      if (wsilElement.getWsilUrl().equals(wsilURL))
-        return wsilElement;
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
deleted file mode 100644
index 4c9fe13a1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/OpenWSILLinkAction.java
+++ /dev/null
@@ -1,86 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class OpenWSILLinkAction extends MultipleLinkAction
-{
-  public OpenWSILLinkAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/OpenWSILLinkActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/OpenWSILLinkActionJSP.jsp";
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSIL_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSIL_LINK);
-    return transformers;
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    if (!(selectedElement instanceof WsilElement))
-      return false;
-    ListElement le = ((WsilElement) selectedElement).getAllWSILLinks().getElementWithViewId(viewID);
-    WsilWsilLinkElement link = (WsilWsilLinkElement) le.getObject();
-    String wsilURL = link.getWSILLinkLocation();
-    // populate and run the OpenWSILAction
-    OpenWSILAction action = new OpenWSILAction(controller_);
-    Hashtable table = action.getPropertyTable();
-    table.put(WsilActionInputs.WSIL_URL, wsilURL);
-    table.put(WsilActionInputs.WSIL_INSPECTION_TYPE, String.valueOf(WsilActionInputs.WSIL_DETAILS));
-    return action.run();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
deleted file mode 100644
index 216ee1705..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshAction.java
+++ /dev/null
@@ -1,89 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.Action;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-import javax.servlet.http.*;
-
-public abstract class RefreshAction extends MultipleLinkAction
-{
-  protected NodeManager nodeManager_;
-
-  public RefreshAction(Controller controller)
-  {
-    super(controller);
-    nodeManager_ = controller.getWSILPerspective().getNodeManager();
-  }
-
-  public static Action newAction(HttpServletRequest request, Controller controller)
-  {
-    NodeManager nodeManager = controller.getWSILPerspective().getNodeManager();
-    String nodeIDString = request.getParameter(ActionInputs.NODEID);
-    String viewIDString = request.getParameter(ActionInputs.VIEWID);
-    int nodeID;
-    try
-    {
-      nodeID = Integer.parseInt(nodeIDString);
-    }
-    catch (NumberFormatException nfe)
-    {
-      nodeID = nodeManager.getSelectedNodeId();
-    }
-    Node selectedNode = controller.getWSILPerspective().getNodeManager().getNode(nodeID);
-    if (selectedNode == null || !(selectedNode instanceof WsilNode))
-      return new NullAction();
-    else
-    {
-      Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-      RefreshAction action;
-      if (viewIDString == null)
-        action = new RefreshWSILAction(controller);
-      else if (selectedTool instanceof ListUDDIServicesTool)
-        action = new RefreshUDDIServiceAction(controller);
-      else if (selectedTool instanceof ListUDDIBusinessTool)
-        action = new RefreshUDDIBusinessAction(controller);
-      else
-        return new NullAction();
-      action.getPropertyTable().put(ActionInputs.NODEID, String.valueOf(nodeID));
-      return action;
-    }
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/RefreshActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/RefreshActionJSP.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
deleted file mode 100644
index 2596cc824..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIBusinessAction.java
+++ /dev/null
@@ -1,92 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Vector;
-import java.util.Iterator;
-
-public class RefreshUDDIBusinessAction extends RefreshAction
-{
-  public RefreshUDDIBusinessAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_LINKS, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_BUSINESS);
-    return transformers;
-  }
-
-  public boolean run()
-  {
-    return executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    return executeSingleLinkAction();
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    boolean result = true;
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue messageQueue = wsilPerspective.getMessageQueue();
-    if (selectedElement instanceof WsilElement)
-    {
-      WsilElement wsilElement = (WsilElement) selectedElement;
-      ListManager lm = wsilElement.getAllUDDILinks();
-      Vector uddiBusinessElements = new Vector();
-      String[] viewIDs = getViewIds();
-      for (int i = 0; i < viewIDs.length; i++)
-      {
-        int viewID = Integer.parseInt(viewIDs[i]);
-        WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) lm.getElementWithViewId(viewID).getObject();
-        uddiBusinessElements.add(uddiBusinessElement);
-      }
-      wsilElement.refreshServiceProvidersFromRegistry(uddiBusinessElements);
-      for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
-      {
-        WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) it.next();
-        String name = uddiBusinessElement.getName();
-        if (name == null || name.length() <= 0)
-          name = uddiBusinessElement.getUDDILinkBusinessKey();
-        if (uddiBusinessElement.getServiceProvider() != null)
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
-        else
-        {
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_BUSINESS_NOT_FOUND", name));
-          result = false;
-        }
-      }
-    }
-    else
-      result = false;
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
deleted file mode 100644
index 587b8e57b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshUDDIServiceAction.java
+++ /dev/null
@@ -1,92 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Vector;
-import java.util.Iterator;
-
-public class RefreshUDDIServiceAction extends RefreshAction
-{
-  public RefreshUDDIServiceAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.UDDI_SERVICE);
-    return transformers;
-  }
-
-  public boolean run()
-  {
-    return executeSingleLinkAction();
-  }
-
-  protected boolean executeMultipleLinkAction()
-  {
-    return executeSingleLinkAction();
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    boolean result = true;
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    MessageQueue messageQueue = wsilPerspective.getMessageQueue();
-    if (selectedElement instanceof WsilElement)
-    {
-      WsilElement wsilElement = (WsilElement) selectedElement;
-      ListManager lm = wsilElement.getAllUDDIServices();
-      Vector uddiServiceElements = new Vector();
-      String[] viewIDs = getViewIds();
-      for (int i = 0; i < viewIDs.length; i++)
-      {
-        int viewID = Integer.parseInt(viewIDs[i]);
-        WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) lm.getElementWithViewId(viewID).getObject();
-        uddiServiceElements.add(uddiServiceElement);
-      }
-      wsilElement.refreshServiceDefinitionsFromRegistry(uddiServiceElements);
-      for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
-      {
-        WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) it.next();
-        String name = uddiServiceElement.getName();
-        if (name == null || name.length() <= 0)
-          name = uddiServiceElement.getUDDIServiceKey();
-        if (uddiServiceElement.getServiceDefinition() != null)
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", name));
-        else
-        {
-          messageQueue.addMessage(wsilPerspective.getMessage("MSG_ERROR_SERVICE_NOT_FOUND", name));
-          result = false;
-        }
-      }
-    }
-    else
-      result = false;
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.java
deleted file mode 100644
index 1b3c6340b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/RefreshWSILAction.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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-public class RefreshWSILAction extends RefreshAction
-{
-  public RefreshWSILAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    Node selectedNode = nodeManager_.getNode(nodeID);
-    TreeElement selectedElement = selectedNode.getTreeElement();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    if (selectedElement instanceof WsilElement)
-    {
-      String wsilURL = ((WsilElement) selectedElement).getWsilUrl();
-      if (((WsilElement) selectedElement).refresh())
-      {
-        wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_REFRESH_SUCCESSFUL", wsilURL));
-        return true;
-      }
-      else
-        wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_WSIL_NOT_FOUND", wsilURL));
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
deleted file mode 100644
index b37555f0e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/ResizeWSILFramesAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-public class ResizeWSILFramesAction extends ResizeFramesAction
-{
-  public ResizeWSILFramesAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processOthers(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    // Save the current frameset sizes.
-    String frameName = (String)propertyTable_.get(ActionInputs.FRAME_NAME);
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    
-    // Set the new frameset sizes.
-    if (frameName.equals(WsilFrameNames.WSIL_NAVIGATOR_CONTAINER))
-    {
-      wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-      if (perspectiveContentFramesetCols.startsWith("100%"))
-      {
-        // Restore.
-        wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
-      }
-      else
-      {
-        // Maximize.
-        wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-        wsilPerspective.setPerspectiveContentFramesetCols("100%,0%");
-      }
-    }
-    else if (frameName.equals(WsilFrameNames.WSIL_PROPERTIES_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.startsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
-          wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsilPerspective.setActionsContainerFramesetRows("100%,0%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    else if (frameName.equals(WsilFrameNames.WSIL_STATUS_CONTAINER))
-    {
-      if (actionsContainerFramesetRows.endsWith("100%"))
-      {
-        if (perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          // Restore.
-          wsilPerspective.setPerspectiveContentFramesetCols(wsilPerspective.getSavedPerspectiveContentFramesetCols());
-          wsilPerspective.setActionsContainerFramesetRows(wsilPerspective.getSavedActionsContainerFramesetRows());
-        }
-        else
-        {
-          // Maximize.
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-      else
-      {
-        // Maximize.
-        wsilPerspective.setSavedActionsContainerFramesetRows(actionsContainerFramesetRows);
-        wsilPerspective.setActionsContainerFramesetRows("0%,100%");
-        if (!perspectiveContentFramesetCols.endsWith("100%"))
-        {
-          wsilPerspective.setSavedPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-          wsilPerspective.setPerspectiveContentFramesetCols("0%,100%");
-        }
-      }
-    }
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
deleted file mode 100644
index f064d57d1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILNodeAction.java
+++ /dev/null
@@ -1,68 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class SelectWSILNodeAction extends SelectNodeAction
-{
-    public SelectWSILNodeAction(Controller controller)
-    {
-        super(controller, controller.getWSILPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeID, boolean keepHistory)
-    {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeID);
-        if (keepHistory) {
-            actionLink.append('&');
-            actionLink.append(ActionInputs.ISHISTORY);
-            actionLink.append("=1");
-        }
-        return actionLink.toString();
-    }
-
-    protected String getActionLinkForHistory()
-    {
-        Node selectedNode = getSelectedNode();
-        Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-        if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-        else
-            return getActionLink(selectedNode.getNodeId(), true);
-    }
-
-    public final String getTreeContentVar() {
-        return "wsilNavigatorContent";
-    }
-
-    public final String getTreeContentPage() {
-        return "wsil/wsil_navigator_content.jsp";
-    }
-
-    public final String getPropertiesContainerVar() {
-        return "wsilPropertiesContainer";
-    }
-
-    public final String getPropertiesContainerPage() {
-        return "wsil/wsil_properties_container.jsp";
-    }
-    
-    public final int getPerspectiveId()
-    {
-      return ActionInputs.PERSPECTIVE_WSIL;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
deleted file mode 100644
index dd54b1ee0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SelectWSILToolAction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.SelectNodeToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-public class SelectWSILToolAction extends SelectNodeToolAction
-{
-  public SelectWSILToolAction(Controller controller)
-  {
-    super(controller, controller.getWSILPerspective().getNodeManager());
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length + 1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length - 1] = new WSILViewSelectionTransformer(controller_);
-    return transformers;
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID, boolean keepHistory)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/SelectWSILToolActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    if (viewID != ActionInputs.VIEWID_DEFAULT)
-    {
-      actionLink.append('&');
-      actionLink.append(ActionInputs.VIEWID);
-      actionLink.append('=');
-      actionLink.append(viewID);
-      actionLink.append('&');
-      actionLink.append(ActionInputs.VIEWTOOLID);
-      actionLink.append('=');
-      actionLink.append(viewToolID);
-    }
-    if (keepHistory)
-    {
-      actionLink.append('&');
-      actionLink.append(ActionInputs.ISHISTORY);
-      actionLink.append("=1");
-    }
-    return actionLink.toString();
-  }
-
-  protected String getActionLinkForHistory()
-  {
-    boolean keepHistory = false;
-    Node selectedNode = getSelectedNode();
-    Tool selectedTool = getSelectedTool();
-    int toolType = getSelectedTool().getToolType();
-    if (toolType == ToolTypes.FORM)
-      keepHistory = true;
-    else if (toolType == ToolTypes.VIEW)
-    {
-      int viewID = selectedNode.getViewId();
-      if (viewID == ActionInputs.VIEWID_DEFAULT)
-        keepHistory = true;
-      else
-      {
-        if (((ViewTool) selectedTool).getToolManager(viewID).getTool(selectedNode.getViewToolId()).getToolType() != ToolTypes.ACTION)
-          keepHistory = true;
-      }
-    }
-    if (keepHistory)
-    {
-      return getActionLink(selectedNode.getNodeId(), selectedTool.getToolId(), selectedNode.getViewId(), selectedNode.getViewToolId(), true);
-    }
-    else
-      return null;
-  }
-
-  public final String getTreeContentVar()
-  {
-    return "wsilNavigatorContent";
-  }
-
-  public final String getTreeContentPage()
-  {
-    return "wsil/wsil_navigator_content.jsp";
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return "wsilPropertiesContainer";
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return "wsil/wsil_properties_container.jsp";
-  }
-
-  public final String getPropertiesContentVar()
-  {
-    return "wsilPropertiesContent";
-  }
-
-  public final String getPropertiesContentPage()
-  {
-    return "wsil/wsil_properties_content.jsp";
-  }
-
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_WSIL;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
deleted file mode 100644
index 15cfc9e6d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/SwitchPerspectiveFromWSILAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-public final class SwitchPerspectiveFromWSILAction extends ShowPerspectiveAction
-{
-  public SwitchPerspectiveFromWSILAction(Controller controller)
-  {
-    super(controller);
-  }
-  
-  protected boolean processParsedResults(MultipartFormDataParser parser) throws MultipartFormDataException
-  {
-    String perspectiveContentFramesetCols = parser.getParameter(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = parser.getParameter(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    if (perspectiveContentFramesetCols != null && actionsContainerFramesetRows != null)
-    {
-      propertyTable_.put(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT,perspectiveContentFramesetCols);
-      propertyTable_.put(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER,actionsContainerFramesetRows);
-      return true;
-    }
-    return false;
-  }
-  
-  public final boolean run()
-  {
-    String perspectiveContentFramesetCols = (String)propertyTable_.get(WsilActionInputs.FRAMESET_COLS_PERSPECTIVE_CONTENT);
-    String actionsContainerFramesetRows = (String)propertyTable_.get(WsilActionInputs.FRAMESET_ROWS_ACTIONS_CONTAINER);
-    
-    // Save the frameset sizes iff no frame is maximized.
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    if (!perspectiveContentFramesetCols.startsWith("100%") && !perspectiveContentFramesetCols.endsWith("100%"))
-      wsilPerspective.setPerspectiveContentFramesetCols(perspectiveContentFramesetCols);
-      
-    if (!actionsContainerFramesetRows.startsWith("100%") && !actionsContainerFramesetRows.endsWith("100%"))
-      wsilPerspective.setActionsContainerFramesetRows(actionsContainerFramesetRows);
-      
-    return super.run();
-  }
-  
-  public static final String getFormActionLink(int targetPerspectiveId,boolean forHistory)
-  {
-    StringBuffer formLink = new StringBuffer("wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp?");
-    formLink.append(ActionInputs.PERSPECTIVE).append('=').append(targetPerspectiveId);
-    if (forHistory)
-      formLink.append('&').append(ActionInputs.ISHISTORY).append("=1");
-    return formLink.toString();
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
deleted file mode 100644
index 537435b38..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WSILImportWSILToWorkbenchAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-import java.util.Hashtable;
-
-public class WSILImportWSILToWorkbenchAction extends ImportToWorkbenchAction
-{
-  public WSILImportWSILToWorkbenchAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public FormTool getSelectedFormTool()
-  {
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-  }
-
-  public ImportToFileSystemAction newImportToFileSystemAction()
-  {
-    ImportWSILToFileSystemAction action = new ImportWSILToFileSystemAction(controller_);
-    Hashtable table = action.getPropertyTable();
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    NodeManager nodeManager = wsilPerspective.getNodeManager();
-    Node selectedNode = nodeManager.getSelectedNode();
-    table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-    return action;
-  }
-
-  public final String getStatusContentVar()
-  {
-    return controller_.getWSILPerspective().getStatusContentVar();
-  }
-    
-  public final String getStatusContentPage()
-  {
-    return controller_.getWSILPerspective().getStatusContentPage();
-  }    
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
deleted file mode 100644
index a08386e36..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilAddToWSDLPerspectiveAction.java
+++ /dev/null
@@ -1,86 +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.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ITransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsdl.actions.OpenWSDLAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilWsdlServiceElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.transformer.WSILViewSelectionTransformer;
-
-import java.util.Hashtable;
-
-public class WsilAddToWSDLPerspectiveAction extends MultipleLinkAction
-{
-  public WsilAddToWSDLPerspectiveAction(Controller controller)
-  {
-    super(controller);
-  }
-
-  public static String getActionLink(int nodeID, int toolID, int viewID, int viewToolID)
-  {
-    StringBuffer actionLink = new StringBuffer("wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp?");
-    actionLink.append(ActionInputs.NODEID);
-    actionLink.append('=');
-    actionLink.append(nodeID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.TOOLID);
-    actionLink.append('=');
-    actionLink.append(toolID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWID);
-    actionLink.append('=');
-    actionLink.append(viewID);
-    actionLink.append('&');
-    actionLink.append(ActionInputs.VIEWTOOLID);
-    actionLink.append('=');
-    actionLink.append(viewToolID);
-    return actionLink.toString();
-  }
-
-  public static String getBaseActionLink()
-  {
-    return "wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp";
-  }
-
-  public ITransformer[] getTransformers()
-  {
-    ITransformer[] parentTransformers = super.getTransformers();
-    ITransformer[] transformers = new ITransformer[parentTransformers.length+1];
-    System.arraycopy(parentTransformers, 0, transformers, 0, parentTransformers.length);
-    transformers[transformers.length-1] = new WSILViewSelectionTransformer(controller_, WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, ActionInputs.VIEWID, WSILViewSelectionTransformer.WSDL_SERVICE);
-    return transformers;
-  }
-
-  protected boolean executeSingleLinkAction()
-  {
-    int nodeID = Integer.parseInt((String) propertyTable_.get(ActionInputs.NODEID));
-    int viewID = Integer.parseInt((String) propertyTable_.get(ActionInputs.VIEWID));
-    WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-    Node selectedNode = wsilPerspective.getNodeManager().getNode(nodeID);
-    WsilElement wsilElement = (WsilElement) selectedNode.getTreeElement();
-    WsilWsdlServiceElement wsilWsdlServiceElement = (WsilWsdlServiceElement) wsilElement.getAllWSDLServices().getElementWithViewId(viewID).getObject();
-    String wsdlUrl = wsilWsdlServiceElement.getWSDLServiceURL();
-    OpenWSDLAction openWSDLAction = new OpenWSDLAction(controller_);
-    Hashtable propertyTable = openWSDLAction.getPropertyTable();
-    propertyTable.put(ActionInputs.QUERY_INPUT_WSDL_URL, wsdlUrl);
-    boolean actionResult = openWSDLAction.run();
-    if (actionResult)
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_INFO_ADD_WSDL_TO_WSDL_PERSPECTIVE_SUCCESSFUL", wsdlUrl));
-    else
-      wsilPerspective.getMessageQueue().addMessage(wsilPerspective.getMessage("MSG_ERROR_ADD_WSDL_TO_WSDL_PERSPECTIVE", wsdlUrl));
-    return actionResult;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
deleted file mode 100644
index f5da54a97..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilImportWSDLToWorkbenchAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.actions.ImportToWorkbenchAction;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WSILPerspective;
-
-import java.util.Hashtable;
-
-public class WsilImportWSDLToWorkbenchAction extends ImportToWorkbenchAction {
-    public WsilImportWSDLToWorkbenchAction(Controller controller) {
-        super(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public ImportToFileSystemAction newImportToFileSystemAction() {
-        ImportWSDLToFileSystemAction action = new ImportWSDLToFileSystemAction(controller_);
-        Hashtable table = action.getPropertyTable();
-
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        NodeManager nodeManager = wsilPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-
-        table.put(ActionInputs.NODEID, String.valueOf(selectedNode.getNodeId()));
-        table.put(ActionInputs.TOOLID, String.valueOf(selectedNode.getToolManager().getSelectedToolId()));
-        table.put(ActionInputs.VIEWID, String.valueOf(selectedNode.getViewId()));
-
-        return action;
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getWSILPerspective().getStatusContentVar();
-    }
-    
-    public final String getStatusContentPage()
-    {
-      return controller_.getWSILPerspective().getStatusContentPage();
-    }    
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
deleted file mode 100644
index 5bd264a13..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilLaunchWebServiceWizardAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.LaunchWebServiceWizardAction;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.*;
-
-public class WsilLaunchWebServiceWizardAction extends LaunchWebServiceWizardAction {
-    public WsilLaunchWebServiceWizardAction(Controller controller) {
-        super(controller);
-    }
-
-    public static LaunchWebServiceWizardAction newAction(Controller controller) {
-        return new WsilLaunchWebServiceWizardAction(controller);
-    }
-
-    public FormTool getSelectedFormTool() {
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        return (FormTool)wsilPerspective.getNodeManager().getSelectedNode().getToolManager().getSelectedTool();
-    }
-
-    public boolean run() {
-        WSILPerspective wsilPerspective = controller_.getWSILPerspective();
-        NodeManager nodeManager = wsilPerspective.getNodeManager();
-        Node selectedNode = nodeManager.getSelectedNode();
-        TreeElement selectedElement = selectedNode.getTreeElement();
-        Tool selectedTool = selectedNode.getToolManager().getSelectedTool();
-        int viewID = selectedNode.getViewId();
-
-        ListElement le = null;
-        String url = null;
-        if (selectedTool instanceof ListWSDLServicesTool) {
-            le = ((WsilElement)selectedElement).getAllWSDLServices().getElementWithViewId(viewID);
-            url = ((WsilWsdlServiceElement)le.getObject()).getWSDLServiceURL();
-        }
-        else if (selectedTool instanceof ListUDDIServicesTool) {
-            le = ((WsilElement)selectedElement).getAllUDDIServices().getElementWithViewId(viewID);
-            url = ((WsilUddiServiceElement)le.getObject()).getWsdlUrl();
-        }
-        else
-            return false;
-        return launchWizard(url);
-    }
-
-    public final String getStatusContentVar()
-    {
-      return controller_.getWSILPerspective().getStatusContentVar();
-    }
-    
-    public final String getStatusContentPage()
-    {
-      return controller_.getWSILPerspective().getStatusContentPage();
-    }    
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
deleted file mode 100644
index d9b4f0942..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/actions/WsilToggleNodeAction.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.actions;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-
-public class WsilToggleNodeAction extends ToggleNodeAction {
-    public WsilToggleNodeAction(Controller controller) {
-        super(controller, controller.getFavoritesPerspective().getNodeManager());
-    }
-
-    public static String getActionLink(int nodeId, boolean open) {
-        StringBuffer actionLink = new StringBuffer("wsil/actions/WsilToggleNodeActionJSP.jsp?");
-        actionLink.append(ActionInputs.NODEID);
-        actionLink.append('=');
-        actionLink.append(nodeId);
-        actionLink.append('&');
-        actionLink.append(ActionInputs.OPEN);
-        actionLink.append('=');
-        if (open)
-            actionLink.append(ActionInputs.OPEN_NODE);
-        else
-            actionLink.append(ActionInputs.CLOSE_NODE);
-        return actionLink.toString();
-    }
-
-    public final String getActionLinkForHistory() {
-        ToolManager toolManager = toggledNode_.getToolManager();
-        Tool selectedTool = toolManager.getSelectedTool();
-        int nodeId = toggledNode_.getNodeId();
-        int toolId = selectedTool.getToolId();
-        int viewId = toggledNode_.getViewId();
-        int viewToolId = toggledNode_.getViewToolId();
-        if (selectedTool.getToolType() != ToolTypes.ACTION)
-            return SelectWSILToolAction.getActionLink(nodeId, toolId, viewId, viewToolId, true);
-        else
-            return SelectWSILNodeAction.getActionLink(nodeId, true);
-    }
-
-  public final String getTreeContentVar()
-  {
-    return controller_.getWSILPerspective().getTreeContentVar();
-  }
-
-  public final String getTreeContentPage()
-  {
-    return controller_.getWSILPerspective().getTreeContentPage();
-  }
-
-  public final String getPropertiesContainerVar()
-  {
-    return controller_.getWSILPerspective().getPropertiesContainerVar();
-  }
-
-  public final String getPropertiesContainerPage()
-  {
-    return controller_.getWSILPerspective().getPropertiesContainerPage();
-  }
-  
-  public final int getPerspectiveId()
-  {
-    return ActionInputs.PERSPECTIVE_WSIL;
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
deleted file mode 100644
index aeb3c55b6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilActionInputs.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilActionInputs
-{
-    // open WSIL form
-    public final static String WSIL_URL = "wsilURL";
-    public final static String WSIL_INSPECTION_TYPE = "wsilInspectionType";
-    public final static int WSIL_DETAILS = 0;
-    public final static int WSDL_SERVICES = 1;
-    public final static int UDDI_SERVICES = 2;
-    public final static int UDDI_BUSINESSES = 3;
-    public final static int WSIL_LINKS = 4;
-
-    // mass action
-    public final static String MULTIPLE_LINK_ACTION = "multipleLinkAction";
-
-    // resize WSIL frames action
-    public final static String FRAMESET_COLS_PERSPECTIVE_CONTENT = "framesetColsPerspectiveContent";
-    public final static String FRAMESET_ROWS_ACTIONS_CONTAINER = "framesetRowsActionsContainer";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
deleted file mode 100644
index be2d25c31..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilFrameNames.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilFrameNames
-{
-  public final static String WSIL_NAVIGATOR_CONTAINER = "wsil_navigator_container";
-  public final static String WSIL_NAVIGATOR_TOOLBAR = "wsil_navigator_toolbar";
-  public final static String WSIL_NAVIGATOR_CONTENT = "wsil_navigator_content";
-  public final static String WSIL_ACTIONS_CONTAINER = "wsil_actions_container";
-  public final static String WSIL_PROPERTIES_CONTAINER = "wsil_properties_container";
-  public final static String WSIL_PROPERTIES_TOOLBAR = "wsil_properties_toolbar";
-  public final static String WSIL_PROPERTIES_CONTENT = "wsil_properties_content";
-  public final static String WSIL_STATUS_CONTAINER = "wsil_status_container";
-  public final static String WSIL_STATUS_TOOLBAR = "wsil_status_toolbar";
-  public final static String WSIL_STATUS_CONTENT = "wsil_status_content";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
deleted file mode 100644
index 5bb694b82..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/constants/WsilModelConstants.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.constants;
-
-public class WsilModelConstants
-{
-    // Relation
-    public final static String REL_WSIL = "relWSIL";
-
-    // List Managers for WsilElement
-    public final static String LIST_MANAGER_WSDL_SERVICES = "wsdlServices";
-    public final static String LIST_MANAGER_UDDI_SERVICES = "uddiServices";
-    public final static String LIST_MANAGER_UDDI_LINKS = "uddiLinks";
-    public final static String LIST_MANAGER_WSIL_LINKS = "wsilLinks";
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
deleted file mode 100644
index 52d28de68..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilCommonElement.java
+++ /dev/null
@@ -1,56 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WsilCommonElement extends BasicElement
-{
-  private String baseWsilURL;
-  private String relativeURIBase;
-
-  public WsilCommonElement(String name, Model model)
-  {
-    super(name, model);
-  }
-  
-  public String getBaseWsilURL()
-  {
-    return baseWsilURL;
-  }
-  
-  public void setBaseWsilURL(String baseWsilURL)
-  {
-    this.baseWsilURL = baseWsilURL;
-  }
-  
-  private final char FWD_SLASH = '/';
-  private final char BWD_SLASH = '\\';
-  private final char PROTOCOL_INDICATOR = ':';
-  
-  public String makeAbsolute(String uri)
-  {
-    if (baseWsilURL != null && uri != null && uri.indexOf(PROTOCOL_INDICATOR) == -1)
-    {
-      if (relativeURIBase == null)
-      {
-        relativeURIBase = baseWsilURL.replace(BWD_SLASH, FWD_SLASH);
-        int index = relativeURIBase.lastIndexOf(FWD_SLASH);
-        relativeURIBase = baseWsilURL.substring(0, index + 1);
-      }
-      StringBuffer sb = new StringBuffer(relativeURIBase);
-      sb.append(uri);
-      return sb.toString();
-    }
-    return uri;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
deleted file mode 100644
index 5655bd0e9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilElement.java
+++ /dev/null
@@ -1,453 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-import java.util.Iterator;
-import java.util.HashMap;
-import java.util.Properties;
-import java.net.URL;
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.*;
-import org.apache.wsil.*;
-import org.uddi4j.client.UDDIProxy;
-import org.uddi4j.datatype.business.BusinessEntity;
-import org.uddi4j.datatype.service.BusinessService;
-
-/**
- * The data model element that represents a WSIL document
- */
-public class WsilElement extends TreeElement
-{
-  private WSILDocument wsilDoc_;
-  private String thisWsilUrl_;
-  /** ****************** Namespace ********** */
-  private static final String NAMESPACE_WSDL = "http://schemas.xmlsoap.org/wsdl/";
-  private static final String NAMESPACE_UDDI_V1 = "urn:uddi-org:api";
-  private static final String NAMESPACE_UDDI_V2 = "urn:uddi-org:api_v2";
-  //private static final String NAMESPACE_UDDI_BINDING = "http://schemas.xmlsoap.org/ws/2001/10/inspection/uddi/";
-  private static final String NAMESPACE_WSIL_INSPECTION = "http://schemas.xmlsoap.org/ws/2001/10/inspection/";
-  /** ****************** Rels **************** */
-  // Relation for a WSIL doucment and its link nodes
-  public static final String REL_WSIL_LINK = "wsil link nodes";
-
-  public WsilElement(String name, Model model, WSILDocument wsilDocument, String wsilURL)
-  {
-    super(name, model);
-    wsilDoc_ = wsilDocument;
-    thisWsilUrl_ = wsilURL;
-    ListManager wsdlServices_ = null;
-    ListManager uddiServices_ = null;
-    ListManager wsilLinks_ = null;
-    ListManager uddiLinks_ = null;
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
-  }
-
-  /*
-   * Refresh the WSIL document
-   */
-  public boolean refresh()
-  {
-    try
-    {
-      WSILDocument newWSILDoc = WSILDocument.newInstance();
-      newWSILDoc.read(getWsilUrl());
-      wsilDoc_ = newWSILDoc;
-      ListManager wsdlServices_ = null;
-      ListManager uddiServices_ = null;
-      ListManager wsilLinks_ = null;
-      ListManager uddiLinks_ = null;
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, wsilLinks_);
-      setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, uddiLinks_);
-      return true;
-    }
-    catch (Exception e)
-    {
-      return false;
-    }
-  }
-
-  /*
-   * Returns the WSIL's URL
-   */
-  public String getWsilUrl()
-  {
-    return thisWsilUrl_;
-  }
-
-  /*
-   * Returns the WSIL document
-   */
-  public WSILDocument getWSILDocument()
-  {
-    return wsilDoc_;
-  }
-
-  /*
-   * Returns all abstract languages
-   */
-  public Vector getWSILAbstractLangs()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getLang());
-    }
-    return v;
-  }
-
-  /*
-   * Returns all abstracts
-   */
-  public Vector getWSILAbstracts()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = wsilDoc_.getInspection().getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getText());
-    }
-    return v;
-  }
-
-  public ListManager getAllWSDLServices()
-  {
-    ListManager wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
-    if (wsdlServices_ == null)
-    {
-      initAllWSDLServices();
-      wsdlServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES);
-    }
-    return wsdlServices_;
-  }
-
-  public ListManager getAllUDDIServices()
-  {
-    ListManager uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
-    if (uddiServices_ == null)
-    {
-      initAllUDDIServices();
-      uddiServices_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES);
-    }
-    return uddiServices_;
-  }
-
-  private void initAllWSDLServices()
-  {
-    ListManager wsdlServices_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Service[] serviceList = inspection.getServices();
-    for (int i = 0; i < serviceList.length; i++)
-    {
-      // skip any service without a wsdl namespace
-      // and invalid descriptions
-      Description[] descList = serviceList[i].getDescriptions();
-      if (descList.length < 1)
-        continue;
-      String namespace = descList[0].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if (namespace.equals(NAMESPACE_WSDL))
-      {
-        WsilWsdlServiceElement wsdlServiceElement = new WsilWsdlServiceElement(namespace, getModel(), serviceList[i]);
-        wsdlServiceElement.setBaseWsilURL(getWsilUrl());
-        if (wsdlServiceElement.validateWSDLService())
-        {
-          wsdlServiceElement.setName(wsdlServiceElement.getWSDLServiceURL());
-          wsdlServices_.add(new ListElement(wsdlServiceElement));
-        }
-      }
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSDL_SERVICES, wsdlServices_);
-  }
-
-  private void initAllUDDIServices()
-  {
-    ListManager uddiServices_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Service[] serviceList = inspection.getServices();
-    Vector uddiServiceElements = new Vector();
-    for (int i = 0; i < serviceList.length; i++)
-    {
-      // skip any service without a wsdl namespace
-      // and invalid descriptions
-      Description[] descList = serviceList[i].getDescriptions();
-      if (descList.length < 1)
-        continue;
-      String namespace = descList[0].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
-      {
-        WsilUddiServiceElement uddiServiceElement = new WsilUddiServiceElement(namespace, getModel(), serviceList[i]);
-        uddiServiceElement.setBaseWsilURL(getWsilUrl());
-        if (uddiServiceElement.validateUDDIService())
-        {
-          uddiServiceElement.setName(uddiServiceElement.getName());
-          uddiServiceElements.add(uddiServiceElement);
-        }
-      }
-    }
-    refreshServiceDefinitionsFromRegistry(uddiServiceElements);
-    for (Iterator it = uddiServiceElements.iterator(); it.hasNext();)
-    {
-      uddiServices_.add(new ListElement(it.next()));
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_SERVICES, uddiServices_);
-  }
-
-  public void refreshServiceDefinitionsFromRegistry(Vector uddiServiceElements)
-  {
-    HashMap inquiryAPIToServices = new HashMap();
-    for (int i = 0; i < uddiServiceElements.size(); i++)
-    {
-      WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) uddiServiceElements.get(i);
-      String inquiryAPI = uddiServiceElement.getUDDIServiceInquiryAPI();
-      if (Validator.validateURL(inquiryAPI))
-      {
-        Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
-        if (services == null)
-        {
-          services = new Vector();
-          inquiryAPIToServices.put(inquiryAPI, services);
-        }
-        services.add(uddiServiceElement);
-      }
-      else
-        uddiServiceElement.setServiceDefinition(null);
-    }
-    for (Iterator it = inquiryAPIToServices.keySet().iterator(); it.hasNext();)
-    {
-      String inquiryAPI = (String) it.next();
-      Vector services = (Vector) inquiryAPIToServices.get(inquiryAPI);
-      UDDIProxy proxy;
-      try
-      {
-        Properties props = new Properties();
-        props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
-        proxy = new UDDIProxy(props);
-        proxy.setInquiryURL(new URL(inquiryAPI));
-      }
-      catch (Throwable t)
-      {
-        for (int j = 0; j < services.size(); j++)
-        {
-          WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(j);
-          uddiServiceElement.setServiceDefinition(null);
-        }
-        continue;
-      }
-      Vector serviceKeys = new Vector();
-      for (int j = 0; j < services.size(); j++)
-      {
-        serviceKeys.add(((WsilUddiServiceElement) services.get(j)).getUDDIServiceKey());
-      }
-      Vector businessServices;
-      try
-      {
-        businessServices = proxy.get_serviceDetail(serviceKeys).getBusinessServiceVector();
-      }
-      catch (Exception ex)
-      {
-        businessServices = new Vector();
-        if (serviceKeys.size() > 1)
-        {
-          for (int k = 0; k < serviceKeys.size(); k++)
-          {
-            try
-            {
-              businessServices.add((BusinessService) proxy.get_serviceDetail((String) serviceKeys.get(k)).getBusinessServiceVector().get(0));
-            }
-            catch (Exception exception)
-            {
-              businessServices.add(null);
-            }
-          }
-        }
-        else
-          businessServices.add(null);
-      }
-      for (int k = 0; k < services.size(); k++)
-      {
-        BusinessService bs = (BusinessService) businessServices.get(k);
-        WsilUddiServiceElement uddiServiceElement = (WsilUddiServiceElement) services.get(k);
-        uddiServiceElement.setServiceDefinition(bs);
-      }
-    }
-  }
-
-  public ListManager getAllWSILLinks()
-  {
-    ListManager wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
-    if (wsilLinks_ == null)
-    {
-      initAllWSILLinks();
-      wsilLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS);
-    }
-    return wsilLinks_;
-  }
-
-  public ListManager getAllUDDILinks()
-  {
-    ListManager uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
-    if (uddiLinks_ == null)
-    {
-      initAllUDDILinks();
-      uddiLinks_ = (ListManager) getPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS);
-    }
-    return uddiLinks_;
-  }
-
-  private void initAllUDDILinks()
-  {
-    ListManager uddiLinks_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Link[] linkList = inspection.getLinks();
-    Vector uddiBusinessElements = new Vector();
-    for (int i = 0; i < linkList.length; i++)
-    {
-      // process any links with UDDI namespace
-      String namespace = linkList[i].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if ((namespace.equals(NAMESPACE_UDDI_V1) || namespace.equals(NAMESPACE_UDDI_V2)))
-      {
-        WsilUddiBusinessElement uddiBusinessElement = new WsilUddiBusinessElement(namespace, getModel(), linkList[i]);
-        uddiBusinessElement.setBaseWsilURL(getWsilUrl());
-        if (uddiBusinessElement.validateUDDILink())
-        {
-          uddiBusinessElement.setName(uddiBusinessElement.getName());
-          uddiBusinessElements.add(uddiBusinessElement);
-        }
-      }
-    }
-    refreshServiceProvidersFromRegistry(uddiBusinessElements);
-    for (Iterator it = uddiBusinessElements.iterator(); it.hasNext();)
-    {
-      uddiLinks_.add(new ListElement(it.next()));
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_UDDI_LINKS, uddiLinks_);
-  }
-
-  public void refreshServiceProvidersFromRegistry(Vector uddiBusinessElements)
-  {
-    HashMap inquiryAPIToBusinesses = new HashMap();
-    for (int i = 0; i < uddiBusinessElements.size(); i++)
-    {
-      WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) uddiBusinessElements.get(i);
-      String inquiryAPI = uddiBusinessElement.getUDDILinkInquiryAPI();
-      if (Validator.validateURL(inquiryAPI))
-      {
-        Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
-        if (businesses == null)
-        {
-          businesses = new Vector();
-          inquiryAPIToBusinesses.put(inquiryAPI, businesses);
-        }
-        businesses.add(uddiBusinessElement);
-      }
-      else
-        uddiBusinessElement.setServiceProvider(null);
-    }
-    for (Iterator it = inquiryAPIToBusinesses.keySet().iterator(); it.hasNext();)
-    {
-      String inquiryAPI = (String) it.next();
-      Vector businesses = (Vector) inquiryAPIToBusinesses.get(inquiryAPI);
-      UDDIProxy proxy;
-      try
-      {
-        Properties props = new Properties();
-        props.put(ActionInputs.TRANSPORT_CLASS_NAME, ActionInputs.TRASPORT_CLASS);
-        proxy = new UDDIProxy(props);
-        proxy.setInquiryURL(new URL(inquiryAPI));
-      }
-      catch (Exception e)
-      {
-        for (int j = 0; j < businesses.size(); j++)
-        {
-          WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(j);
-          uddiBusinessElement.setServiceProvider(null);
-        }
-        continue;
-      }
-      Vector businessKeys = new Vector();
-      for (int j = 0; j < businesses.size(); j++)
-      {
-        businessKeys.add(((WsilUddiBusinessElement) businesses.get(j)).getUDDILinkBusinessKey());
-      }
-      Vector businessEntities;
-      try
-      {
-        businessEntities = proxy.get_businessDetail(businessKeys).getBusinessEntityVector();
-      }
-      catch (Exception ex)
-      {
-        businessEntities = new Vector();
-        if (businessKeys.size() > 1)
-        {
-          for (int k = 0; k < businessKeys.size(); k++)
-          {
-            try
-            {
-              businessEntities.add((BusinessEntity) proxy.get_businessDetail((String) businessKeys.get(k)).getBusinessEntityVector().get(0));
-            }
-            catch (Exception exception)
-            {
-              businessEntities.add(null);
-            }
-          }
-        }
-        else
-          businessEntities.add(null);
-      }
-      for (int k = 0; k < businesses.size(); k++)
-      {
-        BusinessEntity be = (BusinessEntity) businessEntities.get(k);
-        WsilUddiBusinessElement uddiBusinessElement = (WsilUddiBusinessElement) businesses.get(k);
-        uddiBusinessElement.setServiceProvider(be);
-      }
-    }
-  }
-
-  private void initAllWSILLinks()
-  {
-    ListManager wsilLinks_ = new ListManager();
-    Inspection inspection = wsilDoc_.getInspection();
-    Link[] linkList = inspection.getLinks();
-    for (int i = 0; i < linkList.length; i++)
-    {
-      // process any links with UDDI namespace
-      String namespace = linkList[i].getReferencedNamespace();
-      if (namespace == null)
-        continue;
-      else if (namespace.equals(NAMESPACE_WSIL_INSPECTION))
-      {
-        WsilWsilLinkElement wsilLinkElement = new WsilWsilLinkElement(namespace, getModel(), linkList[i]);
-        wsilLinkElement.setBaseWsilURL(getWsilUrl());
-        if (wsilLinkElement.validateWSILLink())
-        {
-          wsilLinkElement.setName(wsilLinkElement.getWSILLinkLocation());
-          wsilLinks_.add(new ListElement(wsilLinkElement));
-        }
-      }
-    }
-    setPropertyAsObject(WsilModelConstants.LIST_MANAGER_WSIL_LINKS, wsilLinks_);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
deleted file mode 100644
index a8e35bd0a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilLinkElement.java
+++ /dev/null
@@ -1,53 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-import java.util.Vector;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL Link
-*/
-public class WsilLinkElement extends WsilCommonElement
-{
-  protected Link link_;
-
-  public WsilLinkElement(String name, Model model, Link link)
-  {
-    super(name, model);
-    link_ = link;
-  }
-
-  public Vector getLinkAbstractLangs()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = link_.getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getLang());
-    }
-    return v;
-  }
-
-  public Vector getLinkAbstracts()
-  {
-    Vector v = new Vector();
-    Abstract[] abstracts = link_.getAbstracts();
-    for (int i = 0; i < abstracts.length; i++)
-    {
-      v.add(abstracts[i].getText());
-    }
-    return v;
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
deleted file mode 100644
index 035888c6f..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilServiceElement.java
+++ /dev/null
@@ -1,66 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-import java.util.Vector;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL Service
-*/
-public class WsilServiceElement extends WsilCommonElement
-{
-    protected Service service_;
-
-    public WsilServiceElement(String name, Model model, Service service) {
-        super(name, model);
-        service_ = service;
-    }
-
-    public Vector getServiceNameLangs() {
-        Vector v = new Vector();
-        ServiceName[] serviceNames = service_.getServiceNames();
-        for (int i = 0; i < serviceNames.length; i++) {
-            v.add(serviceNames[i].getLang());
-        }
-        return v;
-    }
-
-    public Vector getServiceNames() {
-        Vector v = new Vector();
-        ServiceName[] serviceNames = service_.getServiceNames();
-        for (int i = 0; i < serviceNames.length; i++) {
-            v.add(serviceNames[i].getText());
-        }
-        return v;
-    }
-
-    public Vector getServiceAbstractLangs() {
-        Vector v = new Vector();
-        Abstract[] abstracts = service_.getAbstracts();
-        for (int i = 0; i < abstracts.length; i++) {
-            v.add(abstracts[i].getLang());
-        }
-        return v;
-    }
-
-    public Vector getServiceAbstracts() {
-        Vector v = new Vector();
-        Abstract[] abstracts = service_.getAbstracts();
-        for (int i = 0; i < abstracts.length; i++) {
-            v.add(abstracts[i].getText());
-        }
-        return v;
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
deleted file mode 100644
index d4630dff4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiBusinessElement.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-import org.apache.wsil.*;
-import org.apache.wsil.extension.*;
-import org.apache.wsil.extension.uddi.*;
-
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.datatype.business.BusinessEntity;
-
-/**
-* The data model element that represents 
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiBusinessElement extends WsilLinkElement
-{
-    private BusinessEntity busEntity_;
-
-    public WsilUddiBusinessElement(String name, Model model, Link link) {
-        super(name, model, link);
-        busEntity_ = null;
-    }
-
-    public void setServiceProvider(BusinessEntity be) {
-      busEntity_ = be;
-    }
-
-    public BusinessEntity getServiceProvider() {
-        return busEntity_;
-    }
-
-    public String getName() {
-        return (busEntity_  == null) ? null : busEntity_.getDefaultNameString();
-    }
-
-    public String getDescription() {
-        return (busEntity_ == null) ? null : busEntity_.getDefaultDescriptionString();
-    }
-
-    public String getUDDILinkInquiryAPI() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        return (bd == null) ? null : bd.getLocation();
-    }
-
-    public String getUDDILinkBusinessKey() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        return (bd == null) ? null : bd.getBusinessKey().getText();
-    }
-
-    public String getUDDILinkDiscoveryURL() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        if (bd == null)
-            return null;
-        else {
-            DiscoveryURL discoveryURL = bd.getDiscoveryURL();
-            return (discoveryURL == null) ? null : discoveryURL.getText();
-        }
-    }
-
-    public boolean validateUDDILink() {
-        BusinessDescription bd = getValidUDDIBusinessDescription();
-        return (bd != null);
-    }
-
-    private BusinessDescription getValidUDDIBusinessDescription() {
-        ExtensionElement extElement = link_.getExtensionElement();
-        // The extension element of a UDDI link
-        // must be a BusinessDescription element
-        if (!(extElement instanceof BusinessDescription))
-            return null;
-        // A valid BusinessDescription must have an inquiry API
-        String inquiryAPI = ((BusinessDescription)extElement).getLocation();
-        if (!Validator.validateURL(inquiryAPI))
-            return null;
-        // A valid BusinessDescription must have a business key
-        String businessKey = ((BusinessDescription)extElement).getBusinessKey().getText();
-        if (businessKey == null || businessKey.length() <= 0)
-            return null;
-        return (BusinessDescription)extElement;
-    }
-
-    public String toString() {
-        return getName();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
deleted file mode 100644
index 900f76b26..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilUddiServiceElement.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.uddi.util.Uddi4jHelper;
-import org.eclipse.wst.ws.internal.explorer.platform.util.Validator;
-
-import org.apache.wsil.*;
-import org.apache.wsil.extension.*;
-import org.apache.wsil.extension.uddi.*;
-
-import org.uddi4j.util.DiscoveryURL;
-import org.uddi4j.datatype.service.BusinessService;
-
-/**
-* The data model element that represents 
-* a UDDI service in a WSIL document
-*/
-public class WsilUddiServiceElement extends WsilServiceElement
-{
-    private BusinessService busService_;
-
-    public WsilUddiServiceElement(String name, Model model, Service service) {
-        super(name, model, service);
-        busService_ = null;
-    }
-
-    public void setServiceDefinition(BusinessService busService) {
-        busService_ = busService;
-    }
-
-    public BusinessService getServiceDefinition() {
-        return busService_;
-    }
-
-    public String getName() {
-        return (busService_ == null) ? null : busService_.getDefaultNameString();
-    }
-
-    public String getDescription() {
-        return (busService_ == null) ? null : busService_.getDefaultDescriptionString();
-    }
-
-    public String getUDDIServiceInquiryAPI() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        return (sd == null) ? null : sd.getLocation();
-    }
-
-    public String getUDDIServiceKey() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        return (sd == null) ? null : sd.getServiceKey().getText();
-    }
-
-    public String getUDDIServiceDiscoveryURL() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        if (sd == null)
-            return null;
-        else {
-            DiscoveryURL discoveryURL = sd.getDiscoveryURL();
-            return (discoveryURL == null) ? null : discoveryURL.getText();
-        }
-    }
-
-    private ServiceDescription getValidUDDIServiceDescription() {
-        Description[] descList = service_.getDescriptions();
-        for (int i = 0; i < descList.length; i++) {
-            ExtensionElement extElement = descList[i].getExtensionElement();
-            // The extension element of a UDDI service description
-            // must be a ServiceDescription element
-            if (!(extElement instanceof ServiceDescription))
-                continue;
-            // A valid ServiceDescription must have an inquiry API
-            if (!Validator.validateURL(((ServiceDescription)extElement).getLocation()))
-                continue;
-            // A valid ServiceDescription must have a service key
-            String serviceKey = ((ServiceDescription)extElement).getServiceKey().getText();
-            if (serviceKey == null || serviceKey.length() <= 0)
-                continue;
-            return (ServiceDescription)extElement;
-        }
-        return null;
-    }
-
-    public boolean validateUDDIService() {
-        ServiceDescription sd = getValidUDDIServiceDescription();
-        return (sd != null);
-    }
-
-    public String getWsdlUrl() {
-        return (new Uddi4jHelper()).getWSDL(getServiceDefinition(), null);
-    }
-
-    public String toString() {
-        return getName();
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
deleted file mode 100644
index 5ed15e27e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsdlServiceElement.java
+++ /dev/null
@@ -1,85 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import java.util.Vector;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-
-import org.apache.wsil.*;
-import org.apache.wsil.extension.*;
-import org.apache.wsil.extension.wsdl.*;
-
-/**
-* The data model element that represents 
-* a WSDL service in a WSIL document
-*/
-public class WsilWsdlServiceElement extends WsilServiceElement
-{
-    public WsilWsdlServiceElement(String name, Model model, Service service) {
-        super(name, model, service);
-    }
-
-    public String getWSDLServiceURL() {
-        Description desc = getValidWSDLDescription();
-        return (desc == null) ? null : makeAbsolute(desc.getLocation());
-    }
-
-    public Vector getWSDLBinding() {
-        Vector v = new Vector();
-        Description[] descList = service_.getDescriptions();
-        for (int i = 0; i < descList.length; i++) {
-            ExtensionElement extElement = descList[i].getExtensionElement();
-            if (extElement != null && extElement instanceof Reference) {
-                ReferencedService refService = ((Reference)extElement).getReferencedService();
-                if (refService != null) {
-                    v.add(refService.getReferencedServiceName());
-                }
-                ImplementedBinding[] implBindingList = ((Reference)extElement).getImplementedBindings();
-                for (int j = 0; j < implBindingList.length; j++) {
-                    v.add(implBindingList[j].getBindingName());
-                }
-            }
-        }
-        return v;
-    }
-    
-    private Description getValidWSDLDescription() {
-        Description[] descList = service_.getDescriptions();
-        for (int i = 0; i < descList.length; i++) {
-            // skip this description if the locatioin attribute is a malformed URL
-            String location = descList[i].getLocation();
-            if (location == null || location.length() <= 0)
-                continue;
-            // skip this description if the extension element indicates
-            // that the description's location contains only the wsdl binding
-            ExtensionElement extElement = descList[i].getExtensionElement();
-            if (extElement != null && extElement instanceof Reference) {
-                Boolean endpointPresent = ((Reference)extElement).getEndpointPresent();
-                if (endpointPresent != null && endpointPresent.booleanValue() == false)
-                    continue;
-            }
-            // a valid description is found
-            return descList[i];
-        }
-        // no valid description is found for this service
-        return null;
-    }
-
-    public boolean validateWSDLService() {
-        Description desc = getValidWSDLDescription();
-        return (desc != null);
-    }
-
-    public String toString() {
-        return getWSDLServiceURL();
-    }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java
deleted file mode 100644
index da1e92fd9..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/datamodel/WsilWsilLinkElement.java
+++ /dev/null
@@ -1,41 +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.wst.ws.internal.explorer.platform.wsil.datamodel;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.apache.wsil.*;
-
-/**
-* The data model element that represents 
-* a WSIL link in a WSIL document
-*/
-public class WsilWsilLinkElement extends WsilLinkElement
-{
-  public WsilWsilLinkElement(String name, Model model, Link link)
-  {
-    super(name, model, link);
-  }
-
-  public String getWSILLinkLocation()
-  {
-    return makeAbsolute(link_.getLocation());
-  }
-
-  public boolean validateWSILLink()
-  {
-    return (link_.getLocation() != null);
-  }
-
-  public String toString()
-  {
-    return getWSILLinkLocation();
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
deleted file mode 100644
index f924206e6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToFavoritesTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToFavoritesTool extends ActionTool {
-    public AddBusinessToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
deleted file mode 100644
index d89451d1d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddBusinessToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddBusinessToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddBusinessToUDDIPerspectiveTool extends ActionTool {
-    public AddBusinessToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddBusinessToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
deleted file mode 100644
index b98c2c6e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToFavoritesTool extends ActionTool {
-    public AddServiceToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
deleted file mode 100644
index c4a921ce8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddServiceToUDDIPerspectiveTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddServiceToUDDIPerspectiveAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddServiceToUDDIPerspectiveTool extends ActionTool {
-    public AddServiceToUDDIPerspectiveTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/add_to_UDDI_perspective_enabled.gif", "wsil/images/add_to_UDDI_perspective_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddServiceToUDDIPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
deleted file mode 100644
index 5f0316a91..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSDLServiceToFavoritesTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSDLServiceToFavoritesTool extends ActionTool {
-    public AddWSDLServiceToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
deleted file mode 100644
index da3cb45ce..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/AddWSILToFavoritesTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.AddToFavoritesAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class AddWSILToFavoritesTool extends ActionTool {
-    public AddWSILToFavoritesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/favorites_enabled.gif", "images/favorites_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return AddToFavoritesAction.getActionLink(selectedNode.getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
deleted file mode 100644
index 4acc5fdbc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ClearWSILTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ClearWSILAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ClearWSILTool extends ActionTool {
-    public ClearWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/clear_enabled.gif", "images/clear_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        return ClearWSILAction.getActionLink(toolManager_.getNode().getNodeId());
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
deleted file mode 100644
index b871050e3..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSDLToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSDLToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSDLToFileSystemTool extends ImportToFileSystemTool {
-    public ImportWSDLToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return ImportWSDLToFileSystemAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
deleted file mode 100644
index dd00c2820..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ImportWSILToFileSystemTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToFileSystemTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.ImportWSILToFileSystemAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ImportWSILToFileSystemTool extends ImportToFileSystemTool {
-    public ImportWSILToFileSystemTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        return ImportWSILToFileSystemAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
deleted file mode 100644
index 1498669b0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIBusinessTool.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListUDDIBusinessTool extends ViewTool {
-    public ListUDDIBusinessTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_business_enabled.gif", "wsil/images/list_business_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        new UddiBusinessDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_UDDI_LINK_DETAILS"));
-        new AddBusinessToUDDIPerspectiveTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_BUSINESS_TO_UDDI_PERSPECTIVE"));
-        new AddBusinessToFavoritesTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_ADD_UDDI_BUSINESS_TO_FAVORITES"));
-        new RefreshUDDIBusinessTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_REFRESH_UDDI_BUSINESS"));
-    }
-
-    public String getFormLink() {
-        return ProxyLoadPageAction.getActionLink("wsil/views/UddiBusinessView.jsp");
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
deleted file mode 100644
index c65bc1680..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListUDDIServicesTool.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.actions.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilSetDefaultViewTool;
-
-public class ListUDDIServicesTool extends ViewTool {
-    public ListUDDIServicesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_UDDI_service_enabled.gif", "wsil/images/list_UDDI_service_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        Controller controller = toolManager_.getNode().getNodeManager().getController();
-        WSILPerspective wsilPerspective = controller.getWSILPerspective();
-        new UddiServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
-        new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-        new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-        new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-        new AddServiceToUDDIPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_UDDI_PERSPECTIVE"));
-        new AddServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_SERVICE_TO_FAVORITES"));
-        new RefreshUDDIServiceTool(viewToolManager, wsilPerspective.getMessage("ALT_REFRESH_UDDI_SERVICE"));
-    }
-
-    public String getFormLink() {
-        return ProxyLoadPageAction.getActionLink("wsil/views/UddiServicesView.jsp");
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
deleted file mode 100644
index 5e51f1900..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSDLServicesTool.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.WsilSetDefaultViewTool;
-
-public class ListWSDLServicesTool extends ViewTool {
-    public ListWSDLServicesTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_WSDL_service_enabled.gif", "wsil/images/list_WSDL_service_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        Controller controller = toolManager_.getNode().getNodeManager().getController();
-        WSILPerspective wsilPerspective = controller.getWSILPerspective();
-        new WsdlServiceDetailsTool(viewToolManager, wsilPerspective.getMessage("ALT_WSIL_SERVICE_DETAILS"));
-        new WsilImportWSDLToWorkbenchTool(viewToolManager, controller.getMessage("ALT_IMPORT_WSDL_TO_WORKBENCH"));
-        new ImportWSDLToFileSystemTool(viewToolManager, controller.getMessage("ALT_WSDL_IMPORT_TO_FS"));
-        new WsilLaunchWebServiceWizardTool(viewToolManager, controller.getMessage("ALT_LAUNCH_WEB_SERVICE_WIZARD"));
-        new WsilAddToWSDLPerspectiveTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_TO_WSDL_PERSPECTIVE"));
-        new AddWSDLServiceToFavoritesTool(viewToolManager, wsilPerspective.getMessage("ALT_ADD_WSDL_SERVICE_TO_FAVORITES"));
-    }
-
-    public String getFormLink() {
-        return "wsil/views/WsdlServicesView.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
deleted file mode 100644
index 3ae52fb46..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/ListWSILLinksTool.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class ListWSILLinksTool extends ViewTool {
-    public ListWSILLinksTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/list_WSIL_enabled.gif", "wsil/images/list_WSIL_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    protected void addSetDefaultViewTool(ToolManager viewToolManager, int index) {
-        new WsilSetDefaultViewTool(viewToolManager,  toolManager_.getNode().getNodeManager().getController().getMessage("ALT_BACK_TO_TOP"));
-    }
-
-    protected void addTools(ToolManager viewToolManager, int index) {
-        new WsilLinkDetailsTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_WSIL_LINK_DETAILS"));
-        new OpenWSILLinkTool(viewToolManager, toolManager_.getNode().getNodeManager().getController().getWSILPerspective().getMessage("ALT_OPEN_WSIL_LINK"));
-    }
-
-    public String getFormLink() {
-        return "wsil/views/WsilLinksView.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
deleted file mode 100644
index c0c61fba4..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILLinkTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.OpenWSILLinkAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILLinkTool extends ActionTool {
-    public OpenWSILLinkTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return OpenWSILLinkAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
deleted file mode 100644
index d9d500934..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/OpenWSILTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class OpenWSILTool extends FormTool {
-    public OpenWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "wsil/images/open_wsil_enabled.gif", "wsil/images/open_wsil_highlighted.gif", alt);
-    }
-
-    protected void initDefaultProperties() {
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/OpenWSILForm.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
deleted file mode 100644
index 5b22a8612..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIBusinessTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIBusinessTool extends ActionTool {
-    public RefreshUDDIBusinessTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
deleted file mode 100644
index cc98791be..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshUDDIServiceTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshUDDIServiceTool extends ActionTool {
-    public RefreshUDDIServiceTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return RefreshAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
deleted file mode 100644
index 00a3c5b3a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/RefreshWSILTool.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ActionTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.RefreshAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class RefreshWSILTool extends ActionTool {
-    public RefreshWSILTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/refresh_enabled.gif", "images/refresh_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getActionLink() {
-        return RefreshAction.getActionLink(toolManager_.getNode().getNodeId(), toolId_, ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
deleted file mode 100644
index f9db177b6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiBusinessDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiBusinessDetailsTool extends FormTool {
-    public UddiBusinessDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/UddiBusinessDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
deleted file mode 100644
index 5d3f5cdc1..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/UddiServiceDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class UddiServiceDetailsTool extends FormTool {
-    public UddiServiceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/UddiServiceDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
deleted file mode 100644
index be28ec8e2..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILImportWSILToWorkbenchTool.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WSILImportWSILToWorkbenchTool extends ImportToWorkbenchTool
-{
-  public WSILImportWSILToWorkbenchTool(ToolManager toolManager, String alt)
-  {
-    super(toolManager, alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory)
-  {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-  }
-
-  public final String getFormLink()
-  {
-    return "wsil/forms/WSILImportWSILToWorkbenchForm.jsp";
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
deleted file mode 100644
index 46f4a9ed6..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WSILPerspective.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.explorer.platform.constants.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*;
-
-import javax.servlet.*;
-
-public class WSILPerspective extends Perspective
-{
-    private BasicModel model_;
-    private NodeManager nodeManager_;
-    private String perspectiveContentFramesetCols_;
-    private String savedPerspectiveContentFramesetCols_;
-    private String actionsContainerFramesetRows_;
-    private String savedActionsContainerFramesetRows_;
-
-    public WSILPerspective(Controller controller)
-    {
-        super("wsil",controller);
-    }
-
-    public final void initPerspective(ServletContext application)
-    {
-        model_ = new BasicModel("WsilModel");
-        TreeElement treeElement = new TreeElement(getMessage("WSIL_MAIN_NODE"), model_);
-        model_.setRootElement(treeElement);
-        nodeManager_ = new NodeManager(controller_);
-        WsilMainNode wsilMainNode = new WsilMainNode(treeElement, nodeManager_);
-        nodeManager_.setRootNode(wsilMainNode);
-
-        // Starting frameset sizes.
-        if (!DirUtils.isRTL())
-          perspectiveContentFramesetCols_ = "30%,*";
-        else
-          perspectiveContentFramesetCols_ = "*,30%";
-        savedPerspectiveContentFramesetCols_ = perspectiveContentFramesetCols_;
-        actionsContainerFramesetRows_ = "75%,*";
-        savedActionsContainerFramesetRows_ = actionsContainerFramesetRows_;
-    }
-
-    public NodeManager getNodeManager() {
-        return nodeManager_;
-    }
-
-    public String getPerspectiveContentPage()
-    {
-        return "wsil/wsil_perspective_content.jsp";
-    }
-
-    public int getPerspectiveId()
-    {
-        return ActionInputs.PERSPECTIVE_WSIL;
-    }
-
-    public String getPanesFile() {
-        return "wsil/scripts/wsilPanes.jsp";
-    }
-    
-    public String getFramesetsFile()
-    {
-      return "wsil/scripts/wsilframesets.jsp";
-    }
-    
-    public String getProcessFramesetsForm()
-    {
-      return "wsil/forms/ProcessWSILFramesetsForm.jsp";
-    }
-
-    public String getTreeContentVar() {
-        return "wsilNavigatorContent";
-    }
-
-    public String getTreeContentPage() {
-        return "wsil/wsil_navigator_content.jsp";
-    }
-
-    public String getPropertiesContainerVar() {
-        return "wsilPropertiesContainer";
-    }
-
-    public String getPropertiesContainerPage() {
-        return "wsil/wsil_properties_container.jsp";
-    }
-
-    public String getStatusContentVar() {
-        return "wsilStatusContent";
-    }
-
-    public String getStatusContentPage() {
-        return "wsil/wsil_status_content.jsp";
-    }
-    
-    public final String getPerspectiveContentFramesetCols()
-    {
-      return perspectiveContentFramesetCols_;
-    }
-    
-    public final void setPerspectiveContentFramesetCols(String cols)
-    {
-      perspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getSavedPerspectiveContentFramesetCols()
-    {
-      return savedPerspectiveContentFramesetCols_;
-    }
-    
-    public final void setSavedPerspectiveContentFramesetCols(String cols)
-    {
-      savedPerspectiveContentFramesetCols_ = cols;
-    }
-    
-    public final String getActionsContainerFramesetRows()
-    {
-      return actionsContainerFramesetRows_;
-    }
-    
-    public final void setActionsContainerFramesetRows(String rows)
-    {
-      actionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSavedActionsContainerFramesetRows()
-    {
-      return savedActionsContainerFramesetRows_;
-    }
-    
-    public final void setSavedActionsContainerFramesetRows(String rows)
-    {
-      savedActionsContainerFramesetRows_ = rows;
-    }
-    
-    public final String getSwitchPerspectiveFormActionLink(int targetPerspectiveId,boolean forHistory)
-    {
-      return SwitchPerspectiveFromWSILAction.getFormActionLink(targetPerspectiveId,forHistory);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
deleted file mode 100644
index 7efdfe6de..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsdlServiceDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsdlServiceDetailsTool extends FormTool {
-    public WsdlServiceDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/WsdlServiceDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
deleted file mode 100644
index a7bcaa5ad..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilAddToWSDLPerspectiveTool.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.*;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.*;
-
-public class WsilAddToWSDLPerspectiveTool extends AddToWSDLPerspectiveTool {
-
-  public WsilAddToWSDLPerspectiveTool(ToolManager toolManager, String alt) {
-    super(toolManager,alt);
-  }
-
-  public String getSelectToolActionHref(boolean forHistory) {
-    Node selectedNode = toolManager_.getNode();
-    return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-  }
-
-  public String getActionLink() {
-    Node selectedNode = toolManager_.getNode();
-    return WsilAddToWSDLPerspectiveAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_);
-  }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
deleted file mode 100644
index caecb8d96..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilDetailsTool extends FormTool {
-    public WsilDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), toolId_, selectedNode.getViewId(), selectedNode.getViewToolId(), forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/WsilDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
deleted file mode 100644
index 0371249ec..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilImportWSDLToWorkbenchTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ImportToWorkbenchTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilImportWSDLToWorkbenchTool extends ImportToWorkbenchTool {
-    public WsilImportWSDLToWorkbenchTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "wsil/forms/WsilImportWSDLToWorkbenchForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
deleted file mode 100644
index cd3110a6b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLaunchWebServiceWizardTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.LaunchWebServiceWizardTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLaunchWebServiceWizardTool extends LaunchWebServiceWizardTool {
-    public WsilLaunchWebServiceWizardTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public final String getFormLink()
-    {
-      return "wsil/forms/WsilLaunchWebServiceWizardForm.jsp";
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
deleted file mode 100644
index 786540471..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilLinkDetailsTool.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.FormTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilLinkDetailsTool extends FormTool {
-    public WsilLinkDetailsTool(ToolManager toolManager, String alt) {
-        super(toolManager, "images/details_enabled.gif", "images/details_highlighted.gif", alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), selectedNode.getViewId(), toolId_, forHistory);
-    }
-
-    public String getFormLink() {
-        return "wsil/forms/WsilLinkDetailsPage.jsp";
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
deleted file mode 100644
index 428929bde..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilMainNode.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.datamodel.*;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-
-public class WsilMainNode extends WsilNavigatorNode {
-
-    public WsilMainNode(TreeElement treeElement, NodeManager nodeManager) {
-        super(treeElement, nodeManager, 1, "images/root_main.gif");
-        treeElement.addListener(new ElementAdapter() {
-                                                   public void relAdded(RelAddEvent event) {
-                                                       String rel = event.getOutBoundRelName();
-                                                       if (rel.equals(WsilModelConstants.REL_WSIL)) {
-                                                           WsilNode wsilNode = new WsilNode((TreeElement)event.getParentElement(), nodeManager_, nodeDepth_ + 1);
-                                                           addChild(wsilNode);
-                                                       }
-                                                   }
-
-                                                   public void relRemoved(RelRemoveEvent event) {
-                                                       TreeElement childElement = null;
-                                                       if (event.getInBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
-                                                           childElement = (TreeElement)event.getInboundElement();
-                                                       }
-                                                       if (event.getOutBoundRelName().equals(WsilModelConstants.REL_WSIL)) {
-                                                           childElement = (TreeElement)event.getOutBoundElement();
-                                                       }
-                                                       removeChildNode(childElement);
-                                                   }
-                                               });
-    }
-
-    protected void initTools() {
-        WSILPerspective wsilPerspective = nodeManager_.getController().getWSILPerspective();
-        new OpenWSILTool(toolManager_, wsilPerspective.getMessage("ALT_OPEN_WSIL"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
deleted file mode 100644
index 6a22957ee..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNavigatorNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILNodeAction;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.WsilToggleNodeAction;
-
-public abstract class WsilNavigatorNode extends Node {
-
-    public WsilNavigatorNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth, String imagePath) {
-        super(treeElement, nodeManager, nodeDepth, imagePath);
-    }
-
-    protected String getToggleNodeActionHref() {
-        return WsilToggleNodeAction.getActionLink(nodeId_,isOpen_);
-    }
-
-    protected String getLinkActionHref() {
-        return SelectWSILNodeAction.getActionLink(nodeId_, false);
-    }
-
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
deleted file mode 100644
index aa869edff..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilNode.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.NodeManager;
-
-public class WsilNode extends WsilNavigatorNode {
-
-    public WsilNode(TreeElement treeElement, NodeManager nodeManager, int nodeDepth) {
-        super(treeElement, nodeManager, nodeDepth, "wsil/images/wsil_node.gif");
-    }
-
-    protected void initTools() {
-        Controller controller = nodeManager_.getController();
-        WSILPerspective wsilPerspective = controller.getWSILPerspective();
-        new WsilDetailsTool(toolManager_, wsilPerspective.getMessage("ALT_WSIL_DETAILS"));
-        new ListWSDLServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSDL_SERVICES"));
-        new ListUDDIServicesTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_SERVICES"));
-        new ListUDDIBusinessTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_UDDI_LINKS"));
-        new ListWSILLinksTool(toolManager_, wsilPerspective.getMessage("ALT_LIST_WSIL_LINKS"));
-        new WSILImportWSILToWorkbenchTool(toolManager_, wsilPerspective.getMessage("ATL_IMPORT_WSIL_TO_WORKBENCH"));
-        new ImportWSILToFileSystemTool(toolManager_, controller.getMessage("ALT_WSIL_IMPORT_TO_FS"));
-        new AddWSILToFavoritesTool(toolManager_, wsilPerspective.getMessage("ALT_ADD_WSIL_TO_FAVORITES"));
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
deleted file mode 100644
index 39f63382e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/perspective/WsilSetDefaultViewTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.SetDefaultViewTool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.actions.SelectWSILToolAction;
-
-public class WsilSetDefaultViewTool extends SetDefaultViewTool {
-    public WsilSetDefaultViewTool(ToolManager toolManager, String alt) {
-        super(toolManager, alt);
-    }
-
-    public String getSelectToolActionHref(boolean forHistory) {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, forHistory);
-    }
-
-    public String getActionLink() {
-        Node selectedNode = toolManager_.getNode();
-        return SelectWSILToolAction.getActionLink(selectedNode.getNodeId(), selectedNode.getToolManager().getSelectedToolId(), ActionInputs.VIEWID_DEFAULT, ActionInputs.VIEWTOOLID_DEFAULT, false);
-    }
-}
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java b/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
deleted file mode 100644
index b265d2813..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer-src/org/eclipse/wst/ws/internal/explorer/platform/wsil/transformer/WSILViewSelectionTransformer.java
+++ /dev/null
@@ -1,140 +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.wst.ws.internal.explorer.platform.wsil.transformer;
-
-import java.util.Hashtable;
-
-import org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs;
-import org.eclipse.wst.ws.internal.explorer.platform.datamodel.TreeElement;
-import org.eclipse.wst.ws.internal.explorer.platform.engine.transformer.ViewSelectionTransformer;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Node;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.Tool;
-import org.eclipse.wst.ws.internal.explorer.platform.perspective.ToolManager;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.constants.WsilModelConstants;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.datamodel.WsilElement;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIBusinessTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListUDDIServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSDLServicesTool;
-import org.eclipse.wst.ws.internal.explorer.platform.wsil.perspective.ListWSILLinksTool;
-
-public class WSILViewSelectionTransformer extends ViewSelectionTransformer
-{
-  public static final byte NONE = 0;
-  public static final byte WSDL_SERVICE = 1;
-  public static final byte UDDI_SERVICE = 2;
-  public static final byte UDDI_BUSINESS = 3;
-  public static final byte WSIL_LINK = 4;
-  public static final byte FROM_TOOLID = 5;
-  private byte type;
-
-  public WSILViewSelectionTransformer(Controller controller)
-  {
-    this(controller, "", ActionInputs.VIEWID, FROM_TOOLID);
-  }
-
-  public WSILViewSelectionTransformer(Controller controller, String listManagerKey, String viewKey, byte type)
-  {
-    super(controller, listManagerKey, viewKey);
-    this.type = type;
-  }
-
-  public Hashtable normalize(Hashtable properties)
-  {
-    if (type == FROM_TOOLID)
-    {
-      Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-      if (currNode != null)
-      {
-        try
-        {
-          int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
-          ToolManager toolManager = currNode.getToolManager();
-          Tool tool = toolManager.getTool(toolId);
-          if (tool instanceof ListWSDLServicesTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
-          else if (tool instanceof ListUDDIServicesTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
-          else if (tool instanceof ListUDDIBusinessTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
-          else if (tool instanceof ListWSILLinksTool)
-            listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
-        }
-        catch (NumberFormatException nfe)
-        {
-        }
-      }
-    }
-    return super.normalize(properties);
-  }
-
-  public Hashtable deNormalize(Hashtable properties)
-  {
-    Node currNode = controller.getCurrentPerspective().getNodeManager().getSelectedNode();
-    if (currNode != null)
-    {
-      TreeElement currElement = currNode.getTreeElement();
-      if (currElement instanceof WsilElement)
-      {
-        WsilElement wsilElement = (WsilElement) currElement;
-        switch (type)
-        {
-          case WSDL_SERVICE :
-            wsilElement.getAllWSDLServices();
-            break;
-          case UDDI_SERVICE :
-            wsilElement.getAllUDDIServices();
-            break;
-          case UDDI_BUSINESS :
-            wsilElement.getAllUDDILinks();
-            break;
-          case WSIL_LINK :
-            wsilElement.getAllWSILLinks();
-            break;
-          case FROM_TOOLID :
-            try
-            {
-              int toolId = Integer.parseInt((String) properties.get(ActionInputs.TOOLID));
-              ToolManager toolManager = currNode.getToolManager();
-              Tool tool = toolManager.getTool(toolId);
-              if (tool instanceof ListWSDLServicesTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_WSDL_SERVICES;
-                wsilElement.getAllWSDLServices();
-              }
-              else if (tool instanceof ListUDDIServicesTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_SERVICES;
-                wsilElement.getAllUDDIServices();
-              }
-              else if (tool instanceof ListUDDIBusinessTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_UDDI_LINKS;
-                wsilElement.getAllUDDILinks();
-              }
-              else if (tool instanceof ListWSILLinksTool)
-              {
-                listManagerKey = WsilModelConstants.LIST_MANAGER_WSIL_LINKS;
-                wsilElement.getAllWSILLinks();
-              }
-            }
-            catch (NumberFormatException nfe)
-            {
-            }
-            break;
-          default :
-            break;
-        }
-      }
-    }
-    return super.deNormalize(properties);
-  }
-}
-\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/favorites/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/uddi/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/fragment/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsdl/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/forms/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/scripts/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/classes/wsil/views/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
deleted file mode 100644
index d392f0e82..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/web.xml b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/web.xml
deleted file mode 100644
index ef49b297a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/WEB-INF/web.xml
+++ /dev/null
@@ -1,3573 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
-<!--
-Automatically created by Tomcat JspC.
--->
-<web-app>
-
-
-	<servlet>
-		<servlet-name>actionengine_jsp</servlet-name>
-		<servlet-class>actionengine_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actionengine_container_jsp</servlet-name>
-		<servlet-class>actionengine_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>calendar_browser_jsp</servlet-name>
-		<servlet-class>calendar_browser_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>calendar_content_jsp</servlet-name>
-		<servlet-class>calendar_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>calendar_toolbar_jsp</servlet-name>
-		<servlet-class>calendar_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>launch_options_registry_jsp</servlet-name>
-		<servlet-class>launch_options_registry_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>perspective_content_jsp</servlet-name>
-		<servlet-class>perspective_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>perspective_toolbar_jsp</servlet-name>
-		<servlet-class>perspective_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl_browser_jsp</servlet-name>
-		<servlet-class>wsdl_browser_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl_content_jsp</servlet-name>
-		<servlet-class>wsdl_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl_toolbar_jsp</servlet-name>
-		<servlet-class>wsdl_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsexplorer_jsp</servlet-name>
-		<servlet-class>wsexplorer_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_actions_container_jsp</servlet-name>
-		<servlet-class>wsil.wsil_actions_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_navigator_container_jsp</servlet-name>
-		<servlet-class>wsil.wsil_navigator_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_navigator_content_jsp</servlet-name>
-		<servlet-class>wsil.wsil_navigator_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_navigator_toolbar_jsp</servlet-name>
-		<servlet-class>wsil.wsil_navigator_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_perspective_content_jsp</servlet-name>
-		<servlet-class>wsil.wsil_perspective_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_properties_container_jsp</servlet-name>
-		<servlet-class>wsil.wsil_properties_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_properties_content_jsp</servlet-name>
-		<servlet-class>wsil.wsil_properties_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_properties_toolbar_jsp</servlet-name>
-		<servlet-class>wsil.wsil_properties_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_status_container_jsp</servlet-name>
-		<servlet-class>wsil.wsil_status_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_status_content_jsp</servlet-name>
-		<servlet-class>wsil.wsil_status_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.wsil_status_toolbar_jsp</servlet-name>
-		<servlet-class>wsil.wsil_status_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.views.UddiBusinessView_jsp</servlet-name>
-		<servlet-class>wsil.views.UddiBusinessView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.views.UddiServicesView_jsp</servlet-name>
-		<servlet-class>wsil.views.UddiServicesView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.views.WsdlServicesView_jsp</servlet-name>
-		<servlet-class>wsil.views.WsdlServicesView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.views.WsilLinksView_jsp</servlet-name>
-		<servlet-class>wsil.views.WsilLinksView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.scripts.wsilAbstractTable_jsp</servlet-name>
-		<servlet-class>wsil.scripts.wsilAbstractTable_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.scripts.wsilFormSubmit_jsp</servlet-name>
-		<servlet-class>wsil.scripts.wsilFormSubmit_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.scripts.wsilframesets_jsp</servlet-name>
-		<servlet-class>wsil.scripts.wsilframesets_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.scripts.wsilNameTable_jsp</servlet-name>
-		<servlet-class>wsil.scripts.wsilNameTable_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.scripts.wsilPanes_jsp</servlet-name>
-		<servlet-class>wsil.scripts.wsilPanes_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.scripts.wsilTable_jsp</servlet-name>
-		<servlet-class>wsil.scripts.wsilTable_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.OpenWSILForm_jsp</servlet-name>
-		<servlet-class>wsil.forms.OpenWSILForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.ProcessWSILFramesetsForm_jsp</servlet-name>
-		<servlet-class>wsil.forms.ProcessWSILFramesetsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.UddiBusinessDetailsPage_jsp</servlet-name>
-		<servlet-class>wsil.forms.UddiBusinessDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.UddiServiceDetailsPage_jsp</servlet-name>
-		<servlet-class>wsil.forms.UddiServiceDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.WsdlServiceDetailsPage_jsp</servlet-name>
-		<servlet-class>wsil.forms.WsdlServiceDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.WsilDetailsPage_jsp</servlet-name>
-		<servlet-class>wsil.forms.WsilDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.WsilImportWSDLToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>wsil.forms.WsilImportWSDLToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.WSILImportWSILToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>wsil.forms.WSILImportWSILToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.WsilLaunchWebServiceWizardForm_jsp</servlet-name>
-		<servlet-class>wsil.forms.WsilLaunchWebServiceWizardForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.forms.WsilLinkDetailsPage_jsp</servlet-name>
-		<servlet-class>wsil.forms.WsilLinkDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.ClearNodeConfirmJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.ClearNodeConfirmJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.ClearWSILActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.ClearWSILActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.ImportWSDLToFileSystemActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.ImportWSDLToFileSystemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.ImportWSILToFileSystemActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.ImportWSILToFileSystemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.OpenWSILActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.OpenWSILActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.OpenWSILLinkActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.OpenWSILLinkActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.RefreshActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.RefreshActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.ResizeWSILFramesActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.ResizeWSILFramesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.SelectWSILNodeActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.SelectWSILNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.SelectWSILToolActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.SelectWSILToolActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.SwitchPerspectiveFromWSILActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.SwitchPerspectiveFromWSILActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilAddToFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilAddToFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilAddToUDDIPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilAddToUDDIPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilAddToWSDLPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilAddToWSDLPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilCheckFavoriteExistsActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilCheckFavoriteExistsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilImportWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilImportWSDLToWorkbenchActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WSILImportWSILToWorkbenchActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WSILImportWSILToWorkbenchActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilLaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilLaunchWebServiceWizardActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsil.actions.WsilToggleNodeActionJSP_jsp</servlet-name>
-		<servlet-class>wsil.actions.WsilToggleNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.soap_envelope_xml_jsp</servlet-name>
-		<servlet-class>wsdl.soap_envelope_xml_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_actions_container_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_actions_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_navigator_container_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_navigator_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_navigator_content_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_navigator_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_navigator_toolbar_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_navigator_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_perspective_content_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_perspective_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_properties_container_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_properties_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_properties_content_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_properties_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_properties_toolbar_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_properties_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_result_content_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_result_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_status_container_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_status_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_status_content_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_status_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.wsdl_status_toolbar_jsp</servlet-name>
-		<servlet-class>wsdl.wsdl_status_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.scripts.fragmenttables_jsp</servlet-name>
-		<servlet-class>wsdl.scripts.fragmenttables_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.scripts.wsdlframesets_jsp</servlet-name>
-		<servlet-class>wsdl.scripts.wsdlframesets_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.scripts.wsdlpanes_jsp</servlet-name>
-		<servlet-class>wsdl.scripts.wsdlpanes_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.SOAPEncArrayFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.SOAPEncArrayFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.SOAPEncArrayRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.SOAPEncArrayRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.SOAPEncArrayRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.SOAPEncArrayRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDComplexFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDComplexFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDComplexRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDComplexRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDComplexRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDComplexRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDDefaultInfoFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDDefaultInfoFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDDefaultRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDDefaultRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDDefaultRFragmentXML_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDDefaultRFragmentXML_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDDefaultWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDDefaultWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDDelegationRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDDelegationRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDDelegationWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDDelegationWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDEmptyRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDEmptyRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDEmptyWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDEmptyWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupAllWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupAllWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupChoiceFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupChoiceFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupChoiceRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupChoiceRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupChoiceRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupChoiceRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupSeqFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupSeqFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDGroupSeqRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDGroupSeqRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDInfoDialog_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDInfoDialog_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDInfo_content_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDInfo_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDInfo_toolbar_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDInfo_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicDateTimeFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicDateTimeFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicDateTimeRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicDateTimeRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicEnumFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicEnumFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicEnumRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicEnumRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicInfoFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicInfoFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleAtomicRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleListFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleListFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleListRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleListRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleListRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleListRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleUnionFixWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleUnionFixWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleUnionRangeWFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleUnionRangeWFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.fragment.XSDSimpleUnionRFragmentJSP_jsp</servlet-name>
-		<servlet-class>wsdl.fragment.XSDSimpleUnionRFragmentJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.bindings_table_jsp</servlet-name>
-		<servlet-class>wsdl.forms.bindings_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.endpoint_table_jsp</servlet-name>
-		<servlet-class>wsdl.forms.endpoint_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.FragmentsFormView_jsp</servlet-name>
-		<servlet-class>wsdl.forms.FragmentsFormView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.FragmentsSoapView_jsp</servlet-name>
-		<servlet-class>wsdl.forms.FragmentsSoapView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.InvokeWSDLOperationForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.InvokeWSDLOperationForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.OpenWSDLForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.OpenWSDLForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.operations_table_jsp</servlet-name>
-		<servlet-class>wsdl.forms.operations_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.ProcessWSDLFramesetsForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.ProcessWSDLFramesetsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.ReadOnlyFragmentsFormView_jsp</servlet-name>
-		<servlet-class>wsdl.forms.ReadOnlyFragmentsFormView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.ReadOnlyFragmentsSoapView_jsp</servlet-name>
-		<servlet-class>wsdl.forms.ReadOnlyFragmentsSoapView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.services_table_jsp</servlet-name>
-		<servlet-class>wsdl.forms.services_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLBindingDetailsForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLBindingDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLDetailsForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLDetailsFormView_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLDetailsFormView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLDetailsSourceView_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLDetailsSourceView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLImportWSDLToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLImportWSDLToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLLaunchWebServiceWizardForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLLaunchWebServiceWizardForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.forms.WSDLServiceDetailsForm_jsp</servlet-name>
-		<servlet-class>wsdl.forms.WSDLServiceDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.ClearWSDLActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.ClearWSDLActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.CreateInstanceActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.CreateInstanceActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.InvokeWSDLHttpGetOperationFormActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.InvokeWSDLHttpGetOperationFormActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.InvokeWSDLHttpPostOperationFormActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.InvokeWSDLHttpPostOperationFormActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.InvokeWSDLSOAPOperationFormActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.InvokeWSDLSOAPOperationFormActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.InvokeWSDLSOAPOperationSourceActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.InvokeWSDLSOAPOperationSourceActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.OpenWSDLActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.OpenWSDLActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.RefreshWSDLActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.RefreshWSDLActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.ResizeWSDLFramesActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.ResizeWSDLFramesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SelectWSDLNavigatorNodeActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SelectWSDLNavigatorNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SelectWSDLPropertiesToolActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SelectWSDLPropertiesToolActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SwitchPerspectiveFromWSDLActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SwitchPerspectiveFromWSDLActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SwitchReadOnlyFragmentViewsActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SwitchReadOnlyFragmentViewsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SwitchWSDLDetailsViewsActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SwitchWSDLDetailsViewsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SynchronizeFragmentViewsActionAbortJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SynchronizeFragmentViewsActionAbortJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.SynchronizeFragmentViewsActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.SynchronizeFragmentViewsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.ToggleWSDLNavigatorNodeActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.ToggleWSDLNavigatorNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.UpdateWSDLBindingActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.UpdateWSDLBindingActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.WSDLAddToFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.WSDLAddToFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.WSDLCheckFavoriteExistsActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.WSDLCheckFavoriteExistsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.WSDLImportWSDLToFileSystemActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.WSDLImportWSDLToFileSystemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.WSDLImportWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.WSDLImportWSDLToWorkbenchActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>wsdl.actions.WSDLLaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<servlet-class>wsdl.actions.WSDLLaunchWebServiceWizardActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions_container_jsp</servlet-name>
-		<servlet-class>uddi.actions_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.category_browser_jsp</servlet-name>
-		<servlet-class>uddi.category_browser_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.category_content_jsp</servlet-name>
-		<servlet-class>uddi.category_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.category_toolbar_jsp</servlet-name>
-		<servlet-class>uddi.category_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.navigator_container_jsp</servlet-name>
-		<servlet-class>uddi.navigator_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.navigator_content_jsp</servlet-name>
-		<servlet-class>uddi.navigator_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.navigator_toolbar_jsp</servlet-name>
-		<servlet-class>uddi.navigator_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.properties_container_jsp</servlet-name>
-		<servlet-class>uddi.properties_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.properties_content_jsp</servlet-name>
-		<servlet-class>uddi.properties_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.properties_toolbar_jsp</servlet-name>
-		<servlet-class>uddi.properties_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.status_container_jsp</servlet-name>
-		<servlet-class>uddi.status_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.status_content_jsp</servlet-name>
-		<servlet-class>uddi.status_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.status_toolbar_jsp</servlet-name>
-		<servlet-class>uddi.status_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.uddi_perspective_content_jsp</servlet-name>
-		<servlet-class>uddi.uddi_perspective_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.scripts.cbpanes_jsp</servlet-name>
-		<servlet-class>uddi.scripts.cbpanes_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.scripts.detailstables_jsp</servlet-name>
-		<servlet-class>uddi.scripts.detailstables_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.scripts.results_jsp</servlet-name>
-		<servlet-class>uddi.scripts.results_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.scripts.uddiframesets_jsp</servlet-name>
-		<servlet-class>uddi.scripts.uddiframesets_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.scripts.uddipanes_jsp</servlet-name>
-		<servlet-class>uddi.scripts.uddipanes_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.scripts.udditables_jsp</servlet-name>
-		<servlet-class>uddi.scripts.udditables_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.advancedCommon_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.advancedCommon_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.authentication_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.authentication_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.BusinessDetailsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.BusinessDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.BusPublishServiceAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.BusPublishServiceAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.BusPublishServiceForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.BusPublishServiceForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.BusPublishServiceSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.BusPublishServiceSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.categories_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.categories_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.detailsCategories_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.detailsCategories_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.detailsDiscoveryURLs_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.detailsDiscoveryURLs_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.detailsIdentifiers_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.detailsIdentifiers_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.detailsLanguageInput_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.detailsLanguageInput_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.detailsSingleItem_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.detailsSingleItem_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.discoveryURLs_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.discoveryURLs_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.findQualifiers_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.findQualifiers_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.GetForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.GetForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.identifiers_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.identifiers_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ItemsSummaryForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ItemsSummaryForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.languageInput_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.languageInput_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ManagePublisherAssertionsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ManagePublisherAssertionsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ManageReferencedServicesForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ManageReferencedServicesForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.names_findQualifiers_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.names_findQualifiers_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.OpenPrivateRegistryForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.OpenPrivateRegistryForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.OpenRegistryForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.OpenRegistryForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ProcessUDDIFramesetsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ProcessUDDIFramesetsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegDetailsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindBusinessesAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindBusinessesAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindBusinessesForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindBusinessesForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindBusinessesSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindBusinessesSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindServiceInterfacesAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindServiceInterfacesAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindServiceInterfacesForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindServiceInterfacesForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindServiceInterfacesSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindServiceInterfacesSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindServicesAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindServicesAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindServicesForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindServicesForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindServicesSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindServicesSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegFindUUIDForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegFindUUIDForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishBusinessAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishBusinessAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishBusinessForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishBusinessForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishBusinessSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishBusinessSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishServiceAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishServiceAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishServiceForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishServiceForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishServiceInterfaceAdvancedForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishServiceInterfaceAdvancedForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishServiceInterfaceForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishServiceInterfaceForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishServiceInterfaceSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishServiceInterfaceSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.RegPublishServiceSimpleForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.RegPublishServiceSimpleForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ResultsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ResultsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.results_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.results_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ServiceDetailsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ServiceDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ServiceInterfaceDetailsForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.ServiceInterfaceDetailsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.UDDIImportWSDLToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.UDDIImportWSDLToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.UDDILaunchWebServiceWizardForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.UDDILaunchWebServiceWizardForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.uddiObjectsPublisherAssertions_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.uddiObjectsPublisherAssertions_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.uddiObjects_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.uddiObjects_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.ud_categories_table_jsp</servlet-name>
-		<servlet-class>uddi.forms.ud_categories_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.forms.UnpublishForm_jsp</servlet-name>
-		<servlet-class>uddi.forms.UnpublishForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.AddItemsToFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.AddItemsToFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.AddPublisherAssertionsActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.AddPublisherAssertionsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.AddToFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.AddToFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.BusinessGetServicesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.BusinessGetServicesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.BusPublishServiceAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.BusPublishServiceAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.BusPublishServiceSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.BusPublishServiceSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.CheckFavoriteExistsActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.CheckFavoriteExistsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ClearNavigatorNodeActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ClearNavigatorNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ClearNavigatorNodesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ClearNavigatorNodesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.CompletePublisherAssertionsActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.CompletePublisherAssertionsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ManageReferencedServicesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ManageReferencedServicesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.OpenRegistryActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.OpenRegistryActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RefreshUDDINodeActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RefreshUDDINodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RefreshUDDINodesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RefreshUDDINodesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindBusinessesAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindBusinessesAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindBusinessesSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindBusinessesSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindBusinessUUIDActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindBusinessUUIDActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindServiceInterfacesAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindServiceInterfacesAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindServiceInterfacesSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindServiceInterfacesSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindServiceInterfaceUUIDActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindServiceInterfaceUUIDActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindServicesAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindServicesAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindServicesSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindServicesSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegFindServiceUUIDActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegFindServiceUUIDActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegPublishBusinessAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegPublishBusinessAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegPublishBusinessSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegPublishBusinessSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegPublishServiceAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegPublishServiceAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegPublishServiceInterfaceAdvancedActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegPublishServiceInterfaceAdvancedActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegPublishServiceInterfaceSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegPublishServiceInterfaceSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RegPublishServiceSimpleActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RegPublishServiceSimpleActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RemovePublisherAssertionsActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RemovePublisherAssertionsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.RemoveSubQueryItemActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.RemoveSubQueryItemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ResizeUDDIFramesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ResizeUDDIFramesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.SelectCategoryNodeActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.SelectCategoryNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.SelectFindToolActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.SelectFindToolActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.SelectNavigatorNodeActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.SelectNavigatorNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.SelectPropertiesToolActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.SelectPropertiesToolActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.SelectSubQueryItemActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.SelectSubQueryItemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ServiceGetBusinessActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ServiceGetBusinessActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ServiceGetServiceInterfacesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ServiceGetServiceInterfacesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ServiceInterfaceGetBusinessesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ServiceInterfaceGetBusinessesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ServiceInterfaceGetServicesActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ServiceInterfaceGetServicesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ShowPublisherAssertionsActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ShowPublisherAssertionsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.SwitchPerspectiveFromUDDIActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.SwitchPerspectiveFromUDDIActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ToggleCategoryNodeActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ToggleCategoryNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.ToggleNavigatorNodeActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.ToggleNavigatorNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.TransferSubQueryResultsActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.TransferSubQueryResultsActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.TransferToAddCategoryDataActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.TransferToAddCategoryDataActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UDDIAddToWSDLPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UDDIAddToWSDLPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UDDIImportWSDLToFileSystemActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UDDIImportWSDLToFileSystemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UDDIImportWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UDDIImportWSDLToWorkbenchActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UDDILaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UDDILaunchWebServiceWizardActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UnpublishActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UnpublishActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UpdateBusinessActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UpdateBusinessActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UpdateNewPublishActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UpdateNewPublishActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UpdateRegistryActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UpdateRegistryActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UpdateServiceActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UpdateServiceActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UpdateServiceInterfaceActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UpdateServiceInterfaceActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>uddi.actions.UpdateServiceNewPublishBusinessActionJSP_jsp</servlet-name>
-		<servlet-class>uddi.actions.UpdateServiceNewPublishBusinessActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.calendarbrowser_jsp</servlet-name>
-		<servlet-class>scripts.calendarbrowser_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.formsubmit_jsp</servlet-name>
-		<servlet-class>scripts.formsubmit_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.formutils_jsp</servlet-name>
-		<servlet-class>scripts.formutils_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.panes_jsp</servlet-name>
-		<servlet-class>scripts.panes_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.switchperspective_jsp</servlet-name>
-		<servlet-class>scripts.switchperspective_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.tables_jsp</servlet-name>
-		<servlet-class>scripts.tables_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>scripts.wsdlbrowser_jsp</servlet-name>
-		<servlet-class>scripts.wsdlbrowser_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.ImportToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>forms.ImportToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.ImportWSDLAndWSILToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>forms.ImportWSDLAndWSILToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.LaunchWebServiceWizardForm_jsp</servlet-name>
-		<servlet-class>forms.LaunchWebServiceWizardForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.otherActions_jsp</servlet-name>
-		<servlet-class>forms.otherActions_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.ProxyLoadContent_jsp</servlet-name>
-		<servlet-class>forms.ProxyLoadContent_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.ProxyLoadPage_jsp</servlet-name>
-		<servlet-class>forms.ProxyLoadPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>forms.simpleCommon_table_jsp</servlet-name>
-		<servlet-class>forms.simpleCommon_table_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_actions_container_jsp</servlet-name>
-		<servlet-class>favorites.fav_actions_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_navigator_container_jsp</servlet-name>
-		<servlet-class>favorites.fav_navigator_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_navigator_content_jsp</servlet-name>
-		<servlet-class>favorites.fav_navigator_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_navigator_toolbar_jsp</servlet-name>
-		<servlet-class>favorites.fav_navigator_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_perspective_content_jsp</servlet-name>
-		<servlet-class>favorites.fav_perspective_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_properties_container_jsp</servlet-name>
-		<servlet-class>favorites.fav_properties_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_properties_content_jsp</servlet-name>
-		<servlet-class>favorites.fav_properties_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_properties_toolbar_jsp</servlet-name>
-		<servlet-class>favorites.fav_properties_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_status_container_jsp</servlet-name>
-		<servlet-class>favorites.fav_status_container_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_status_content_jsp</servlet-name>
-		<servlet-class>favorites.fav_status_content_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.fav_status_toolbar_jsp</servlet-name>
-		<servlet-class>favorites.fav_status_toolbar_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.views.ListFavoriteUDDIBusinessView_jsp</servlet-name>
-		<servlet-class>favorites.views.ListFavoriteUDDIBusinessView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.views.ListFavoriteUDDIRegistryView_jsp</servlet-name>
-		<servlet-class>favorites.views.ListFavoriteUDDIRegistryView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.views.ListFavoriteUDDIServiceInterfaceView_jsp</servlet-name>
-		<servlet-class>favorites.views.ListFavoriteUDDIServiceInterfaceView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.views.ListFavoriteUDDIServiceView_jsp</servlet-name>
-		<servlet-class>favorites.views.ListFavoriteUDDIServiceView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.views.ListFavoriteWSDLServiceView_jsp</servlet-name>
-		<servlet-class>favorites.views.ListFavoriteWSDLServiceView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.views.ListFavoriteWSILView_jsp</servlet-name>
-		<servlet-class>favorites.views.ListFavoriteWSILView_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.scripts.favoritesFormSubmit_jsp</servlet-name>
-		<servlet-class>favorites.scripts.favoritesFormSubmit_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.scripts.favoritesframesets_jsp</servlet-name>
-		<servlet-class>favorites.scripts.favoritesframesets_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.scripts.favoritesPanes_jsp</servlet-name>
-		<servlet-class>favorites.scripts.favoritesPanes_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.scripts.favoritesTable_jsp</servlet-name>
-		<servlet-class>favorites.scripts.favoritesTable_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesImportToWorkbenchForm_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesImportToWorkbenchForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesLaunchWebServiceWizardForm_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesLaunchWebServiceWizardForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesUDDIBusinessDetailsPage_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesUDDIBusinessDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesUDDIRegistryDetailsPage_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesUDDIRegistryDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesUDDIServiceDetailsPage_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesUDDIServiceDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesUDDIServiceIntDetailsPage_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesUDDIServiceIntDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesWSDLDetailsPage_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesWSDLDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.FavoritesWSILDetailsPage_jsp</servlet-name>
-		<servlet-class>favorites.forms.FavoritesWSILDetailsPage_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.forms.ProcessFavoritesFramesetsForm_jsp</servlet-name>
-		<servlet-class>favorites.forms.ProcessFavoritesFramesetsForm_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.AddWSILToWSILPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.AddWSILToWSILPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.FavoritesAddToUDDIPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.FavoritesAddToUDDIPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.FavoritesAddToWSDLPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.FavoritesAddToWSDLPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.FavoritesImportToFileSystemActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.FavoritesImportToFileSystemActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.FavoritesImportToWorkbenchActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.FavoritesImportToWorkbenchActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.FavoritesLaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.FavoritesLaunchWebServiceWizardActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.FavoritesToggleNodeActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.FavoritesToggleNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.RemoveFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.RemoveFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.RemoveFavoritesConfirmJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.RemoveFavoritesConfirmJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.ResizeFavoritesFramesActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.ResizeFavoritesFramesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.RestoreDefaultFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.RestoreDefaultFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.RestoreDefaultFavoritesConfirmJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.RestoreDefaultFavoritesConfirmJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.SelectFavoritesNodeActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.SelectFavoritesNodeActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.SelectFavoritesToolActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.SelectFavoritesToolActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>favorites.actions.SwitchPerspectiveFromFavoritesActionJSP_jsp</servlet-name>
-		<servlet-class>favorites.actions.SwitchPerspectiveFromFavoritesActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actions.CheckWorkbenchFileReadOnlyActionJSP_jsp</servlet-name>
-		<servlet-class>actions.CheckWorkbenchFileReadOnlyActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actions.RetrieveHistoryActionJSP_jsp</servlet-name>
-		<servlet-class>actions.RetrieveHistoryActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actions.SaveActionEngineScenario_jsp</servlet-name>
-		<servlet-class>actions.SaveActionEngineScenario_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actions.ShowPerspectiveActionJSP_jsp</servlet-name>
-		<servlet-class>actions.ShowPerspectiveActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actions.ValidateEditActionJSP_jsp</servlet-name>
-		<servlet-class>actions.ValidateEditActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet>
-		<servlet-name>actions.WriteWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<servlet-class>actions.WriteWSDLToWorkbenchActionJSP_jsp</servlet-class>
-	</servlet>
-
-	<servlet-mapping>
-		<servlet-name>actionengine_jsp</servlet-name>
-		<url-pattern>/actionengine.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actionengine_container_jsp</servlet-name>
-		<url-pattern>/actionengine_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>calendar_browser_jsp</servlet-name>
-		<url-pattern>/calendar_browser.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>calendar_content_jsp</servlet-name>
-		<url-pattern>/calendar_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>calendar_toolbar_jsp</servlet-name>
-		<url-pattern>/calendar_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>launch_options_registry_jsp</servlet-name>
-		<url-pattern>/launch_options_registry.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>perspective_content_jsp</servlet-name>
-		<url-pattern>/perspective_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>perspective_toolbar_jsp</servlet-name>
-		<url-pattern>/perspective_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl_browser_jsp</servlet-name>
-		<url-pattern>/wsdl_browser.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl_content_jsp</servlet-name>
-		<url-pattern>/wsdl_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl_toolbar_jsp</servlet-name>
-		<url-pattern>/wsdl_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsexplorer_jsp</servlet-name>
-		<url-pattern>/wsexplorer.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_actions_container_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_actions_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_navigator_container_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_navigator_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_navigator_content_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_navigator_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_navigator_toolbar_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_navigator_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_perspective_content_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_perspective_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_properties_container_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_properties_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_properties_content_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_properties_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_properties_toolbar_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_properties_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_status_container_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_status_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_status_content_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_status_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.wsil_status_toolbar_jsp</servlet-name>
-		<url-pattern>/wsil/wsil_status_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.views.UddiBusinessView_jsp</servlet-name>
-		<url-pattern>/wsil/views/UddiBusinessView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.views.UddiServicesView_jsp</servlet-name>
-		<url-pattern>/wsil/views/UddiServicesView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.views.WsdlServicesView_jsp</servlet-name>
-		<url-pattern>/wsil/views/WsdlServicesView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.views.WsilLinksView_jsp</servlet-name>
-		<url-pattern>/wsil/views/WsilLinksView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.scripts.wsilAbstractTable_jsp</servlet-name>
-		<url-pattern>/wsil/scripts/wsilAbstractTable.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.scripts.wsilFormSubmit_jsp</servlet-name>
-		<url-pattern>/wsil/scripts/wsilFormSubmit.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.scripts.wsilframesets_jsp</servlet-name>
-		<url-pattern>/wsil/scripts/wsilframesets.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.scripts.wsilNameTable_jsp</servlet-name>
-		<url-pattern>/wsil/scripts/wsilNameTable.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.scripts.wsilPanes_jsp</servlet-name>
-		<url-pattern>/wsil/scripts/wsilPanes.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.scripts.wsilTable_jsp</servlet-name>
-		<url-pattern>/wsil/scripts/wsilTable.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.OpenWSILForm_jsp</servlet-name>
-		<url-pattern>/wsil/forms/OpenWSILForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.ProcessWSILFramesetsForm_jsp</servlet-name>
-		<url-pattern>/wsil/forms/ProcessWSILFramesetsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.UddiBusinessDetailsPage_jsp</servlet-name>
-		<url-pattern>/wsil/forms/UddiBusinessDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.UddiServiceDetailsPage_jsp</servlet-name>
-		<url-pattern>/wsil/forms/UddiServiceDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.WsdlServiceDetailsPage_jsp</servlet-name>
-		<url-pattern>/wsil/forms/WsdlServiceDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.WsilDetailsPage_jsp</servlet-name>
-		<url-pattern>/wsil/forms/WsilDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.WsilImportWSDLToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/wsil/forms/WsilImportWSDLToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.WSILImportWSILToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/wsil/forms/WSILImportWSILToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.WsilLaunchWebServiceWizardForm_jsp</servlet-name>
-		<url-pattern>/wsil/forms/WsilLaunchWebServiceWizardForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.forms.WsilLinkDetailsPage_jsp</servlet-name>
-		<url-pattern>/wsil/forms/WsilLinkDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.ClearNodeConfirmJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/ClearNodeConfirmJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.ClearWSILActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/ClearWSILActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.ImportWSDLToFileSystemActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/ImportWSDLToFileSystemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.ImportWSILToFileSystemActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/ImportWSILToFileSystemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.OpenWSILActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/OpenWSILActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.OpenWSILLinkActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/OpenWSILLinkActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.RefreshActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/RefreshActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.ResizeWSILFramesActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/ResizeWSILFramesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.SelectWSILNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/SelectWSILNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.SelectWSILToolActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/SelectWSILToolActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.SwitchPerspectiveFromWSILActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/SwitchPerspectiveFromWSILActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilAddToFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilAddToFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilAddToUDDIPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilAddToUDDIPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilAddToWSDLPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilAddToWSDLPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilCheckFavoriteExistsActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilCheckFavoriteExistsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilImportWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilImportWSDLToWorkbenchActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WSILImportWSILToWorkbenchActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WSILImportWSILToWorkbenchActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilLaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilLaunchWebServiceWizardActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsil.actions.WsilToggleNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/wsil/actions/WsilToggleNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.soap_envelope_xml_jsp</servlet-name>
-		<url-pattern>/wsdl/soap_envelope_xml.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_actions_container_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_actions_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_navigator_container_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_navigator_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_navigator_content_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_navigator_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_navigator_toolbar_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_navigator_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_perspective_content_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_perspective_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_properties_container_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_properties_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_properties_content_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_properties_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_properties_toolbar_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_properties_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_result_content_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_result_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_status_container_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_status_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_status_content_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_status_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.wsdl_status_toolbar_jsp</servlet-name>
-		<url-pattern>/wsdl/wsdl_status_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.scripts.fragmenttables_jsp</servlet-name>
-		<url-pattern>/wsdl/scripts/fragmenttables.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.scripts.wsdlframesets_jsp</servlet-name>
-		<url-pattern>/wsdl/scripts/wsdlframesets.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.scripts.wsdlpanes_jsp</servlet-name>
-		<url-pattern>/wsdl/scripts/wsdlpanes.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.SOAPEncArrayFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/SOAPEncArrayFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.SOAPEncArrayRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/SOAPEncArrayRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.SOAPEncArrayRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/SOAPEncArrayRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDComplexFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDComplexFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDComplexRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDComplexRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDComplexRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDComplexRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDDefaultInfoFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDDefaultInfoFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDDefaultRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDDefaultRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDDefaultRFragmentXML_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDDefaultRFragmentXML.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDDefaultWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDDefaultWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDDelegationRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDDelegationRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDDelegationWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDDelegationWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDEmptyRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDEmptyRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDEmptyWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDEmptyWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupAllWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupAllWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupChoiceFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupChoiceFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupChoiceRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupChoiceRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupChoiceRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupChoiceRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupSeqFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupSeqFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDGroupSeqRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDGroupSeqRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDInfoDialog_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDInfoDialog.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDInfo_content_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDInfo_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDInfo_toolbar_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDInfo_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicDateTimeFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicDateTimeFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicDateTimeRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicDateTimeRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicEnumFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicEnumFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicEnumRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicEnumRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicInfoFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicInfoFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleAtomicRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleAtomicRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleListFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleListFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleListRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleListRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleListRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleListRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleUnionFixWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleUnionFixWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleUnionRangeWFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleUnionRangeWFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.fragment.XSDSimpleUnionRFragmentJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/fragment/XSDSimpleUnionRFragmentJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.bindings_table_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/bindings_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.endpoint_table_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/endpoint_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.FragmentsFormView_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/FragmentsFormView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.FragmentsSoapView_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/FragmentsSoapView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.InvokeWSDLOperationForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/InvokeWSDLOperationForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.OpenWSDLForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/OpenWSDLForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.operations_table_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/operations_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.ProcessWSDLFramesetsForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/ProcessWSDLFramesetsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.ReadOnlyFragmentsFormView_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/ReadOnlyFragmentsFormView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.ReadOnlyFragmentsSoapView_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/ReadOnlyFragmentsSoapView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.services_table_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/services_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLBindingDetailsForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLBindingDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLDetailsForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLDetailsFormView_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLDetailsFormView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLDetailsSourceView_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLDetailsSourceView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLImportWSDLToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLImportWSDLToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLLaunchWebServiceWizardForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLLaunchWebServiceWizardForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.forms.WSDLServiceDetailsForm_jsp</servlet-name>
-		<url-pattern>/wsdl/forms/WSDLServiceDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.ClearWSDLActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/ClearWSDLActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.CreateInstanceActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/CreateInstanceActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.InvokeWSDLHttpGetOperationFormActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/InvokeWSDLHttpGetOperationFormActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.InvokeWSDLHttpPostOperationFormActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/InvokeWSDLHttpPostOperationFormActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.InvokeWSDLSOAPOperationFormActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/InvokeWSDLSOAPOperationFormActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.InvokeWSDLSOAPOperationSourceActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/InvokeWSDLSOAPOperationSourceActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.OpenWSDLActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/OpenWSDLActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.RefreshWSDLActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/RefreshWSDLActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.ResizeWSDLFramesActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/ResizeWSDLFramesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SelectWSDLNavigatorNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SelectWSDLNavigatorNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SelectWSDLPropertiesToolActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SelectWSDLPropertiesToolActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SwitchPerspectiveFromWSDLActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SwitchPerspectiveFromWSDLActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SwitchReadOnlyFragmentViewsActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SwitchReadOnlyFragmentViewsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SwitchWSDLDetailsViewsActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SwitchWSDLDetailsViewsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SynchronizeFragmentViewsActionAbortJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SynchronizeFragmentViewsActionAbortJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.SynchronizeFragmentViewsActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/SynchronizeFragmentViewsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.ToggleWSDLNavigatorNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/ToggleWSDLNavigatorNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.UpdateWSDLBindingActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/UpdateWSDLBindingActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.WSDLAddToFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/WSDLAddToFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.WSDLCheckFavoriteExistsActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/WSDLCheckFavoriteExistsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.WSDLImportWSDLToFileSystemActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/WSDLImportWSDLToFileSystemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.WSDLImportWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/WSDLImportWSDLToWorkbenchActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>wsdl.actions.WSDLLaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<url-pattern>/wsdl/actions/WSDLLaunchWebServiceWizardActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions_container_jsp</servlet-name>
-		<url-pattern>/uddi/actions_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.category_browser_jsp</servlet-name>
-		<url-pattern>/uddi/category_browser.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.category_content_jsp</servlet-name>
-		<url-pattern>/uddi/category_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.category_toolbar_jsp</servlet-name>
-		<url-pattern>/uddi/category_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.navigator_container_jsp</servlet-name>
-		<url-pattern>/uddi/navigator_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.navigator_content_jsp</servlet-name>
-		<url-pattern>/uddi/navigator_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.navigator_toolbar_jsp</servlet-name>
-		<url-pattern>/uddi/navigator_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.properties_container_jsp</servlet-name>
-		<url-pattern>/uddi/properties_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.properties_content_jsp</servlet-name>
-		<url-pattern>/uddi/properties_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.properties_toolbar_jsp</servlet-name>
-		<url-pattern>/uddi/properties_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.status_container_jsp</servlet-name>
-		<url-pattern>/uddi/status_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.status_content_jsp</servlet-name>
-		<url-pattern>/uddi/status_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.status_toolbar_jsp</servlet-name>
-		<url-pattern>/uddi/status_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.uddi_perspective_content_jsp</servlet-name>
-		<url-pattern>/uddi/uddi_perspective_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.scripts.cbpanes_jsp</servlet-name>
-		<url-pattern>/uddi/scripts/cbpanes.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.scripts.detailstables_jsp</servlet-name>
-		<url-pattern>/uddi/scripts/detailstables.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.scripts.results_jsp</servlet-name>
-		<url-pattern>/uddi/scripts/results.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.scripts.uddiframesets_jsp</servlet-name>
-		<url-pattern>/uddi/scripts/uddiframesets.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.scripts.uddipanes_jsp</servlet-name>
-		<url-pattern>/uddi/scripts/uddipanes.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.scripts.udditables_jsp</servlet-name>
-		<url-pattern>/uddi/scripts/udditables.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.advancedCommon_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/advancedCommon_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.authentication_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/authentication_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.BusinessDetailsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/BusinessDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.BusPublishServiceAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/BusPublishServiceAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.BusPublishServiceForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/BusPublishServiceForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.BusPublishServiceSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/BusPublishServiceSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.categories_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/categories_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.detailsCategories_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/detailsCategories_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.detailsDiscoveryURLs_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/detailsDiscoveryURLs_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.detailsIdentifiers_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/detailsIdentifiers_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.detailsLanguageInput_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/detailsLanguageInput_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.detailsSingleItem_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/detailsSingleItem_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.discoveryURLs_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/discoveryURLs_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.findQualifiers_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/findQualifiers_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.GetForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/GetForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.identifiers_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/identifiers_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ItemsSummaryForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ItemsSummaryForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.languageInput_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/languageInput_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ManagePublisherAssertionsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ManagePublisherAssertionsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ManageReferencedServicesForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ManageReferencedServicesForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.names_findQualifiers_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/names_findQualifiers_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.OpenPrivateRegistryForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/OpenPrivateRegistryForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.OpenRegistryForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/OpenRegistryForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ProcessUDDIFramesetsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ProcessUDDIFramesetsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegDetailsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindBusinessesAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindBusinessesAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindBusinessesForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindBusinessesForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindBusinessesSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindBusinessesSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindServiceInterfacesAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindServiceInterfacesAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindServiceInterfacesForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindServiceInterfacesForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindServiceInterfacesSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindServiceInterfacesSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindServicesAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindServicesAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindServicesForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindServicesForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindServicesSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindServicesSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegFindUUIDForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegFindUUIDForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishBusinessAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishBusinessAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishBusinessForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishBusinessForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishBusinessSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishBusinessSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishServiceAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishServiceAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishServiceForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishServiceForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishServiceInterfaceAdvancedForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishServiceInterfaceAdvancedForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishServiceInterfaceForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishServiceInterfaceForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishServiceInterfaceSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishServiceInterfaceSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.RegPublishServiceSimpleForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/RegPublishServiceSimpleForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ResultsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ResultsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.results_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/results_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ServiceDetailsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ServiceDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ServiceInterfaceDetailsForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ServiceInterfaceDetailsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.UDDIImportWSDLToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/UDDIImportWSDLToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.UDDILaunchWebServiceWizardForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/UDDILaunchWebServiceWizardForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.uddiObjectsPublisherAssertions_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/uddiObjectsPublisherAssertions_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.uddiObjects_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/uddiObjects_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.ud_categories_table_jsp</servlet-name>
-		<url-pattern>/uddi/forms/ud_categories_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.forms.UnpublishForm_jsp</servlet-name>
-		<url-pattern>/uddi/forms/UnpublishForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.AddItemsToFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/AddItemsToFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.AddPublisherAssertionsActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/AddPublisherAssertionsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.AddToFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/AddToFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.BusinessGetServicesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/BusinessGetServicesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.BusPublishServiceAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/BusPublishServiceAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.BusPublishServiceSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/BusPublishServiceSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.CheckFavoriteExistsActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/CheckFavoriteExistsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ClearNavigatorNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ClearNavigatorNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ClearNavigatorNodesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ClearNavigatorNodesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.CompletePublisherAssertionsActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/CompletePublisherAssertionsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ManageReferencedServicesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ManageReferencedServicesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.OpenRegistryActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/OpenRegistryActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RefreshUDDINodeActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RefreshUDDINodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RefreshUDDINodesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RefreshUDDINodesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindBusinessesAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindBusinessesAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindBusinessesSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindBusinessesSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindBusinessUUIDActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindBusinessUUIDActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindServiceInterfacesAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindServiceInterfacesAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindServiceInterfacesSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindServiceInterfacesSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindServiceInterfaceUUIDActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindServiceInterfaceUUIDActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindServicesAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindServicesAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindServicesSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindServicesSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegFindServiceUUIDActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegFindServiceUUIDActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegPublishBusinessAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegPublishBusinessAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegPublishBusinessSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegPublishBusinessSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegPublishServiceAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegPublishServiceAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegPublishServiceInterfaceAdvancedActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegPublishServiceInterfaceAdvancedActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegPublishServiceInterfaceSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegPublishServiceInterfaceSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RegPublishServiceSimpleActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RegPublishServiceSimpleActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RemovePublisherAssertionsActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RemovePublisherAssertionsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.RemoveSubQueryItemActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/RemoveSubQueryItemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ResizeUDDIFramesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ResizeUDDIFramesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.SelectCategoryNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/SelectCategoryNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.SelectFindToolActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/SelectFindToolActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.SelectNavigatorNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/SelectNavigatorNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.SelectPropertiesToolActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/SelectPropertiesToolActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.SelectSubQueryItemActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/SelectSubQueryItemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ServiceGetBusinessActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ServiceGetBusinessActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ServiceGetServiceInterfacesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ServiceGetServiceInterfacesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ServiceInterfaceGetBusinessesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ServiceInterfaceGetBusinessesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ServiceInterfaceGetServicesActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ServiceInterfaceGetServicesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ShowPublisherAssertionsActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ShowPublisherAssertionsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.SwitchPerspectiveFromUDDIActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/SwitchPerspectiveFromUDDIActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ToggleCategoryNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ToggleCategoryNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.ToggleNavigatorNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/ToggleNavigatorNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.TransferSubQueryResultsActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/TransferSubQueryResultsActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.TransferToAddCategoryDataActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/TransferToAddCategoryDataActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UDDIAddToWSDLPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UDDIAddToWSDLPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UDDIImportWSDLToFileSystemActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UDDIImportWSDLToFileSystemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UDDIImportWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UDDIImportWSDLToWorkbenchActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UDDILaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UDDILaunchWebServiceWizardActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UnpublishActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UnpublishActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UpdateBusinessActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UpdateBusinessActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UpdateNewPublishActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UpdateNewPublishActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UpdateRegistryActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UpdateRegistryActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UpdateServiceActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UpdateServiceActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UpdateServiceInterfaceActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UpdateServiceInterfaceActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>uddi.actions.UpdateServiceNewPublishBusinessActionJSP_jsp</servlet-name>
-		<url-pattern>/uddi/actions/UpdateServiceNewPublishBusinessActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.calendarbrowser_jsp</servlet-name>
-		<url-pattern>/scripts/calendarbrowser.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.formsubmit_jsp</servlet-name>
-		<url-pattern>/scripts/formsubmit.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.formutils_jsp</servlet-name>
-		<url-pattern>/scripts/formutils.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.panes_jsp</servlet-name>
-		<url-pattern>/scripts/panes.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.switchperspective_jsp</servlet-name>
-		<url-pattern>/scripts/switchperspective.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.tables_jsp</servlet-name>
-		<url-pattern>/scripts/tables.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>scripts.wsdlbrowser_jsp</servlet-name>
-		<url-pattern>/scripts/wsdlbrowser.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.ImportToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/forms/ImportToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.ImportWSDLAndWSILToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/forms/ImportWSDLAndWSILToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.LaunchWebServiceWizardForm_jsp</servlet-name>
-		<url-pattern>/forms/LaunchWebServiceWizardForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.otherActions_jsp</servlet-name>
-		<url-pattern>/forms/otherActions.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.ProxyLoadContent_jsp</servlet-name>
-		<url-pattern>/forms/ProxyLoadContent.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.ProxyLoadPage_jsp</servlet-name>
-		<url-pattern>/forms/ProxyLoadPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>forms.simpleCommon_table_jsp</servlet-name>
-		<url-pattern>/forms/simpleCommon_table.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_actions_container_jsp</servlet-name>
-		<url-pattern>/favorites/fav_actions_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_navigator_container_jsp</servlet-name>
-		<url-pattern>/favorites/fav_navigator_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_navigator_content_jsp</servlet-name>
-		<url-pattern>/favorites/fav_navigator_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_navigator_toolbar_jsp</servlet-name>
-		<url-pattern>/favorites/fav_navigator_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_perspective_content_jsp</servlet-name>
-		<url-pattern>/favorites/fav_perspective_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_properties_container_jsp</servlet-name>
-		<url-pattern>/favorites/fav_properties_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_properties_content_jsp</servlet-name>
-		<url-pattern>/favorites/fav_properties_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_properties_toolbar_jsp</servlet-name>
-		<url-pattern>/favorites/fav_properties_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_status_container_jsp</servlet-name>
-		<url-pattern>/favorites/fav_status_container.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_status_content_jsp</servlet-name>
-		<url-pattern>/favorites/fav_status_content.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.fav_status_toolbar_jsp</servlet-name>
-		<url-pattern>/favorites/fav_status_toolbar.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.views.ListFavoriteUDDIBusinessView_jsp</servlet-name>
-		<url-pattern>/favorites/views/ListFavoriteUDDIBusinessView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.views.ListFavoriteUDDIRegistryView_jsp</servlet-name>
-		<url-pattern>/favorites/views/ListFavoriteUDDIRegistryView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.views.ListFavoriteUDDIServiceInterfaceView_jsp</servlet-name>
-		<url-pattern>/favorites/views/ListFavoriteUDDIServiceInterfaceView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.views.ListFavoriteUDDIServiceView_jsp</servlet-name>
-		<url-pattern>/favorites/views/ListFavoriteUDDIServiceView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.views.ListFavoriteWSDLServiceView_jsp</servlet-name>
-		<url-pattern>/favorites/views/ListFavoriteWSDLServiceView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.views.ListFavoriteWSILView_jsp</servlet-name>
-		<url-pattern>/favorites/views/ListFavoriteWSILView.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.scripts.favoritesFormSubmit_jsp</servlet-name>
-		<url-pattern>/favorites/scripts/favoritesFormSubmit.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.scripts.favoritesframesets_jsp</servlet-name>
-		<url-pattern>/favorites/scripts/favoritesframesets.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.scripts.favoritesPanes_jsp</servlet-name>
-		<url-pattern>/favorites/scripts/favoritesPanes.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.scripts.favoritesTable_jsp</servlet-name>
-		<url-pattern>/favorites/scripts/favoritesTable.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesImportToWorkbenchForm_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesImportToWorkbenchForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesLaunchWebServiceWizardForm_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesLaunchWebServiceWizardForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesUDDIBusinessDetailsPage_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesUDDIBusinessDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesUDDIRegistryDetailsPage_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesUDDIRegistryDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesUDDIServiceDetailsPage_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesUDDIServiceDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesUDDIServiceIntDetailsPage_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesUDDIServiceIntDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesWSDLDetailsPage_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesWSDLDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.FavoritesWSILDetailsPage_jsp</servlet-name>
-		<url-pattern>/favorites/forms/FavoritesWSILDetailsPage.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.forms.ProcessFavoritesFramesetsForm_jsp</servlet-name>
-		<url-pattern>/favorites/forms/ProcessFavoritesFramesetsForm.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.AddWSILToWSILPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/AddWSILToWSILPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.FavoritesAddToUDDIPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/FavoritesAddToUDDIPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.FavoritesAddToWSDLPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/FavoritesAddToWSDLPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.FavoritesImportToFileSystemActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/FavoritesImportToFileSystemActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.FavoritesImportToWorkbenchActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/FavoritesImportToWorkbenchActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.FavoritesLaunchWebServiceWizardActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/FavoritesLaunchWebServiceWizardActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.FavoritesToggleNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/FavoritesToggleNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.RemoveFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/RemoveFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.RemoveFavoritesConfirmJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/RemoveFavoritesConfirmJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.ResizeFavoritesFramesActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/ResizeFavoritesFramesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.RestoreDefaultFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/RestoreDefaultFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.RestoreDefaultFavoritesConfirmJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/RestoreDefaultFavoritesConfirmJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.SelectFavoritesNodeActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/SelectFavoritesNodeActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.SelectFavoritesToolActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/SelectFavoritesToolActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>favorites.actions.SwitchPerspectiveFromFavoritesActionJSP_jsp</servlet-name>
-		<url-pattern>/favorites/actions/SwitchPerspectiveFromFavoritesActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actions.CheckWorkbenchFileReadOnlyActionJSP_jsp</servlet-name>
-		<url-pattern>/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actions.RetrieveHistoryActionJSP_jsp</servlet-name>
-		<url-pattern>/actions/RetrieveHistoryActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actions.SaveActionEngineScenario_jsp</servlet-name>
-		<url-pattern>/actions/SaveActionEngineScenario.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actions.ShowPerspectiveActionJSP_jsp</servlet-name>
-		<url-pattern>/actions/ShowPerspectiveActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actions.ValidateEditActionJSP_jsp</servlet-name>
-		<url-pattern>/actions/ValidateEditActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-	<servlet-mapping>
-		<servlet-name>actions.WriteWSDLToWorkbenchActionJSP_jsp</servlet-name>
-		<url-pattern>/actions/WriteWSDLToWorkbenchActionJSP.jsp</url-pattern>
-	</servlet-mapping>
-
-</web-app>
-
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
deleted file mode 100644
index a90b044fc..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine.jsp
+++ /dev/null
@@ -1,91 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.ActionInputs,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.data.TransactionDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.data.ActionDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.HTMLUtils,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.MultipartFormDataParser,
-                                                        java.util.List,
-                                                        java.util.Iterator" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-String mode = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-String scenario = null;
-try
-{
-  MultipartFormDataParser parser = new MultipartFormDataParser();
-  parser.parseRequest(request, HTMLUtils.UTF8_ENCODING);
-  scenario = parser.getParameter(ActionInputs.ACTION_ENGINE_SCENARIO);
-}
-catch (Throwable t)
-{
-}
-ActionEngine actionEngine = controller.getActionEngine();
-if (mode != null)
-{
-  actionEngine.setMode(ActionEngine.MODE_DISABLED);
-  try
-  {
-    actionEngine.setMode(Byte.parseByte(mode));
-  }
-  catch (NumberFormatException nfe)
-  {
-  }
-}
-if (scenario != null && scenario.length() > 0)
-{
-  ScenarioDescriptor scenarioDescriptor = null;
-  try
-  {
-    ActionDataParser parser = new ActionDataParser();
-    scenarioDescriptor = parser.parseScenario(XMLUtils.stringToElement(scenario));
-    actionEngine.executeScenario(scenarioDescriptor);
-  }
-  catch (Throwable t)
-  {
-  }
-  if (scenarioDescriptor != null)
-  {
-    TransactionDescriptor[] transactionDescriptors = scenarioDescriptor.getTransactionDescriptors();
-    for (int i = 0; i < transactionDescriptors.length; i++)
-    {
-      ActionDescriptor[] actionDescriptors = transactionDescriptors[i].getActionDescriptors();
-      for (int j = 0; j < actionDescriptors.length; j++)
-      {
-        %>
-        <!--
-        <%=actionDescriptors[j].getId()%>
-        <%=actionDescriptors[j].getStatusId()%>
-        <%
-        List status = actionDescriptors[j].getStatus();
-        if (status != null)
-        {
-          for (Iterator it = status.iterator(); it.hasNext();)
-          {
-            %>
-            <%=it.next().toString()%>
-            <%
-          }
-        }
-        %>
-        -->
-        <%
-      }
-    }
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
deleted file mode 100644
index f9fc6cf1e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actionengine_container.jsp
+++ /dev/null
@@ -1,137 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionEngine,
-                                                        java.net.*" %>
-<%
-String sessionId = request.getParameter(ActionInputs.SESSIONID);
-HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-Controller controller = (Controller)currentSession.getAttribute("controller");
-ActionEngine actionEngine = controller.getActionEngine();
-String modeString = request.getParameter(ActionInputs.ACTION_ENGINE_MODE);
-if (modeString != null && modeString.length() > 0)
-{
-  try
-  {
-    byte mode = Byte.parseByte(modeString);
-    actionEngine.setMode(mode);
-  }
-  catch (Throwable t)
-  {
-  }
-}
-String playFileId = "playFileId";
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title><%=controller.getMessage("TITLE_ACTION_RECORDER")%></title>
-  <script language="javascript">
-    function setMode(mode)
-    {
-      <%
-      StringBuffer formAction = new StringBuffer(response.encodeURL(controller.getPathWithContext("actionengine_container.jsp?")));
-      formAction.append(ActionInputs.SESSIONID);
-      formAction.append("=");
-      formAction.append(sessionId);
-      formAction.append("&");
-      formAction.append(ActionInputs.ACTION_ENGINE_MODE);
-      formAction.append("=");
-      %>
-      var form = document.forms[0];
-      form.action = '<%=formAction.toString()%>' + mode;
-      form.target = "_self";
-      form.submit();
-    }
-
-    function play()
-    {
-      var playFile = document.getElementById("<%=playFileId%>");
-      if (playFile.value != null && playFile.value.length > 0)
-      {
-        var form = document.forms[0];
-        form.action = '<%=response.encodeURL(controller.getPathWithContext("wsexplorer.jsp"))%>';
-        form.target = "<%=FrameNames.WINDOW_NAME_WSEXPLORER_JSP%>";
-        form.enctype = "multipart/form-data";
-        // for backward compatibility
-        form.encoding = "multipart/form-data";
-        form.submit();
-        setMode('<%=ActionEngine.MODE_PLAY%>');
-      }
-      else
-        alert('<%=controller.getMessage("MSG_ERROR_INVALID_PLAY_FILE")%>');
-    }
-
-    function save()
-    {
-      var form = document.forms[0];
-      form.action = '<%=response.encodeURL(controller.getPathWithContext("actions/SaveActionEngineScenario.jsp"))%>';
-      form.target = "_self";
-      form.submit();
-    }
-  </script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-  <form method="post">
-    <%
-    String labelModePlay = controller.getMessage("FORM_LABEL_MODE_PLAY");
-    String labelModeStop = controller.getMessage("FORM_LABEL_MODE_STOP");
-    String labelModeRecord = controller.getMessage("FORM_LABEL_MODE_RECORD");
-    String labelSave = controller.getMessage("FORM_LABEL_SAVE");
-    byte mode = actionEngine.getMode();
-    String imgPlay = (mode == ActionEngine.MODE_PLAY) ? "images/elcl16/actionengine_play.gif" : "images/dlcl16/actionengine_play.gif";
-    String imgStop = (mode == ActionEngine.MODE_STOP) ? "images/elcl16/actionengine_stop.gif" : "images/dlcl16/actionengine_stop.gif";
-    String imgRecord = (mode == ActionEngine.MODE_RECORD) ? "images/elcl16/actionengine_record.gif" : "images/dlcl16/actionengine_record.gif";
-    String imgSave = "images/dlcl16/actionengine_save.gif";
-    %>
-    <table border=0 cellpadding=3 cellspacing=3>
-      <tr>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:play()">
-            <img class="normal" border=0 alt="<%=labelModePlay%>" title="<%=labelModePlay%>" src="<%=response.encodeURL(controller.getPathWithContext(imgPlay))%>">
-            <%=controller.getMessage("FORM_LABEL_MODE_PLAY")%>
-          </a>
-        </td>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_STOP)%>')">
-            <img class="normal" border=0 alt="<%=labelModeStop%>" title="<%=labelModeStop%>" src="<%=response.encodeURL(controller.getPathWithContext(imgStop))%>">
-            <%=controller.getMessage("FORM_LABEL_MODE_STOP")%>
-          </a>
-        </td>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:setMode('<%=String.valueOf(ActionEngine.MODE_RECORD)%>')">
-            <img class="normal" border=0 alt="<%=labelModeRecord%>" title="<%=labelModeRecord%>" src="<%=response.encodeURL(controller.getPathWithContext(imgRecord))%>">
-            <%=controller.getMessage("FORM_LABEL_MODE_RECORD")%>
-          </a>
-        </td>
-        <td valign="middle" align="left" class="labels" nowrap>
-          <a href="javascript:save()">
-            <img class="normal" border=0 alt="<%=labelSave%>" title="<%=labelSave%>" src="<%=response.encodeURL(controller.getPathWithContext(imgSave))%>">
-            <%=controller.getMessage("FORM_LABEL_SAVE")%>
-          </a>
-        </td>
-      </tr>
-    </table>
-    <table border=0 cellpadding=3 cellspacing=3>
-      <tr>
-        <td valign="center" align="left" class="labels" nowrap><%=controller.getMessage("FORM_LABEL_PLAY_FILE")%></td>
-        <td valign="center" align="left" class="labels">
-          <input type="file" id="<%=playFileId%>" name="<%=ActionInputs.ACTION_ENGINE_SCENARIO%>">
-        </td>
-      </tr>
-    </table>
-  </form>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
deleted file mode 100644
index 5738ffe94..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.java
-*.class
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
deleted file mode 100644
index a8a9a783d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/CheckWorkbenchFileReadOnlyActionJSP.jsp
+++ /dev/null
@@ -1,55 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>                                                        
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
-   if (action.isTargetFileResourceReadOnly())
-   {
-%>
-  var proceed = true;
-<%   
-     if (!action.isCheckoutFilesEnabled())
-     {
-%>
-  proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_CHECKOUT_DISABLED"))%>");
-<%     
-     }
-%>
-  if (proceed)
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ValidateEditAction.getActionLink()))%>";
-<%     
-   }
-   else
-   {
-%>
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
-   }
-%>     
-</script>
-</body>
-</html>   
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
deleted file mode 100644
index 18f981dc0..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearNodeAction.inc
+++ /dev/null
@@ -1,59 +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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {    
-<%
-   String treeContentVar = action.getTreeContentVar();
-   if (treeContentVar != null)
-   {
-%>
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-<%
-   }
-   String propertiesContainerVar = action.getPropertiesContainerVar();
-   if (propertiesContainerVar != null)
-   {
-%>
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%   
-   }
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>
-    <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-   }
-%>
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
deleted file mode 100644
index 24ee121ef..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ClearViewElementAction.inc
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   String propertiesContainerVar = action.getPropertiesContainerVar();
-   if (propertiesContainerVar != null)
-   {
-%>
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-   }
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-   }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
deleted file mode 100644
index 6086b903d..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToFileSystemAction.inc
+++ /dev/null
@@ -1,57 +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
- *******************************************************************************/
-%>
-<%
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // run the action
-   boolean actionResult = action.run();
-   boolean written = false;
-
-   if (actionResult)
-   {
-     // write to file system
-     response.setContentType("application/octet-stream");
-     response.setHeader("Content-Disposition","attachment;filename="+action.getDefaultFileName());
-     action.write(response.getOutputStream());
-     written = true;
-   }
-
-   if (!written)
-   {
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-      StringBuffer panesFile = new StringBuffer("/");
-      panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-      if (action.getStatusContentVar() != null)
-      {
-%>
-<script language="javascript">
-  <%=action.getStatusContentVar()%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
-      }
-%>      
-</body>
-</html>
-<%
-   }
-%>  
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
deleted file mode 100644
index 812ad18c8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ImportToWorkbenchAction.inc
+++ /dev/null
@@ -1,66 +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
- *******************************************************************************/
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   //Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-   if (!inputsValid)
-   {
-     String statusContentVar = action.getStatusContentVar();
-     if (statusContentVar != null)
-     {
-%>
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-     }
-   }
-   else
-   {
-     session.setAttribute(ActionInputs.IMPORT_ACTION,action);   
-     if (action.fileExists())
-     {
-%>
-  var proceed = true;
-<%        
-       if (!action.isOverwriteFilesEnabled())
-       {
-%>
-  proceed = confirm("<%=HTMLUtils.JSMangle(action.getWebServicePluginFileMessage("MSG_ERROR_FILE_OVERWRITE_DISABLED"))%>");
-<%
-       }
-%>
-  if (proceed)
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(CheckWorkbenchFileReadOnlyAction.getActionLink()))%>";
-<%
-     }
-     else
-     {
-%>
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-<%
-     }
-   }
-%>
-</script>   
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
deleted file mode 100644
index 1dbdeb68e..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/LaunchWebServiceWizardAction.inc
+++ /dev/null
@@ -1,45 +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
- *******************************************************************************/
-%>
-<%
-   //Load the parameters for the action from the servlet request.
-   boolean inputsValid = action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.run();
-%>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     String statusContentVar = action.getStatusContentVar();
-     if (statusContentVar != null)
-     {
-%>    
-<script language="javascript">
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>
-<%
-     }
-   }
-%>   
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
deleted file mode 100644
index 9ae19b3f8..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/RetrieveHistoryActionJSP.jsp
+++ /dev/null
@@ -1,58 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   // Prepare the action.
-   RetrieveHistoryAction action = new RetrieveHistoryAction(controller);
-
-   // Load the parameters for the action from the servlet request.
-   action.populatePropertyTable(request);
-
-   // Run the action and obtain the return code (fail/success).
-   boolean actionResult = action.run();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-  <jsp:include page="/scripts/panes.jsp" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<script language="javascript">
-<%
-   BreadCrumb b = action.getBreadCrumb();
-   if (b != null)
-   {
-     int breadCrumbPerspectiveId = b.getPerspectiveId();
-     if (breadCrumbPerspectiveId != controller.getCurrentPerspective().getPerspectiveId())
-     {
-       // Switch the perspective.
-%>
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(ShowPerspectiveAction.getActionLink(breadCrumbPerspectiveId,true)))%>";
-<%
-     }
-     else
-     {
-       // Jump to the page retrieved from history.
-%>
-  perspectiveWorkArea.location="<%=response.encodeURL(controller.getPathWithContext(b.getURL()))%>";
-<%
-     }
-   }
-%>
-</script>
-</body>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
deleted file mode 100644
index 700b9d73b..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SaveActionEngineScenario.jsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.engine.data.ScenarioDescriptor,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.engine.ActionDataParser,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.XMLUtils,
-                                                        java.io.PrintWriter,
-                                                        org.w3c.dom.Element"%>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-response.setContentType("application/octet-stream");
-response.setHeader("Content-Disposition","attachment;filename=scenario.xml");
-ScenarioDescriptor scenarioDescriptor = controller.getActionEngine().getScenario();
-ActionDataParser parser = new ActionDataParser();
-Element scenario = parser.toElement(scenarioDescriptor);
-if (scenario != null)
-{
-  try
-  {
-    String scenarioString = XMLUtils.serialize(scenario, false);
-    if (scenarioString != null)
-    {
-      PrintWriter pw = new PrintWriter(response.getOutputStream());
-      pw.println(scenarioString);
-      pw.close();
-    }
-  }
-  catch (Throwable t)
-  {
-  }
-}
-%>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
deleted file mode 100644
index b2f3efe63..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeAction.inc
+++ /dev/null
@@ -1,108 +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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     if (action.isStaleBreadCrumb())
-     {
-%>
-<script language="javascript">
-  // Rerun the history action to get the next available item.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
-     }
-   }
-   else
-   {
-     String treeContentVar = action.getTreeContentVar();
-     String propertiesContainerVar = action.getPropertiesContainerVar();
-     if (action.requiresTreeViewRefresh())
-     {
-       if (treeContentVar != null)
-       {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    // Update the treeview.
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";  
-</script>
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
-       }
-     }
-     else
-     {
-       Node selectedNode = action.getSelectedNode();
-       NodeManager nodeManager = selectedNode.getNodeManager();
-       Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
-       int selectedNodeId = selectedNode.getNodeId();
-       if (treeContentVar != null)
-       {
-%>
-<script language="javascript">
-  // Update the perspective.
-<%
-         if (previousSelectedNode != null && previousSelectedNode.isVisible())
-         {
-%>
-  <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
-         }
-         String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
-  <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
-  <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-       }
-%>
-</script>
-<%
-     }
-   }
-%>
-</body>
-<html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
deleted file mode 100644
index b337f2b20..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/SelectNodeToolAction.inc
+++ /dev/null
@@ -1,182 +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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     if (action.isStaleBreadCrumb())
-     {
-%>
-<script language="javascript">
-  // Rerun the history action to get the next available item.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
-     }
-   }
-   else
-   {
-     if (action.requiresStatusUpdate())
-     {
-       String statusContentVar = action.getStatusContentVar();
-       if (statusContentVar != null)
-       {
-%>
-<script language="javascript">
-  // Update the status content with any messages arising from this action.
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>  
-<%    
-       }
-     } 
-        
-     String treeContentVar = action.getTreeContentVar();
-     String propertiesContainerVar = action.getPropertiesContainerVar();
-     if (action.requiresTreeViewRefresh())
-     {
-%>
-<script language="javascript">
-<%
-       if (treeContentVar != null)
-       {
-%>
-  if (isMicrosoftInternetExplorer())
-  {
-    // Reload the navigator tree view to show the structural change.
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  }
-  else
-  {
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-  }
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-  if (isMicrosoftInternetExplorer())
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-       }
-%>
-</script>
-<%
-     }
-     else if (action.requiresNodeSelection())
-     {
-       Node selectedNode = action.getSelectedNode();
-       NodeManager nodeManager = selectedNode.getNodeManager();
-       Node previousSelectedNode = nodeManager.getPreviousSelectedNode();
-       int selectedNodeId = selectedNode.getNodeId();
-%>
-<script language="javascript">
-<%
-       if (treeContentVar != null)
-       {
-%>
-  // Update the navigator tree to show the selection.
-<%
-         if (previousSelectedNode != null)
-         {
-%>
-  <%=treeContentVar%>.alterImage('<%=previousSelectedNode.getAnchorName()%>','<%=response.encodeURL(controller.getPathWithContext(previousSelectedNode.getClosedImagePath()))%>');
-<%
-         }
-         String selectedNodeAnchorName = selectedNode.getAnchorName();
-%>
-  <%=treeContentVar%>.selectNode('<%=selectedNodeAnchorName%>','<%=response.encodeURL(controller.getPathWithContext(selectedNode.getOpenImagePath()))%>');
-  <%=treeContentVar%>.location.hash = '#<%=selectedNodeAnchorName%>';
-<%
-       }
-       if (propertiesContainerVar != null)
-       {
-%>
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-<%
-       }
-%>
-</script>
-<%
-     }
-     else if (action.requiresViewSelection())
-     {
-       if (propertiesContainerVar != null)
-       {
-%>
-<script language="javascript">
-  // Update the properties container to show the view.
-  <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-</script>
-<%
-       }
-     }
-     else
-     {
-       String propertiesContentVar = action.getPropertiesContentVar();
-       Tool tool = action.getSelectedViewTool();
-       if (tool == null)
-         tool = action.getSelectedTool();
-       if (tool.getToolType() != ToolTypes.ACTION)
-       {
-         if (propertiesContentVar != null)
-         {
-%>
-<script language="javascript">
-  // Update the properties content with the tool's form.
-  <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getFormLink()))%>";
-</script>
-<%
-         }
-       }
-       else
-       {
-         if (!action.isHistoryAction())
-         {
-%>
-<script language="javascript">
-  // Run the tool's action only if it is not from the history.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(tool.getActionLink()))%>";
-</script>
-<%
-         }
-         else
-         {
-           if (propertiesContentVar != null)
-           {
-%>
-<script language="javascript">
-  <%=propertiesContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContentPage()))%>";
-</script>
-<%
-           }
-         }
-       }
-     }
-   }
-%>
-</body>
-<html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
deleted file mode 100644
index c01dde3ca..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ShowPerspectiveActionJSP.jsp
+++ /dev/null
@@ -1,70 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*" %>
-
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-   StringBuffer framesetsFile = new StringBuffer("/");
-   framesetsFile.append(currentPerspective.getFramesetsFile());
-   
-   StringBuffer framesetsForm = new StringBuffer("/");
-   framesetsForm.append(currentPerspective.getProcessFramesetsForm());
-   
-   int targetPerspectiveId;
-   boolean isHistory;
-   try
-   {
-     targetPerspectiveId = Integer.parseInt(request.getParameter(ActionInputs.PERSPECTIVE));
-     isHistory = ("1".equals(request.getParameter(ActionInputs.ISHISTORY)));
-   }
-   catch (NumberFormatException e)
-   {
-     targetPerspectiveId = ActionInputs.PERSPECTIVE_UDDI;
-     isHistory = false;
-   }
-   
-   if (controller.isPerspectiveContentBlank())
-   {
-     controller.enablePerspectiveContentBlank(false);
-     controller.addToHistory(currentPerspective.getPerspectiveId(),ShowPerspectiveAction.getActionLink(targetPerspectiveId,true));
-%>
-<jsp:include page="/scripts/switchperspective.jsp" flush="true"/>
-<%
-   }
-   else
-   {
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <jsp:include page="<%=framesetsFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<jsp:useBean id="formAction" class="java.lang.StringBuffer" scope="request">
-<%
-   formAction.append(currentPerspective.getSwitchPerspectiveFormActionLink(targetPerspectiveId,isHistory));
-%>
-</jsp:useBean>
-<jsp:useBean id="formFrameName" class="java.lang.StringBuffer" scope="request"/>
-<jsp:include page="<%=framesetsForm.toString()%>" flush="true"/>
-<script language="javascript">
-  processFramesetSizes(document.forms[0]);
-</script>
-</body>
-</html>
-<%
-   }
-%>   
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
deleted file mode 100644
index 506fe918a..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ToggleNodeAction.inc
+++ /dev/null
@@ -1,77 +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
- *******************************************************************************/
-%>
-<%
-   Perspective currentPerspective = controller.getCurrentPerspective();
-%>   
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(currentPerspective.getPanesFile());
-%>     
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-<script language="javascript" src="<%=response.encodeURL(controller.getPathWithContext("scripts/browserdetect.js"))%>">
-</script>  
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   if (!actionResult)
-   {
-     if (action.isStaleBreadCrumb())
-     {
-%>
-<script language="javascript">
-  // Rerun the history action to get the next available item.
-  perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(action.getNextHistoryActionLink()))%>";
-</script>
-<%
-     }
-   }
-   else
-   {
-     String treeContentVar = action.getTreeContentVar();
-     if (treeContentVar != null)
-     {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    // Update the perspective.
-    <%=treeContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getTreeContentPage()))%>";
-  }
-  else
-    perspectiveContent.location = "<%=response.encodeURL(controller.getPathWithContext(currentPerspective.getPerspectiveContentPage()))%>";
-</script>
-<%
-     }
-     if (action.requiresNodeSelection())
-     {
-       String propertiesContainerVar = action.getPropertiesContainerVar();
-       if (propertiesContainerVar != null)
-       {
-%>
-<script language="javascript">
-  if (isMicrosoftInternetExplorer())
-  {
-    // Update the properties container.
-    <%=propertiesContainerVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getPropertiesContainerPage()))%>";
-  }
-</script>
-<%
-       }
-     }
-   }
-%>
-</body>
-<html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
deleted file mode 100644
index b05383099..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/ValidateEditActionJSP.jsp
+++ /dev/null
@@ -1,48 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>                                                        
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
-   boolean result = action.validateEdit();
-%>
-<script language="javascript">
-  if (<%=result%>)
-    perspectiveWorkArea.location = "<%=response.encodeURL(controller.getPathWithContext(WriteWSDLToWorkbenchAction.getActionLink()))%>";
-  else
-  {
-<%  
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>    
-    <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-<%
-   }
-%>
-  }
-</script>
-</body>
-</html> 
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
deleted file mode 100644
index 93cd580cd..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/actions/WriteWSDLToWorkbenchActionJSP.jsp
+++ /dev/null
@@ -1,42 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-<jsp:useBean id="controller" class="org.eclipse.wst.ws.internal.explorer.platform.perspective.Controller" scope="session"/>                                                        
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<%
-   StringBuffer panesFile = new StringBuffer("/");
-   panesFile.append(controller.getCurrentPerspective().getPanesFile());
-%>
-<jsp:include page="<%=panesFile.toString()%>" flush="true"/>
-</head>
-<body dir="<%=org.eclipse.wst.ws.internal.explorer.platform.util.DirUtils.getDir()%>">
-<%
-   ImportToWorkbenchAction action = (ImportToWorkbenchAction)session.getAttribute(ActionInputs.IMPORT_ACTION);
-   action.run();
-   String statusContentVar = action.getStatusContentVar();
-   if (statusContentVar != null)
-   {
-%>
-<script language="javascript">
-  <%=statusContentVar%>.location = "<%=response.encodeURL(controller.getPathWithContext(action.getStatusContentPage()))%>";
-</script>  
-<%
-   }
-%>
-</script>
-</body>
-</html> 
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
deleted file mode 100644
index a5c1e8881..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_browser.jsp
+++ /dev/null
@@ -1,44 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.actions.*,
-                                                        java.net.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>
-    <%=controller.getMessage("TITLE_CALENDAR_BROWSER")%>
-  </title>
-</head>
-<frameset rows="33,*" border=0 bgcolor="#ECE9D8">
-<%
-   StringBuffer link = new StringBuffer("calendar_toolbar.jsp?");
-   link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-%>   
-  <frame name="<%=FrameNames.CALENDAR_TOOLBAR%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_TOOLBAR")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-<%
-   link.setLength(0);
-   link.append("calendar_content.jsp?");
-   link.append(ActionInputs.SESSIONID).append('=').append(sessionId);
-   link.append('&').append(ActionInputs.CALENDAR_TYPE).append('=').append(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>     
-  <frame name="<%=FrameNames.CALENDAR_CONTENT%>" title="<%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%>" src="<%=response.encodeURL(controller.getPathWithContext(link.toString()))%>" noresize scrolling="no" frameborder=0 marginwidth=0 marginheight=0>
-</frameset>
-</html>
diff --git a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp b/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
deleted file mode 100644
index 36c6cd488..000000000
--- a/bundles/org.eclipse.wst.ws.explorer/wsexplorer/calendar_content.jsp
+++ /dev/null
@@ -1,626 +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
- *******************************************************************************/
-%>
-<%@ page contentType="text/html; charset=UTF-8" import="org.eclipse.wst.ws.internal.explorer.platform.perspective.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.constants.*,
-                                                        org.eclipse.wst.ws.internal.explorer.platform.util.*" %>
-
-<%
-   String sessionId = request.getParameter(ActionInputs.SESSIONID);
-   HttpSession currentSession = (HttpSession)application.getAttribute(sessionId);
-   Controller controller = (Controller)currentSession.getAttribute("controller");
-   int calendarType = Integer.parseInt(request.getParameter(ActionInputs.CALENDAR_TYPE));
-%>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title><%=controller.getMessage("FRAME_TITLE_CALENDAR_CONTENT")%></title>
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/calendar.css"))%>">
-  <link rel="stylesheet" type="text/css" href="<%=response.encodeURL(controller.getPathWithContext("css/windows.css"))%>">
-<script language="javascript">
-  var days = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SUNDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_MONDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_TUESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_WEDNESDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_THURSDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_FRIDAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SH_SATURDAY"))%>");
-  var months = new Array("<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JANUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_FEBRUARY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MARCH"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_APRIL"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_MAY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JUNE"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_JULY"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_AUGUST"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_SEPTEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_OCTOBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_NOVEMBER"))%>","<%=HTMLUtils.JSMangle(controller.getMessage("FORM_LABEL_DECEMBER"))%>");
-  var engMonths = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
-  var currentDate;
-  var calendarBodySet = false;
-  var calendarBody;
-  var savedYearTextValue = "";
-
-<%
-   // Regular expressions
-   // time       - HH:MM:SS[.SSS]
-   // year       - Y*
-   // date       - YYYY+-MM-DD
-   // dateTime   - YYYY+-MM-DDTHH:MM:SS[.SSS]Z
-   // gYearMonth - YYYY+-MM 
-   // gDay       - ---DD
-   // gMonthDay  - --MM-DD
-%>
-  var timeRegExp = /^(\d{2}):(\d{2}):(\d{2})(\.\d{3})?$/;
-  var yearRegExp = /^(\d*)$/;
-  var dateRegExp = /^(\d{4,})-(\d{2})-(\d{2})$/;
-  var dateTimeRegExp = /^(\d{4,})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(\.\d{3})?Z$/;
-  var gYearMonthRegExp = /^(\d{4,})-(\d{2})$/;
-  var gDayRegExp = /^-{3}(\d{2})$/;
-  var gMonthDayRegExp = /^-{2}(\d{2})-(\d{2})$/;
-
-  function validateYearString(yearString)
-  {
-    return yearRegExp.test(yearString);
-  }
-
-  function getTimeParameters(timeString)
-  {
-    return timeRegExp.exec(timeString);
-  }
-
-  function getDateParameters(dateString)
-  {
-    return dateRegExp.exec(dateString);
-  }
-
-  function getDateTimeParameters(dateTimeString)
-  {
-    return dateTimeRegExp.exec(dateTimeString);
-  }
-  
-  function getGYearMonthParameters(gYearMonthString)
-  {
-    return gYearMonthRegExp.exec(gYearMonthString);
-  }
-  
-  function getGDayParameters(gDayString)
-  {
-    return gDayRegExp.exec(gDayString);
-  }
-  
-  function getGMonthDayParameters(gMonthDayString)
-  {
-    return gMonthDayRegExp.exec(gMonthDayString);
-  }
-  
-<%
-   // HH:MM:SS[.SSS]
-%>
-  function serializeTime(hours,minutes,seconds,milliseconds)
-  {
-    var timeString = "";
-    if (hours < 10)
-      timeString += "0";
-    timeString += hours + ":";
-    if (minutes < 10)
-      timeString += "0";
-    timeString += minutes + ":";
-    if (seconds < 10)
-      timeString += "0";
-    timeString += seconds;
-    if (milliseconds > 0)
-    {
-      timeString += ".";
-      if (milliseconds < 100)
-      {
-        if (milliseconds < 10)
-          timeString += "00";
-        else
-          timeString += "0";
-      }
-      timeString += milliseconds;
-    }
-    return timeString;
-  }
-
-<%
-   // YYYY+-MM
-%>   
-  function serializeGYearMonth(fullYear,month)
-  {
-    var gYearMonthString = "";
-    if (fullYear < 1000)
-    {
-      if (fullYear < 100)
-      {
-        if (fullYear < 10)
-          gYearMonthString += "000";
-        else
-          gYearMonthString += "00";
-      }
-      else
-        gYearMonthString += "0";
-    }
-    gYearMonthString += fullYear+"-";
-    if (month < 10)
-      gYearMonthString += "0";
-    gYearMonthString += month;
-    return gYearMonthString;    
-  }
-  
-<%
-   // YYYY+-MM-DD
-%>
-  function serializeDate(fullYear,month,date)
-  {
-    var dateString = serializeGYearMonth(fullYear,month) + "-";
-    if (date < 10)
-      dateString += "0";
-    dateString += date;
-    return dateString;
-  }
-  
-  function serializeGDay(date)
-  {
-    var gDayString = "---";
-    if (date < 10)
-      gDayString += "0";
-    gDayString += date;
-    return gDayString;
-  }
-  
-  function serializeGMonthDay(month,date)
-  {
-    var gMonthDayString = "--";
-    if (month < 10)
-      gMonthDayString += "0";
-    gMonthDayString += month+"-";
-    if (date < 10)
-      gMonthDayString += "0";
-    gMonthDayString += date;
-    return gMonthDayString;
-  }    
-
-  function setDateUsingGDayParameters(gDayParameters,dateObj)
-  {
-    if (gDayParameters != null)
-      dateObj.setDate(gDayParameters[1]);
-  }
-  
-  function setDateUsingGMonthDayParameters(gMonthDayParameters,dateObj)
-  {
-    if (gMonthDayParameters != null)
-    {
-      dateObj.setMonth(gMonthDayParameters[1]-1);
-      dateObj.setDate(gMonthDayParameters[2]);
-    }
-  }
-  
-  function setDateUsingGYearMonthParameters(gYearMonthParameters,dateObj)
-  {
-    if (gYearMonthParameters != null)
-    {
-      dateObj.setFullYear(gYearMonthParameters[1]);
-      dateObj.setMonth(gYearMonthParameters[2]-1);
-    }
-  }
-  
-  function setDateUsingDateParameters(dateParameters,dateObj)
-  {
-    if (dateParameters != null)
-    {
-      setDateUsingGYearMonthParameters(dateParameters,dateObj);
-      dateObj.setDate(dateParameters[3]);
-    }
-  }
-
-  function setDateUsingDateTimeParameters(dateTimeParameters,dateObj)
-  {
-    if (dateTimeParameters != null)
-    {
-      setDateUsingDateParameters(dateTimeParameters,dateObj);
-      dateObj.setUTCHours(dateTimeParameters[4]);
-      dateObj.setUTCMinutes(dateTimeParameters[5]);
-      dateObj.setUTCSeconds(dateTimeParameters[6]);
-      var milliseconds = dateTimeParameters[7];
-      if (milliseconds.length > 0)
-<%
-   // Eliminate the decimal point
-%>
-        dateObj.setUTCMilliseconds(milliseconds.substr(1));
-      else
-        dateObj.setUTCMilliseconds(0);
-    }
-  }
-
-  function setDateUsingTimeParameters(timeParameters,dateObj)
-  {
-    if (timeParameters != null)
-    {
-      dateObj.setHours(timeParameters[1]);
-      dateObj.setMinutes(timeParameters[2]);
-      dateObj.setSeconds(timeParameters[3]);
-      var milliseconds = timeParameters[4];
-      if (milliseconds.length > 0)
-<%
-   // Eliminate the decimal point
-%>
-        dateObj.setMilliseconds(milliseconds.substr(1));
-      else
-        dateObj.setMilliseconds(0);
-    }
-  }
-
-  function init()
-  {
-    var d = new Date();
-<%
-   switch (calendarType)
-   {
-     case ActionInputs.CALENDAR_TYPE_DATE:
-%>
-    setDateUsingDateParameters(getDateParameters(top.opener.calendarTarget.value),d);
-<%
-       break;
-     case ActionInputs.CALENDAR_TYPE_DATETIME:
-%>
-    setDateUsingDateTimeParameters(getDateTimeParameters(top.opener.calendarTarget.value),d);
-<%
-       break;
-     case ActionInputs.CALENDAR_TYPE_GYEARMONTH:
-%>
-    setDateUsingGYearMonthParameters(getGYearMonthParameters(top.opener.calendarTarget.value),d);
-<%     
-     case ActionInputs.CALENDAR_TYPE_GDAY:
-%>
-    setDateUsingGDayParameters(getGDayParameters(top.opener.calendarTarget.value),d);
-<%   
-     case ActionInputs.CALENDAR_TYPE_GMONTHDAY:
-%>
-    setDateUsingGMonthDayParameters(getGMonthDayParameters(top.opener.calendarTarget.value),d);
-<%       
-     default:
-       break;
-   }
-%>
-    generateCalendar(d);
-    var monthSelector = document.getElementById("monthSelector");
-    for (var i=0;i<months.length;i++)
-      monthSelector.options[i] = new Option(months[i],i);
-    generateCalendar(d);
-  }
-
-  function initCalendarHeader(table)
-  {
-    calendarBody = document.createElement("TBODY");
-    var headerRow = document.createElement("tr");
-    for (var i=0;i<days.length;i++)
-    {
-      var header = document.createElement("th");
-      header.appendChild(document.createTextNode(days[i]));
-      header.className="headercolor";
-      headerRow.appendChild(header);
-    }
-    calendarBody.appendChild(headerRow);
-    table.appendChild(calendarBody);
-    calendarBodySet = true;
-  }
-
-  function generateCalendar(date)
-  {
-    var table = document.getElementById("calendar");
-    var dateDate = date.getDate();
-    var dateMonth = date.getMonth();
-    var dateFullYear = date.getFullYear();
-    var dateIterator = new Date();
-    dateIterator.setTime(Date.parse(engMonths[dateMonth]+" 1, "+dateFullYear));
-    var startingDate = dateIterator.getDate(); // 1,2,3...
-    var startingDay = dateIterator.getDay(); // Sun,Mon,Tues...
-    clearCalendar();
-    for (var rows=0;rows<6;rows++)
-    {
-      var row = document.createElement("tr");
-      for (var columns=0;columns<days.length;columns++)
-      {
-        var column = document.createElement("td");
-        var dateIteratorDate = dateIterator.getDate();
-        var dateIteratorMonth = dateIterator.getMonth();
-        var dateIteratorFullYear = dateIterator.getFullYear();
-        column.width = 24;
-        column.height = 24;
-        column.align = "center";
-        column.valign = "center";
-        column.className = "calendartablecells";
-        if ((dateIteratorDate == startingDate && columns < startingDay) || (dateIteratorMonth != dateMonth))
-          column.innerHTML = "&nbsp;";
-        else if (dateIteratorMonth == dateMonth)
-        {
-          var link = document.createElement("a");
-          switch (<%=calendarType%>)
-          {
-            case <%=ActionInputs.CALENDAR_TYPE_DATE%>:
-              link.href = "javascript:transferDate("+dateIteratorDate+")";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_DATETIME%>:
-              link.href = "javascript:transferDateTime("+dateIteratorDate+")";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_GYEARMONTH%>:
-              link.href = "javascript:transferGYearMonth()";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_GDAY%>:
-              link.href = "javascript:transferGDay("+dateIteratorDate+")";
-              break;
-            case <%=ActionInputs.CALENDAR_TYPE_GMONTHDAY%>:
-              link.href = "javascript:transferGMonthDay("+dateIteratorDate+")";
-              break;
-          }
-          link.appendChild(document.createTextNode(dateIteratorDate));
-          column.appendChild(link);
-          if (dateIteratorDate == dateDate && dateIteratorFullYear == dateFullYear)
-            column.className = "todaytablecell";
-          dateIteratorDate++;
-          dateIterator.setTime(Date.parse(engMonths[dateIteratorMonth]+" "+dateIteratorDate+", "+dateIterator.getFullYear()));
-        }
-        row.appendChild(column);
-      }
-      calendarBody.appendChild(row);
-    }
-    var monthSelector = document.getElementById("monthSelector");
-    for (var i=0;i<monthSelector.options.length;i++)
-    {
-      if (monthSelector.options[i].value == dateMonth)
-      {
-        monthSelector.selectedIndex = i;
-        break;
-      }
-    }
-    var yearText = document.getElementById("yearText");
-    yearText.value = dateFullYear;
-    savedYearTextValue = yearText.value;
-<%
-   if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
-   {
-%>
-    var timeText = document.getElementById("timeText");
-    timeText.value = serializeTime(date.getHours(),date.getMinutes(),date.getSeconds(),date.getMilliseconds());
-<%
-   }
-%>
-    currentDate = date;
-  }
-
-  function clearCalendar()
-  {
-    var table = document.getElementById("calendar");
-    if (!calendarBodySet)
-      initCalendarHeader(table);
-    for (var i=1;i<table.rows.length;i++)
-    {
-      table.deleteRow(i);
-      i--;
-    }
-  }
-
-  function updateCalendar(newMonth,newFullYear)
-  {
-    var d = new Date();
-    if (newMonth > months.length)
-    {
-      newFullYear++;
-      newMonth = 0;
-    }
-    else if (newMonth < 0)
-    {
-      newFullYear--;
-      newMonth = months.length-1;
-    }
-    d.setMonth(newMonth);
-    d.setFullYear(newFullYear);
-<%
-   if (calendarType == ActionInputs.CALENDAR_TYPE_DATETIME)
-   {
-%>
-    setDateUsingTimeParameters(getTimeParameters(document.getElementById("timeText").value),d);
-<%
-   }
-%>
-    generateCalendar(d);
-  }
-
-  function jumpToPreviousYear()
-  {
-    updateCalendar(currentDate.getMonth(),currentDate.getFullYear()-1)
-  }
-
-  function jumpToPreviousMonth()
-  {
-    updateCalendar(currentDate.getMonth()-1,currentDate.getFullYear());
-  }
-
-  function jumpToNextMonth()
-  {
-    updateCalendar(currentDate.getMonth()+1,currentDate.getFullYear());
-  }
-
-  function jumpToNextYear()
-  {
-    updateCalendar(currentDate.getMonth(),currentDate.getFullYear()+1);
-  }
-
-  function jumpToToday()
-  {
-    generateCalendar(new Date());
-  }
-
-  function setNewDate()
-  {
-    var monthSelector = document.getElementById("monthSelector");
-    var newMonth = monthSelector.options[monthSelector.selectedIndex].value;
-    var newFullYear = document.getElementById("yearText").value;
-<%
-   // YYYY+
-%>
-    var d = new Date();
-    if (validateYearString(newFullYear))
-    {
-      // The year string contains only digits and is hence a valid year.
-      d.setFullYear(newFullYear);
-      d.setMonth(newMonth);
-    }
-    generateCalendar(d);
-  }
-
-  function handleYearTextKeyUpEvent()
-  {
-    var currentYearTextValue = document.getElementById("yearText").value;
-    if (currentYearTextValue == savedYearTextValue)
-      return false;
-    setNewDate();
-  }
-
-<%
-   // YYYY+-MM-DD
-%>
-  function transferDate(date)
-  {
-    var fullYear = document.getElementById("yearText").value;
-    var month = document.getElementById("monthSelector").selectedIndex+1;
-    top.opener.calendarTarget.value = serializeDate(fullYear,month,date);
-    top.opener.closeCalendarBrowser();
-  }
-
-<%
-   // YYYY+-MM-DDTHH:MM:SS[.SSS]Z
-%>
-  function transferDateTime(date)
-  {
-    var fullYear = document.getElementById("yearText").value;
-    var month = document.getElementById("monthSelector").selectedIndex+1;
-    var serializedDate = serializeDate(fullYear,month,date);
-    var d = new Date();
-    setDateUsingDateParameters(getDateParameters(serializedDate),d);
-    var timeValue = document.getElementById("timeText").value;
-    var timeParameters = getTimeParameters(timeValue);
-    if (timeParameters == null)
-    {
-      if (!confirm("<%=HTMLUtils.JSMangle(controller.getMessage("MSG_ERROR_INVALID_TIME_FORMAT"))%>"))
-        return;
-    }
-    else
-      setDateUsingTimeParameters(timeParameters,d);
-    top.opener.calendarTarget.value = serializedDate + "T" + serializeTime(d.getUTCHours(),d.getUTCMinutes(),d.getUTCSeconds(),d.getUTCMilliseconds()) + "Z";
-    top.opener.closeCalendarBrowser();
-  }
-  
-<%
-   // YYYY+-MM
-%>
-  function transferGYearMonth()
-  {
-    var fullYear = document.getElementById("yearText").value;