[113162] Remove module from signature.

author: kchan 2005-10-19 21:37:10 +0000
committer: kchan 2005-10-19 21:37:10 +0000
commit: 226fd3d2b9319252f8300d18e2858615196fe88c (patch)
tree: 59f2122a1a1125ea3bab018978997cc1a72e6b8d /bundles
parent: d6c65fdcc140494ae3000fcee4c443ea2a106f30 (diff)
download: webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.tar.gz
webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.tar.xz
webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.zip
49 files changed, 206 insertions, 401 deletions
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
index 697d3e323..97cfed1c8 100644
--- 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
@@ -51,19 +51,16 @@ public class GeronimoAxisDeployCommand extends AbstractDataModelOperation
   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
+ * @param String projectName
    * 
    */
-  public GeronimoAxisDeployCommand(String projectName, String componentName)
+  public GeronimoAxisDeployCommand(String projectName)
   {
   }
   
@@ -182,7 +179,7 @@ public class GeronimoAxisDeployCommand extends AbstractDataModelOperation
     
     IStatus status = Status.OK_STATUS;
     // check if server-config.wsdd exists
-    IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_, componentName_ );
+    IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_ );
     outputRoot = J2EEUtils.getOutputContainerRoot( component );
     IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" );    
     IFile descriptorFile = outputRoot.getFile( path );
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
index 8e47d5a9f..959002a71 100644
--- 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
@@ -44,11 +44,8 @@ public class AxisClientDefaultingCommand extends AbstractDataModelOperation
 	private boolean clientIsExistingServer_;
 	private String proxyProjectFolder_;
 	private WebServicesParser webServicesParser_;
-	private String            moduleName_;
-	
-	public AxisClientDefaultingCommand( String moduleName ) 
+	public AxisClientDefaultingCommand( ) 
 	{
-	  moduleName_ = moduleName;
 	}
 
 	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
@@ -210,7 +207,7 @@ public class AxisClientDefaultingCommand extends AbstractDataModelOperation
 	 */
 	public String getProxyProjectFolder() {
 		if (proxyProject_!=null) {
-			proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ ).toString();
+			proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_ ).toString();
 		}		
 		return proxyProjectFolder_;  
 	}
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
index 7c0c39b65..5733a08ee 100644
--- 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
@@ -26,7 +26,6 @@ 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_;
@@ -37,10 +36,9 @@ public class AxisClientInputCommand extends AbstractDataModelOperation {
 		public AxisClientInputCommand() {
 		}
 		
-		public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project, String module) {
+		public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project) {
 			wsc_ = wsc;
 			clientProject_ = project; 
-			clientModule_ = module;
 		}
 		
 	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
@@ -66,10 +64,6 @@ public class AxisClientInputCommand extends AbstractDataModelOperation {
 	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
index d40ceed0b..d4a67cda9 100644
--- 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
@@ -31,7 +31,7 @@ public class AxisClientOutputCommand extends AbstractDataModelOperation {
 		public AxisClientOutputCommand() {
 		}
 		
-		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context, String module) {
+		public AxisClientOutputCommand(IWebServiceClient wsc, IContext context) {
 			wsc_ = wsc;
 		}
 		
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
index ac509f937..783c9b286 100644
--- 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
@@ -29,7 +29,6 @@ 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.common.frameworks.datamodel.AbstractDataModelOperation;
-import org.eclipse.wst.ws.internal.datamodel.Model;
 
 
 public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation {
@@ -40,28 +39,13 @@ public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation
 	private String WSDLServicePathname_;
 	private MessageUtils msgUtils_;
 	private MessageUtils coreMsgUtils_;
-	private String moduleName_;
 	
-	public DefaultsForClientJavaWSDLCommand( String moduleName ) {
+	public DefaultsForClientJavaWSDLCommand( ) {
 		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();
@@ -80,14 +64,14 @@ public class DefaultsForClientJavaWSDLCommand extends AbstractDataModelOperation
 	    ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(proxyProject_);
 	    if (mn!=null)
 	    {
-			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ );
+			IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_ );
 			//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_);
+			IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_);
 			if (webModuleContainer !=null)
 			{
 			  IPath webModulePath = webModuleContainer.getFullPath();
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
index b75f4d6b5..a4293c92e 100644
--- 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
@@ -31,14 +31,12 @@ public class CheckAxisDeploymentDescriptorsTask extends AbstractDataModelOperati
 	private MessageUtils msgUtils_;
 	private MessageUtils coreMsgUtils_;
 	private IProject serverProject;
-	private String   moduleName_;
     
-  public CheckAxisDeploymentDescriptorsTask( String moduleName )
+  public CheckAxisDeploymentDescriptorsTask( )
   {
     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 ) 
@@ -53,7 +51,7 @@ public class CheckAxisDeploymentDescriptorsTask extends AbstractDataModelOperati
       IProject project = serverProject;
 	  	  
 
-      filePath = J2EEUtils.getWebInfPath( project, moduleName_ );
+      filePath = J2EEUtils.getWebInfPath( project );
       filePath = filePath.append("/server-config.wsdd");
 
 	  if(filePath==null || filePath.isEmpty())
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
index c3a4378ea..102a8429a 100644
--- 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
@@ -61,16 +61,14 @@ public class CopyAxisJarCommand extends AbstractDataModelOperation {
   private MessageUtils baseConMsgUtils_;
   private IProject project;
   private Boolean projectRestartRequired_ = Boolean.FALSE;
-  private String  moduleName_;
-
+  
   /**
    * Default CTOR;
    */
-  public CopyAxisJarCommand( String moduleName ) {
+  public CopyAxisJarCommand( ) {
     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;
   }
 
   /**
@@ -117,7 +115,7 @@ public class CopyAxisJarCommand extends AbstractDataModelOperation {
 
   private void copyAxisJarsToProject(IProject project, IStatus status, Environment env, IProgressMonitor monitor) {
 //    IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
-	IPath webModulePath = J2EEUtils.getWebContentPath( project, moduleName_ );
+	IPath webModulePath = J2EEUtils.getWebContentPath( project );
     if (webModulePath == null) {
       status = StatusUtils.errorStatus( baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"));
       env.getStatusHandler().reportError(status);
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
index fec20ee05..186ca53fb 100644
--- 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
@@ -50,25 +50,13 @@ public class Stub2BeanCommand extends AbstractDataModelOperation
   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){
+  public Stub2BeanCommand(){
 	  super();
 	  portTypes_ = new Vector();	  
-	  module_ = moduleName;
 	  String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
 	  msgUtils_ = new MessageUtils(pluginId + ".plugin", this);	  
   }
@@ -164,7 +152,6 @@ public class Stub2BeanCommand extends AbstractDataModelOperation
             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);
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
index 467892f9c..6e8fc492d 100644
--- 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
@@ -57,7 +57,6 @@ public class Stub2BeanInfo
   private Vector usedNames;
   
   private IProject clientProject_;
-  private String moduleName_;
   
   public Stub2BeanInfo()
   {
@@ -76,10 +75,6 @@ public class Stub2BeanInfo
   	this.clientProject_ =  clientProject;
   }
   
-  public void setClientModuleName(String moduleName) {
-	  this.moduleName_ = moduleName;
-  }
-
   public void setPackage(String pkgName)
   {
     if (pkgName != null && pkgName.length() > 0)
@@ -213,7 +208,7 @@ public class Stub2BeanInfo
     ModuleCoreNature mn = ModuleCoreNature.getModuleCoreNature(clientProject_);
     if (mn!=null)
     {
-    	sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_, moduleName_);
+    	sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_);
         IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
         filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();    	
     }
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
index 6106d374a..b5d87cbd7 100644
--- 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
@@ -60,9 +60,9 @@ public class ClasspathUtils {
 		return instance_;
 	}
 	
-	public String getClasspathString(IProject project, String module) {
+	public String getClasspathString(IProject project) {
 		StringBuffer classpath = new StringBuffer();
-		String[] classpathEntries = getClasspath(project, false, module);
+		String[] classpathEntries = getClasspath(project, false);
 
 		Vector classpathVector = new Vector();
 		for (int i = 0; i < classpathEntries.length; i++) {
@@ -76,8 +76,7 @@ public class ClasspathUtils {
 	}
 
 		
-	private String[] getClasspath(IProject project, boolean isDependent, String inputModule) {
-//		inputModule is valid only if it's not a dependent project
+	private String[] getClasspath(IProject project, boolean isDependent) {
 		String[] moduleClasspath = new String[0];
 		ArrayList projectClasspath = new ArrayList();
 		boolean needJavaClasspath = false;
@@ -105,7 +104,7 @@ public class ClasspathUtils {
 			if (!isDependent) {
 				if (J2EEUtils.isWebComponent(comp)) {
 					needJavaClasspath = true;
-					moduleClasspath = getWEBINFLib(project, inputModule);
+					moduleClasspath = getWEBINFLib(project);
 					for (int j = 0; j < moduleClasspath.length; j++) {
 						projectClasspath.add(moduleClasspath[j]);
 					}
@@ -174,11 +173,11 @@ public class ClasspathUtils {
 		return jars;
 	}
 
-	private String[] getWEBINFLib(IProject project, String module) {
+	private String[] getWEBINFLib(IProject project) {
 		String[] webinfLibJars = new String[0];
 		ArrayList anArrayList = new ArrayList();
 		try {			
-					IVirtualComponent component = ComponentCore.createComponent(project, module);
+					IVirtualComponent component = ComponentCore.createComponent(project);
 					if (component != null) {
 						
 						IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
@@ -257,7 +256,7 @@ public class ClasspathUtils {
 			{			
 				return getClasspath(
 					ResourcesPlugin.getWorkspace().getRoot().getProject(
-						entry.getPath().lastSegment()), true, "");
+						entry.getPath().lastSegment()), true);
 			}
 			case IClasspathEntry.CPE_SOURCE :
 				{
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
index c6283ef88..2f05bea6b 100644
--- 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
@@ -51,18 +51,18 @@ public class AxisWebServiceClient extends AbstractWebServiceClient
 		registerDataMappings( environment.getCommandManager().getMappingRegistry());
 		
 		Vector commands = new Vector();
-		commands.add(new AxisClientInputCommand(this, ctx, project, module));
-		commands.add(new AxisClientDefaultingCommand(module));
+		commands.add(new AxisClientInputCommand(this, ctx, project));
+		commands.add(new AxisClientDefaultingCommand());
 //		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 CopyAxisJarCommand());
+		commands.add(new DefaultsForClientJavaWSDLCommand());
 		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 Stub2BeanCommand());
+		commands.add(new AxisClientOutputCommand(this,ctx));
 		commands.add(new BuildProjectCommand());
 		return new SimpleCommandFactory(commands);
 	}
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
index cf8e37d19..0d1ce1173 100644
--- 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
@@ -27,7 +27,7 @@ public class AxisRunInputCommand extends AbstractDataModelOperation{
 	public AxisRunInputCommand() {
 	}
 	
-	public AxisRunInputCommand(AxisWebService ws, String project, String module) {
+	public AxisRunInputCommand(AxisWebService ws, String project) {
 		ws_ = ws;
 		serverProject_ = project; 
 	}
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
index ae1fabdd5..6e7dee4da 100644
--- 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
@@ -25,7 +25,6 @@ public class BUAxisInputCommand extends AbstractDataModelOperation {
 	
 	private IWebService ws_;
 	private String serverProject_; 
-	private String serverModule_;
 	private String javaBeanName_;
 
 	  private String serviceServerTypeID_;
@@ -36,10 +35,10 @@ public class BUAxisInputCommand extends AbstractDataModelOperation {
 		public BUAxisInputCommand() {
 		}
 		
-		public BUAxisInputCommand(IWebService ws, String project, String module) {
+		public BUAxisInputCommand(IWebService ws, String project) {
 			ws_ = ws;
 			serverProject_ = project; 
-			serverModule_ = module;	}
+		}
 		
 		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
 		{
@@ -78,10 +77,6 @@ public class BUAxisInputCommand extends AbstractDataModelOperation {
 		    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/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java
index 9db3a43eb..ecf057418 100644
--- 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
@@ -34,18 +34,16 @@ import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 public class CopyDeploymentFileCommand extends AbstractDataModelOperation
 {
   private String projectName_;
-  private String componentName_;
   
   /**
    * Constructor for CopyDeploymentFileCommand.
-   * @param String description
-   * @param String name
+ * @param String description
+ * @param String name
    * 
    */
-  public CopyDeploymentFileCommand( String projectName, String componentName )
+  public CopyDeploymentFileCommand( String projectName )
   { 
     projectName_   = projectName;
-    componentName_ = componentName;
   }
 
 	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
@@ -54,7 +52,7 @@ public class CopyDeploymentFileCommand extends AbstractDataModelOperation
     
     try
     {
-      IVirtualComponent component      = J2EEUtils.getVirtualComponent( projectName_, componentName_ );
+      IVirtualComponent component      = J2EEUtils.getVirtualComponent( projectName_ );
       IFolder           root           = J2EEUtils.getOutputContainerRoot( component );
       IPath             path           = new Path( "WEB-INF" ).append( "server-config.wsdd" );
       IFile             descriptorFile = root.getFile( path );
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
index a6fa30356..4ce4cf3bd 100644
--- 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
@@ -23,7 +23,6 @@ public class TDAxisInputCommand extends AbstractDataModelOperation {
 	
 	private IWebService ws_;
 	private String serverProject_; 
-	private String serverModule_;
 
 	  private String serverServer_;
 	  private String wsdlURI_;
@@ -34,10 +33,9 @@ public class TDAxisInputCommand extends AbstractDataModelOperation {
 		public TDAxisInputCommand() {
 		}
 		
-		public TDAxisInputCommand(IWebService ws, String project, String module) {
+		public TDAxisInputCommand(IWebService ws, String project) {
 			ws_ = ws;
 			serverProject_ = project;
-			serverModule_ = module;
 		}
 		
 		public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
@@ -65,7 +63,4 @@ public class TDAxisInputCommand extends AbstractDataModelOperation {
 			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
index 8e575407b..dd66dfbff 100644
--- 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
@@ -37,13 +37,11 @@ public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
 
 	private MessageUtils msgUtils_;
 	private IProject serverProject;
-	private String   moduleName_;
 
-  public UpdateWEBXMLCommand( String moduleName )
+  public UpdateWEBXMLCommand( )
   {
     String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
     msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-	moduleName_ = moduleName;
   }
 
 	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
@@ -51,7 +49,7 @@ public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
 		Environment environment = getEnvironment();
 		if (serverProject != null) {
 			IStatus status = null;
-			status = addServlet(serverProject, moduleName_, getAxisServletDescriptor());
+			status = addServlet(serverProject, getAxisServletDescriptor());
 			if (status.getSeverity() == Status.ERROR) {
 				environment.getStatusHandler().reportError(status);
 				return status;
@@ -60,7 +58,7 @@ public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
 				environment.getStatusHandler().reportError(status);
 				return status;
 			}
-			addServlet(serverProject, moduleName_, getAdmintServletDescriptor());
+			addServlet(serverProject, getAdmintServletDescriptor());
 			if (status.getSeverity() == Status.ERROR) {
 				environment.getStatusHandler().reportError(status);
 				return status;
@@ -93,14 +91,13 @@ public class UpdateWEBXMLCommand extends AbstractDataModelOperation {
 
 	public IStatus addServlet(
 		IProject webProject,
-		String   moduleName,
 		ServletDescriptor servletDescriptor) {
 
 		WebArtifactEdit webEdit = null;		
 		try {
 			// 
 			WebApp webapp = null;
-      IVirtualComponent vc = ComponentCore.createComponent(webProject, moduleName);
+      IVirtualComponent vc = ComponentCore.createComponent(webProject);
       webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
 			if (webEdit != null)
 			{
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
index 8676c3f4a..6294181cf 100644
--- 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
@@ -4,8 +4,7 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentD
 
 public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
 {
-  public BUCheckAxisDeploymentDescriptors(String moduleName) 
+  public BUCheckAxisDeploymentDescriptors() 
   {
-	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
index 402d5a837..36c7ce1e1 100644
--- 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
@@ -45,15 +45,12 @@ public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation
 	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$
@@ -61,28 +58,15 @@ public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation
 	public final byte MODE_BEAN = (byte) 0;
 	public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
 
-	public DefaultsForServerJavaWSDLCommand( String moduleName ) 
+	public DefaultsForServerJavaWSDLCommand( ) 
 	{
 		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
 	*/
@@ -110,7 +94,7 @@ public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation
 		javaWSDLParam_.setSkeletonDeploy(false);
 
 		javaWSDLParam_.setBeanName(javaBeanName_);
-		String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_, moduleName_);
+		String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_);
 		javaWSDLParam_.setClasspath(classpath);
 
 		String simpleBeanName = javaBeanName_;
@@ -132,8 +116,8 @@ public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation
 		IPath webinfPath = serviceProject_.getFullPath();
 		try {
 			//if ( ResourceUtils.isWebProject(serviceProject_)) {
-      if (J2EEUtils.isWebComponent(serviceProject_, moduleName_)){
-				moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_, moduleName_);
+      if (J2EEUtils.isWebComponent(serviceProject_)){
+				moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_);
 
 				// should use ModuleCore.getSourceContainers();
 //				IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
@@ -141,8 +125,8 @@ public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation
 //					moduleServerRoot = container.getFullPath();
 //				}
 				
-				modulePath = J2EEUtils.getWebContentPath(serviceProject_, moduleName_);
-				webinfPath = J2EEUtils.getWebInfPath( serviceProject_, moduleName_ );
+				modulePath = J2EEUtils.getWebContentPath(serviceProject_);
+				webinfPath = J2EEUtils.getWebInfPath( serviceProject_ );
 				
 			}
 
@@ -192,15 +176,12 @@ public class DefaultsForServerJavaWSDLCommand extends AbstractDataModelOperation
 		javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
 		javaWSDLParam_.setUse(JavaWSDLParameter.USE_LITERAL);
 
-		String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, moduleName_);
+		String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_);
 		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);
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
index e461ca2fa..3670616e8 100644
--- 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
@@ -33,16 +33,14 @@ public class MoveDeploymentFilesTask extends AbstractDataModelOperation {
 	private MessageUtils msgUtils_;
 	private MessageUtils coreMsgUtils_;
 	private IProject serverProject;
-	private String   moduleName_;
 	
     private JavaWSDLParameter javaWSDLParam_;
 	
-	public MoveDeploymentFilesTask( String moduleName )
+	public MoveDeploymentFilesTask( )
     {
       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;
     }
 
   /**
@@ -60,7 +58,7 @@ public class MoveDeploymentFilesTask extends AbstractDataModelOperation {
 
 		IProject project = serverProject;
 		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
+		String projectURL = ServerUtils.getEncodedWebComponentURL(project);
 		
 		if (projectURL == null) {
 		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}));
@@ -79,7 +77,7 @@ public class MoveDeploymentFilesTask extends AbstractDataModelOperation {
 		}
 
 
-		IPath webinfPath = J2EEUtils.getWebInfPath(project, moduleName_ );
+		IPath webinfPath = J2EEUtils.getWebInfPath(project );
 
 			for (int i = 0; i < deployFiles.length; i++) {
         File f = new File(deployFiles[i]);
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
index 4934e0fd7..de75da8cf 100644
--- 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
@@ -32,30 +32,14 @@ public class MoveJavaFilesTask extends AbstractDataModelOperation {
 	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
 	*/
@@ -80,7 +64,7 @@ public class MoveJavaFilesTask extends AbstractDataModelOperation {
 
 		IProject project = serviceProject_;
 		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
+		String projectURL = ServerUtils.getEncodedWebComponentURL(project);
 		if (projectURL == null) {
 		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}));
 		    environment.getStatusHandler().reportError(status);
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
index da2543b4b..669f77ac0 100644
--- 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
@@ -58,11 +58,9 @@ public class Skeleton2WSDLCommand extends AbstractDataModelOperation
   private JavaWSDLParameter javaWSDLParam;
   private IProject serverProject;
   private MessageUtils msgUtils_;
-  private String       moduleName_;
 
-  public Skeleton2WSDLCommand( String moduleName ) {
+  public Skeleton2WSDLCommand( ) {
 	msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
-	moduleName_ = moduleName;
   }
 
   /**
@@ -172,7 +170,7 @@ public class Skeleton2WSDLCommand extends AbstractDataModelOperation
 //			wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
 //		}		
 // TODO:  handle EJB case
-		     wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
+		     wsdlPath = J2EEUtils.getWebContentPath( serverProject );
 			 IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
 		     IFolder folder = ResourceUtils
 								.getWorkspaceRoot()
@@ -220,7 +218,7 @@ public class Skeleton2WSDLCommand extends AbstractDataModelOperation
     if (soapAddress != null)
     {
 //      String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
-	  String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, moduleName_);
+	  String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject);
       if (projectURL == null)
         return StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}));
       StringBuffer serviceURL = new StringBuffer(projectURL);
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
index d83dc372f..6a6175616 100644
--- 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
@@ -4,8 +4,7 @@ import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentD
 
 public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask 
 {
-  public TDCheckAxisDeploymentDescriptors(String moduleName) 
+  public TDCheckAxisDeploymentDescriptors() 
   {
-	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
index 3845dd7c3..8b44e49f6 100644
--- 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
@@ -48,25 +48,14 @@ public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
     private MessageUtils coreMsgUtils_;
 	private JavaWSDLParameter javaWSDLParam_;
 	private IProject serviceProject_;
-	// rm private Model model_;
-	
-	private String moduleName_;
 
-	public UpdateAxisWSDDFileTask( String moduleName) 
+	public UpdateAxisWSDDFileTask() 
 	{
 	    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
 	*/
@@ -90,7 +79,7 @@ public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
 	
 		IProject project = serviceProject_;
 		//String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
-		String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
+		String projectURL = ServerUtils.getEncodedWebComponentURL(project);
 		if (projectURL == null) {
 		    status = StatusUtils.errorStatus(msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}));
 		    environment.getStatusHandler().reportError(status);
@@ -112,7 +101,7 @@ public class UpdateAxisWSDDFileTask extends AbstractDataModelOperation {
 //		}
 
 //		String webContentPath =	ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
-		String webContentPath =	J2EEUtils.getWebContentContainer( project, moduleName_ ).getLocation().toString();
+		String webContentPath =	J2EEUtils.getWebContentContainer( project ).getLocation().toString();
 		try {
 
 			if (javaWSDLParam_.getDeploymentFiles() != null
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
index 2f5e749e1..ad50e0156 100644
--- 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
@@ -29,11 +29,9 @@ public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOper
   private String wsdlURI;
   private IProject serverProject;
   private JavaWSDLParameter javaWSDLParam;
-  private String moduleName_;
 
-  public SkeletonConfigWidgetDefaultingCommand( String moduleName )
+  public SkeletonConfigWidgetDefaultingCommand( )
   {
-    moduleName_ = moduleName;
   }
   
 	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) 
@@ -62,7 +60,7 @@ public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOper
   
   public String getOutputWSDLFolder()
   {
-	  IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject, moduleName_ ).append("wsdl");
+	  IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject ).append("wsdl");
       return wsdlPath.toString();
   }
   
@@ -77,7 +75,7 @@ public class SkeletonConfigWidgetDefaultingCommand extends AbstractDataModelOper
   public String getOutputJavaFolder()
   {
     if (serverProject!=null){
-      return ResourceUtils.getJavaSourceLocation(serverProject, moduleName_).toString();
+      return ResourceUtils.getJavaSourceLocation(serverProject).toString();
     }
     return null;
   }
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
index 696537baf..852909fc8 100644
--- 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
@@ -74,22 +74,22 @@ public class AxisWebService extends AbstractWebService
 			
 			registerBUDataMappings( environment.getCommandManager().getMappingRegistry());
 			
-			commands.add(new BUAxisInputCommand(this, project, module));
+			commands.add(new BUAxisInputCommand(this, project));
 //			commands.add(new ValidateObjectSelectionCommand());
 			commands.add(new BUAxisDefaultingCommand());
-			commands.add(new DefaultsForServerJavaWSDLCommand(module));
+			commands.add(new DefaultsForServerJavaWSDLCommand());
 			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 BUCheckAxisDeploymentDescriptors());
+			commands.add(new CopyAxisJarCommand());
 			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 MoveJavaFilesTask());
+			commands.add(new UpdateAxisWSDDFileTask());
+			commands.add(new UpdateWEBXMLCommand());
 			commands.add(new RefreshProjectCommand());
 			commands.add(new BuildProjectCommand());
 			commands.add(new AxisOutputCommand(this));
@@ -98,18 +98,18 @@ public class AxisWebService extends AbstractWebService
 			
 			registerTDDataMappings( environment.getCommandManager().getMappingRegistry());
 			
-			commands.add(new TDAxisInputCommand(this, project, module));
+			commands.add(new TDAxisInputCommand(this, project));
 			commands.add(new AxisSkeletonDefaultingCommand());
 		    commands.add(new ValidateWSDLCommand());
-		    commands.add(new SkeletonConfigWidgetDefaultingCommand(module));
+		    commands.add(new SkeletonConfigWidgetDefaultingCommand());
 //			commands.add(new SimpleFragment( "SkeletonConfig" ));
 //			commands.add(new SimpleFragment( "AxisMappingsWidget" ));
-		    commands.add(new TDCheckAxisDeploymentDescriptors(module));
-			commands.add(new CopyAxisJarCommand(module));
+		    commands.add(new TDCheckAxisDeploymentDescriptors());
+			commands.add(new CopyAxisJarCommand());
 		    commands.add(new WSDL2JavaCommand());
-		    commands.add(new MoveDeploymentFilesTask(module));
-		    commands.add(new Skeleton2WSDLCommand(module));
-		    commands.add(new UpdateWEBXMLCommand(module));
+		    commands.add(new MoveDeploymentFilesTask());
+		    commands.add(new Skeleton2WSDLCommand());
+		    commands.add(new UpdateWEBXMLCommand());
 		    commands.add(new RefreshProjectCommand());
 		    commands.add(new BuildProjectCommand());
 			commands.add(new AxisOutputCommand(this));
@@ -139,15 +139,14 @@ public class AxisWebService extends AbstractWebService
 					.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));
+			commands.add(new AxisRunInputCommand(this, project));
 			if (getWebServiceInfo().getServerFactoryId().equals("org.eclipse.jst.server.geronimo.10")) {
-				commands.add(new GeronimoAxisDeployCommand(project, module));
+				commands.add(new GeronimoAxisDeployCommand(project));
 			}
 			else {
 			    commands.add(new AxisDeployCommand());
 			}
-			commands.add( new CopyDeploymentFileCommand( project, module ) );
+			commands.add( new CopyDeploymentFileCommand( project ) );
 			commands.add(new RefreshProjectCommand());
 			if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
 				commands.add(new ComputeAxisSkeletonBeanCommand());
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
index ae8a5c96c..6943c0fee 100644
--- 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
@@ -49,7 +49,7 @@ public class ServerSelectionUtils
 
     // 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[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(project), null);
     IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
     if (firstSupportedServer != null)
     {
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
index 44345accc..cbd7fe66f 100644
--- 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
@@ -122,7 +122,7 @@ public class ValidationUtils
     try {
 		if (p!=null && p.exists())
 		{
-  	  int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p, compName);
+  	  int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p);
 		  if (projectJ2EELevel!=-1)
 		  {
 		    String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
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
index da2558ba3..d0e1710f0 100644
--- 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
@@ -60,8 +60,6 @@ public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidge
 
   private IProject project_;
   
-  private String componentName_;
-  
   private WebServicesResource wsClientRes_;
 
   private String serviceRefName_ = null;
@@ -206,20 +204,16 @@ public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidge
       }
       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_)) {
+      if (J2EEUtils.isWebComponent(project_)) {
         WebArtifactEdit webEdit = null;
         try {
-          IVirtualComponent vc = ComponentCore.createComponent(project_, componentName_);          
+          IVirtualComponent vc = ComponentCore.createComponent(project_);          
           webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc);
           if (webEdit != null)
           {
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
index 2caee32e8..61be9e438 100644
--- 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
@@ -178,7 +178,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements
 
   private void setBeanList(IVirtualComponent earComponent)
   {
-    IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject(), earComponent.getName());
+    IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject());
     Table beanTable = beanList.getTable();
     beanTable.removeAll();
     ejbBeanNames = new Vector();
@@ -250,7 +250,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements
         {
           for (int i = 0; i < earComponents.length; i++)
           {
-			      IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject(), earComponents[i].getName());
+			      IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject());
 			      for (int j=0; j <ejbComponents.length; j++)
 			      {
               EJBArtifactEdit  ejbEdit = null;
@@ -308,8 +308,7 @@ public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements
         if (selEJBName != null)
         {
           IProject project = earComponents[earList.getSelectionIndex()].getProject();
-          String name = earComponents[earList.getSelectionIndex()].getName();
-          IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project, name);
+          IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project);
           for (int i=0; i<ejbComponents.length; i++)
           {
             EJBArtifactEdit  ejbEdit = null;
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
index 5b0683e3a..2ebfd11d1 100644
--- 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
@@ -412,10 +412,10 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataM
       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);
+        isValidComponentType = J2EEUtils.isWebComponent(project) ||
+                                     J2EEUtils.isEJBComponent(project) ||
+                                     J2EEUtils.isAppClientComponent(project) ||
+                                     J2EEUtils.isJavaComponent(project);
       }
       
       if (isValidComponentType)
@@ -424,9 +424,9 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataM
         
         //Get the J2EE level
         String versionString = null;
-        if (!J2EEUtils.isJavaComponent(project, componentName))
+        if (!J2EEUtils.isJavaComponent(project))
         {
-	        int versionId = J2EEUtils.getJ2EEVersion(project, componentName);        
+	        int versionId = J2EEUtils.getJ2EEVersion(project);        
 	        versionString = String.valueOf(versionId);
         }
 
@@ -438,7 +438,7 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataM
         
         //Get the client project type
         //String clientProjectTypeId = getClientProjectTypeFromRuntimeId(project, clientIds_.getRuntimeId());
-        String clientComponentTypeId = J2EEUtils.getComponentTypeId(project, componentName);        
+        String clientComponentTypeId = J2EEUtils.getComponentTypeId(project);        
         
         //If the preferred runtime supports this J2EE level and server target, keep it
         if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId())) &&
@@ -705,7 +705,7 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataM
   protected String[] getDefaultEARFromClientProject(IProject project, String componentName)
   {
     String[] projectAndComp = new String[2];
-    IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(project, componentName);
+    IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(project);
     if (earComps.length>0)
     {
       //Pick the first one
@@ -896,7 +896,7 @@ public class ClientRuntimeSelectionWidgetDefaultingCommand extends AbstractDataM
   	{
   	  //Get the runtime target on the serviceProject
   	  IRuntime clientTarget = ServerSelectionUtils.getRuntimeTarget(clientProjectName);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(clientProject, clientComponentName_));
+  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(clientProject));
   	  if (clientTarget != null)
   	  {
   	  	if (!ServerUtils.isTargetValidForEAR(clientTarget.getRuntimeType().getId(),j2eeVersion))
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
index 81a2cd5a6..66ba2032a 100644
--- 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
@@ -299,9 +299,8 @@ public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
 	}
 	
 	IProject project     = ProjectUtilities.getProject( projectName );
-	String   compName    = module_.getText();
 	
-	IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project, compName );
+	IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project );
 	
 	return components.length == 0 ? null : components[0];
   }
@@ -451,7 +450,7 @@ public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
     IProject moduleProj = ResourcesPlugin.getWorkspace().getRoot().getProject(moduleProject_.getText());
     if (moduleProj.exists())
     {
-      IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(moduleProj, moduleName);
+      IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(moduleProj);
       if (ears != null && ears.length > 0)
       {
         for (int i = 0; i < ears.length; i++)
@@ -488,8 +487,8 @@ public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
   	  //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 (J2EEUtils.exists(project))
+  	    j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(project));
   	
   	  
   	  if (target != null)
@@ -525,8 +524,6 @@ public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
     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);
@@ -539,8 +536,8 @@ public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
             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 (project.exists() && J2EEUtils.exists(project) && ear.exists() && J2EEUtils.exists(ear)) {
+            if (!J2EEUtils.isComponentAssociated(ear, project)) result = (byte) (result | ADD_EAR_ASSOCIATION);
           }
         }
       }
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
index a08552de5..a9dddb4d1 100644
--- 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
@@ -51,7 +51,6 @@ public class ClientTestDelegateCommand extends AbstractDataModelOperation
   private String proxyBean;
   private String sampleProject;
   private String sampleP;
-  private String sampleC;
   private String clientProject;
   private String clientP;
   private String clientC;
@@ -151,7 +150,6 @@ public class ClientTestDelegateCommand extends AbstractDataModelOperation
 	  int index = sampleProject.indexOf("/");
       if (index!=-1){
         sampleP = sampleProject.substring(0,index);
-        sampleC = sampleProject.substring(index + 1);
       }
 	}
 	
@@ -163,7 +161,6 @@ public class ClientTestDelegateCommand extends AbstractDataModelOperation
 	testInfo.setJspFolder(jspFolder);
 	testInfo.setEndpoint(endpoints);
 	testInfo.setGenerationProject(sampleP);
-	testInfo.setGenerationModule(sampleC);
 	testInfo.setProxyBean(proxyBean);
 	testInfo.setSetEndpointMethod(setEndpointMethod);
 	testInfo.setClientProject(clientP);
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
index 09ae87196..33c2453fd 100644
--- 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
@@ -37,7 +37,6 @@ import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
 public class CopyWebServiceUtilsJarCommand extends AbstractDataModelOperation 
 {
   private String sampleProject;
-	private String sampleC;
   private MessageUtils msgUtils;
 	
 /**
@@ -62,7 +61,7 @@ public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
   {
     ProgressUtils.report( monitor, msgUtils.getMessage( "PROGRESS_INFO_COPY_WEBSERVICE_UTILS" ) );
     IProject sampleIProject = ProjectUtilities.getProject(sampleProject);    
-    IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject, sampleC);	
+    IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject);	
     if (webModulePath == null)
       return StatusUtils.errorStatus( msgUtils.getMessage("MSG_ERROR_PROJECT_NOT_FOUND") );
       
@@ -122,9 +121,5 @@ 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/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
index a12e09286..faedf88c0 100644
--- 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
@@ -153,7 +153,7 @@ public class WebServiceClientTestArrivalCommand extends AbstractDataModelOperati
 	  
 	clientIProject = (IProject)ProjectUtilities.getProject(clientP);
   	
-  	if(J2EEUtils.isWebComponent(clientIProject, clientC)){
+  	if(J2EEUtils.isWebComponent(clientIProject)){
       sampleProject = clientProject;
 	  sampleP = clientP;
 	  sampleC = clientC;
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
index 4bc0477d0..3f028ce8c 100644
--- 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
@@ -62,12 +62,12 @@ public class AddModuleDependenciesCommand extends AbstractDataModelOperation
       createSampleProjects(env, monitor );
 	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
 	        
-      if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, testInfo.getClientModule()))
+      if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject))
       {
         String uri = clientIProject.getName() + ".jar";
-		if (J2EEUtils.isJavaComponent(clientIProject,testInfo.getClientModule()))
+		if (J2EEUtils.isJavaComponent(clientIProject))
           addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri);
-        addJAROrModuleDependency(sampleIProject, testInfo.getGenerationModule(), uri);
+        addJAROrModuleDependency(sampleIProject, uri);
         addBuildPath(sampleIProject, clientIProject);
       }
     }
@@ -87,7 +87,7 @@ public class AddModuleDependenciesCommand extends AbstractDataModelOperation
 //    cmd.execute();
   }
 
-  private void addJAROrModuleDependency(IProject project, String compName, String uri) throws IOException, CoreException
+  private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
   {
      ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
      manifest.mergeClassPath(new String[]{uri});
@@ -107,12 +107,10 @@ public class AddModuleDependenciesCommand extends AbstractDataModelOperation
 	  
 	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;	
+		  sampleEARProject = testInfo.getGenerationProject() + DEFAULT_SAMPLE_EAR_PROJECT_EXT;	
 	  }
 	  else{ 
 	      sampleEARProject = testInfo.getClientEARProject();
-		  sampleEARModule = testInfo.getClientEARModule();
 	  }
 	  
 	  sampleEARIProject  = ProjectUtilities.getProject(sampleEARProject);
@@ -124,7 +122,7 @@ public class AddModuleDependenciesCommand extends AbstractDataModelOperation
 	    createEAR.setServerInstanceId(testInfo.getClientExistingServer().getId());
 	    createEAR.setServerFactoryId(testInfo.getClientServerTypeID());
 	    createEAR.setModuleType(CreateModuleCommand.EAR);
-	    createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject,testInfo.getClientModule()));
+	    createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject));
       createEAR.setEnvironment( env );
 		  IStatus status = createEAR.execute( monitor, null );
 	    if (status.getSeverity()==Status.ERROR)
@@ -150,11 +148,10 @@ public class AddModuleDependenciesCommand extends AbstractDataModelOperation
       {
         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.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject));
         createSample.setEnvironment( env );
 		IStatus status = createSample.execute( monitor, null );
       
@@ -162,7 +159,6 @@ public class AddModuleDependenciesCommand extends AbstractDataModelOperation
 //		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 );
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
index c52c64ccd..099c2f448 100644
--- 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
@@ -47,7 +47,6 @@ public class GSTCGenerateCommand extends AbstractDataModelOperation
     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;
@@ -65,9 +64,9 @@ public class GSTCGenerateCommand extends AbstractDataModelOperation
 	//flexible projects  
 	  
 	IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, testInfo.getClientModule())){   
+    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){   
 	  IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
-	  IPath path = J2EEUtils.getWebContentPath(project,testInfo.getGenerationModule());
+	  IPath path = J2EEUtils.getWebContentPath(project);
 	  int index = testInfo.getJspFolder().lastIndexOf("/");
 	  String jsp = testInfo.getJspFolder().substring(index + 1);
 	  StringBuffer sb = new StringBuffer();	
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
index cb867d789..bfc927935 100644
--- 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
@@ -59,9 +59,9 @@ public class GSTCLaunchCommand extends AbstractDataModelOperation
 		//flexible projects  
 		  
 		IProject clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
-	    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, testInfo.getClientModule())){   
+	    if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)){   
 		  IProject project = ProjectUtilities.getProject(testInfo.getGenerationProject());
-		  IPath path = J2EEUtils.getWebContentPath(project,testInfo.getGenerationModule());
+		  IPath path = J2EEUtils.getWebContentPath(project);
 		  int index = testInfo.getJspFolder().lastIndexOf("/");
 		  String jsp = testInfo.getJspFolder().substring(index + 1);
 		  StringBuffer sb = new StringBuffer();	
@@ -93,8 +93,8 @@ public class GSTCLaunchCommand extends AbstractDataModelOperation
 	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();
+	IPath newPath = new Path(ServerUtils.getWebComponentURL(sampleProject, testInfo.getClientServerTypeID(),testInfo.getClientExistingServer()));
+	int count = J2EEUtils.getWebContentPath(sampleProject).segmentCount();
 	
 	newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(count).makeAbsolute());
 	StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
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
index f37bedb71..0222c1c44 100644
--- 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
@@ -53,9 +53,9 @@ public class AddModuleToServerCommand extends AbstractDataModelOperation
 	    {
 	    //Ensure the module is not a Java utility
 	    IProject iproject = ProjectUtilities.getProject(project);
-	    if (!J2EEUtils.isJavaComponent(iproject, module))
+	    if (!J2EEUtils.isJavaComponent(iproject))
 	    {      
-	      IModule imodule = ServerUtils.getModule(iproject, module);
+	      IModule imodule = ServerUtils.getModule(iproject);
 	      if (!ServerUtil.containsModule(server, imodule, null))
 	      {
 	        IModule[] imodules = new IModule[]{imodule};
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
index 3ed75056b..0b038bcc5 100644
--- 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
@@ -42,12 +42,12 @@ public class AssociateModuleWithEARCommand extends AbstractDataModelOperation
 		
 		// associate modules if not already associated
 		if (moduleProject!=null && earProject!=null) {
-			if (!J2EEUtils.isComponentAssociated(earProject, ear_, moduleProject, module_))
-				J2EEUtils.associateComponentToEAR(moduleProject, module_, earProject, ear_);
+			if (!J2EEUtils.isComponentAssociated(earProject, moduleProject))
+				J2EEUtils.associateComponentToEAR(moduleProject, earProject);
 		}
 		
 		// ensure modules are associated otherwise report error
-		if (!J2EEUtils.isComponentAssociated(earProject, ear_, moduleProject, module_)){
+		if (!J2EEUtils.isComponentAssociated(earProject, moduleProject)){
 			status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_UNABLE_TO_ASSOCIATE", new String[]{module_, ear_}) );
 			if (env!=null)
 				env.getStatusHandler().reportError(status);
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
index c361ff91e..098d71096 100644
--- 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
@@ -45,16 +45,13 @@ public class ManageServerStartUpCommand extends AbstractDataModelOperation
 	private IServer sampleExistingServer_;
 	
 	private boolean isWebProjectStartupRequested_;
-	private String  moduleName_;
 
 	/**
 	 * Default CTOR;
 	 */
-	public ManageServerStartUpCommand( String moduleName ) {
+	public ManageServerStartUpCommand( ) {
 		String pluginId = "org.eclipse.jst.ws.consumption";
 		msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-		
-		moduleName_ = moduleName;
 	}
 	
 	/**
@@ -68,7 +65,7 @@ public class ManageServerStartUpCommand extends AbstractDataModelOperation
 	 
 	    if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){
 	    	//System.out.println("Calling service server start: "+serviceProject_+"  "+serviceServerTypeId_);
-	    	StartProjectCommand spc = new StartProjectCommand( moduleName_ );
+	    	StartProjectCommand spc = new StartProjectCommand( );
 	    	spc.setServiceProject(serviceProject_);
 	    	spc.setServiceServerTypeID(serviceServerTypeId_);
 	    	spc.setServiceExistingServer(serviceExistingServer_);
@@ -79,7 +76,7 @@ public class ManageServerStartUpCommand extends AbstractDataModelOperation
 	    
 	    if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){
 	    	//System.out.println("Calling client server start: "+sampleProject_+"  "+sampleExistingServer__);
-	    	StartProjectCommand spc = new StartProjectCommand( moduleName_ );
+	    	StartProjectCommand spc = new StartProjectCommand( );
 	    	spc.setSampleProject(sampleProject_);
 	    	spc.setSampleServerTypeID(sampleServerTypeId_);
 	    	spc.setSampleExistingServer(sampleExistingServer_);
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
index c00b0dc76..15f768fee 100644
--- 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
@@ -63,7 +63,7 @@ public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
     }
 	
     IProject iProject = (IProject)ResourceUtils.findResource(project);
-    IServer instance = ServerUtils.getServerForModule(ResourceUtils.getModule(iProject), serverTypeID, existingServer, true, monitor);
+    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(iProject), serverTypeID, existingServer, true, monitor);
     if (instance == null)
     {
       status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
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
index e39ef4d3c..c750a49bf 100644
--- 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
@@ -40,17 +40,15 @@ 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 ) {
+public StartProjectCommand( ) {
 	String pluginId = "org.eclipse.jst.ws.consumption";
 	msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-	moduleName_ = moduleName;
 }
 
 /**
@@ -85,7 +83,7 @@ public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
       env.getStatusHandler().reportError(status);
       return status;
     }	
-    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project, moduleName_), serverTypeID, server, true, monitor );
+    IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project), serverTypeID, server, true, monitor );
     if (instance == null)
     {
       status = StatusUtils.errorStatus( msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND") );
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
index 10650e5d7..e8da47621 100644
--- 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
@@ -41,7 +41,7 @@ public final class MappingUtils
   {
     IPath wsdlFolder=null;
 //  	IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
-  	IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project, componentName);
+  	IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project);
   	if (webModuleServerRoot != null )
   		wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER);
     return wsdlFolder;
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
index ae66f726e..1ca30835b 100644
--- 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
@@ -351,7 +351,7 @@ public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor
         rskejb */
         if (serviceComponentName!=null && serviceComponentName.length()>0)
         {
-          String compTypeId = J2EEUtils.getComponentTypeId(serviceProj, serviceComponentName);
+          String compTypeId = J2EEUtils.getComponentTypeId(serviceProj);
           if (!compTypeId.equals(projectWidget_.getComponentType()))
           {
         	//Construct the error message
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
index 31b1c55a1..ea814cb0f 100644
--- 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
@@ -168,15 +168,15 @@ public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntime
       boolean isValidComponentType = false;
       if (componentName != null && componentName.length()>0)
       {
-        isValidComponentType = J2EEUtils.isWebComponent(project, componentName) ||
-                                     J2EEUtils.isEJBComponent(project, componentName);
+        isValidComponentType = J2EEUtils.isWebComponent(project) ||
+                                     J2EEUtils.isEJBComponent(project);
       }
       if (isValidComponentType)
       {
         //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
         
         //Get the J2EE level
-        int versionId = J2EEUtils.getJ2EEVersion(project, componentName);
+        int versionId = J2EEUtils.getJ2EEVersion(project);
         String versionString = String.valueOf(versionId);
         
         //Get the runtime target of the project
@@ -454,7 +454,7 @@ public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntime
     boolean earIsSet = false;
     if (initialProject != null && initialProject.exists())
     {
-      IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialProject, serviceComponentName_);
+      IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialProject);
       if (earComps.length > 0)
       {
         // Pick the first one
@@ -768,7 +768,7 @@ public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntime
   	{
   	  //Get the runtime target on the serviceProject
   	  IRuntime serviceTarget = ServerSelectionUtils.getRuntimeTarget(serviceProjectName);
-  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(serviceProject, serviceComponentName_));
+  	  String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(serviceProject));
   	  if (serviceTarget != null)
   	  {
   	  	if (!ServerUtils.isTargetValidForEAR(serviceTarget.getRuntimeType().getId(),j2eeVersion))
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
index 15b8f03c9..37649245e 100644
--- 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
@@ -65,38 +65,35 @@ public final class J2EEUtils {
 	/**
 	 * Returns an IVirtualComponent
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static IVirtualComponent getVirtualComponent(IProject project, String componentName){
-		return ComponentCore.createComponent(project, componentName);
+	public static IVirtualComponent getVirtualComponent(IProject project){
+		return ComponentCore.createComponent(project);
 	}
 	
 	/**
 	 * 
 	 * @param projectName
-	 * @param componentName
 	 * @return
 	 */
-	public static IVirtualComponent getVirtualComponent(String projectName, String componentName){
+	public static IVirtualComponent getVirtualComponent(String projectName){
 		IProject project = null;
 		if (projectName!=null && projectName.length() > 0 )
       project = ProjectUtilities.getProject(projectName);
 		
-		return ComponentCore.createComponent(project, componentName);
+		return ComponentCore.createComponent(project);
 	}
 	
 
 	/**
 	 * Returns the J2EE version
 	 * @param p project
-	 * @param component name
 	 * @return int
 	 */
-	public static int getJ2EEVersion(IProject p, String componentName){
+	public static int getJ2EEVersion(IProject p){
 		int j2eeVer = -1;
 		try {
-          IVirtualComponent vc = ComponentCore.createComponent(p, componentName);
+          IVirtualComponent vc = ComponentCore.createComponent(p);
           if (vc!=null){
             j2eeVer = getJ2EEVersion(vc);
           }
@@ -150,11 +147,10 @@ public final class J2EEUtils {
 	/**
 	 * Returns the J2EEVersion
 	 * @param p IProject
-	 * @param compName
 	 * @return String
 	 */
-	public static String getJ2EEVersionAsString(IProject p, String compName){
-		int j2eeVer = getJ2EEVersion(p, compName);
+	public static String getJ2EEVersionAsString(IProject p){
+		int j2eeVer = getJ2EEVersion(p);
 		if (j2eeVer!=-1){
 			return J2EEVersionUtil.getJ2EETextVersion(j2eeVer);
 		}
@@ -463,21 +459,20 @@ public final class J2EEUtils {
         else
           return false;
 		
-		return exists(project, componentName);
+		return exists(project);
 	}
 	
 	/**
 	 * 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) {
+	public static boolean exists(IProject project){
+		if (project!=null) {
             if (!project.exists())
               return false;
             
-			IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
+			IVirtualComponent vc = ComponentCore.createComponent(project);
 			return vc.exists();
 		}
 		else 
@@ -488,13 +483,12 @@ public final class J2EEUtils {
 	/**
 	 * 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){
+	public static IVirtualComponent[] getReferencingEARComponents(IProject project){
 		List ears = new ArrayList();
 		try{
-			IVirtualComponent targetVC = ComponentCore.createComponent(project, componentName);
+			IVirtualComponent targetVC = ComponentCore.createComponent(project);
 			
 			IVirtualComponent[] earVC = getAllEARComponents();
 			for (int i=0; i<earVC.length;i++) {
@@ -517,14 +511,13 @@ public final class J2EEUtils {
 	/**
 	 * Returns the EJB Components referenced by the ear
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project, String earComponentName){
+	public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project){
 
 		List ejbComps = new ArrayList();
 		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
+			IVirtualComponent vc = ComponentCore.createComponent(project);
 			IVirtualReference[] refs = vc.getReferences();
 			for (int i=0;i<refs.length;i++){
 				if (isEJBComponent(refs[i].getReferencedComponent())){
@@ -828,14 +821,13 @@ public final class J2EEUtils {
 	/**
 	 * 
 	 * @param project
-	 * @param earComponentName
 	 * @return
 	 */
-	public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project, String earComponentName){
+	public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project){
 		 
 		List ejbComps = new ArrayList();
 		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
+			IVirtualComponent vc = ComponentCore.createComponent(project);
 			IVirtualReference[] refs = vc.getReferences();
 			for (int i=0; i<refs.length;i++) {
 				if (isEJB20Component(refs[i].getReferencedComponent()))
@@ -881,13 +873,13 @@ public final class J2EEUtils {
 
 	/**
 	 * 
-	 * @param earComponents
+	 * @param project
 	 * @return
 	 */
-	public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project, String earComponentName){
+	public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project){
 		List webComps = new ArrayList();
 		try{
-			IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
+			IVirtualComponent vc = ComponentCore.createComponent(project);
 			IVirtualReference[] refs = vc.getReferences();
 			for (int i=0; i<refs.length;i++) {
 				if (isWebComponent(refs[i].getReferencedComponent()))
@@ -908,19 +900,18 @@ public final class J2EEUtils {
 	 * @return
 	 */
 	public static boolean isEJB20Component(IVirtualComponent ejbComponent){
-		return isEJB20Component(ejbComponent.getProject(), ejbComponent.getName());
+		return isEJB20Component(ejbComponent.getProject());
 	}
 	
 	/**
 	 * 
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static boolean isEJB20Component(IProject project, String componentName){
+	public static boolean isEJB20Component(IProject project){
 		boolean isEJB = false;
 		try {
-      IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
+      IVirtualComponent vc = ComponentCore.createComponent(project);
 		  if (EJBArtifactEdit.isValidEJBModule(vc)) {
 			  EJBArtifactEdit  ejbEdit = null;
 			  try {
@@ -945,15 +936,12 @@ public final class J2EEUtils {
 	/**
 	 * 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);
+	public static boolean isComponentAssociated(IProject earProject, IProject project) {
+		IVirtualComponent vc1 = ComponentCore.createComponent(earProject);
+		IVirtualComponent vc2 = ComponentCore.createComponent(project);
 		return isComponentAssociated(vc1, vc2);
 	}
 	
@@ -981,12 +969,9 @@ public final class J2EEUtils {
 	/**
 	 * 
 	 * @param project
-	 * @param componentName
 	 * @param earProject
-	 * @param earComponentName
 	 */
-	public static void associateComponentToEAR(IProject project, String componentName,
-							IProject earProject, String earComponentName) {
+	public static void associateComponentToEAR(IProject project, IProject earProject) {
 		
         IDataModel addComponentToEARDataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
 		IVirtualComponent earComp = ComponentCore.createComponent(earProject);
@@ -1009,12 +994,11 @@ public final class J2EEUtils {
 	
 	/**
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static IPath getWebInfPath(IProject project, String componentName){
+	public static IPath getWebInfPath(IProject project){
 		
-		IVirtualComponent component = ComponentCore.createComponent(project, componentName);
+		IVirtualComponent component = ComponentCore.createComponent(project);
 		IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
 		IPath modulePath = webInfDir.getWorkspaceRelativePath();
 	
@@ -1044,11 +1028,10 @@ public final class J2EEUtils {
 	
 	/**
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static IPath getWebContentPath(IProject project, String componentName){
-		IVirtualComponent component = ComponentCore.createComponent(project, componentName);
+	public static IPath getWebContentPath(IProject project){
+		IVirtualComponent component = ComponentCore.createComponent(project);
 		IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
 		return modulePath;
 	}
@@ -1072,12 +1055,11 @@ public final class J2EEUtils {
 	
 	/**
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static IContainer getWebContentContainer(IProject project, String componentName){
+	public static IContainer getWebContentContainer(IProject project){
 		IContainer container = null;
-		IPath modulePath = getWebContentPath(project, componentName);
+		IPath modulePath = getWebContentPath(project);
 		IResource res = ResourceUtils.findResource(modulePath);
 		if (res instanceof IContainer){
 		  container = (IContainer)res;
@@ -1121,11 +1103,10 @@ public final class J2EEUtils {
 	/**
 	 * 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);
+	public static boolean isEJBComponent(IProject project) {
+    IVirtualComponent vc = ComponentCore.createComponent(project);
     return isEJBComponent(vc);
 	}
 
@@ -1150,9 +1131,9 @@ public final class J2EEUtils {
     return false;
 	}	
 	
-  public static String getComponentTypeId(IProject project, String componentName)
+  public static String getComponentTypeId(IProject project)
   {
-    IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
+    IVirtualComponent vc = ComponentCore.createComponent(project);
     return vc.getComponentTypeId();
   }
   
@@ -1219,44 +1200,40 @@ public final class J2EEUtils {
 	/**
 	 * 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);
+	public static boolean isJavaComponent(IProject project) {
+	IVirtualComponent vc = ComponentCore.createComponent(project);
 	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);
+	public static boolean isWebComponent(IProject project) {
+	IVirtualComponent vc = ComponentCore.createComponent(project);
 	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);
+	public static boolean isAppClientComponent(IProject project) {
+	IVirtualComponent vc = ComponentCore.createComponent(project);
 	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);
+	public static boolean isEARComponent(IProject project){
+	IVirtualComponent vc = ComponentCore.createComponent(project);
 	return isEARComponent(vc);
 	}
 	
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
index 6a4b6efc1..15616fb5f 100644
--- 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
@@ -288,14 +288,11 @@ public final class ResourceUtils {
 	 */
 	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 ComponentCore.createComponent(project);
 				}
-			}
 		}
 		return null;
 	}
@@ -520,11 +517,10 @@ public final class ResourceUtils {
 	 * 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);
+	public static String getComponentType(IProject project){
+		IVirtualComponent comp = ComponentCore.createComponent(project);
 		return getComponentType(comp);
 	}
 	
@@ -599,7 +595,7 @@ public final class ResourceUtils {
 
 		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
@@ -617,6 +613,7 @@ public final class ResourceUtils {
 	 *         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);
@@ -639,15 +636,15 @@ public final class ResourceUtils {
 		
 		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);
+	public static IPath getJavaSourceLocation(IProject project){
+		IVirtualComponent component = ComponentCore.createComponent(project);
 		return getJavaSourceLocation(component);			
 	}
 	
@@ -776,13 +773,12 @@ public final class ResourceUtils {
 	/**
 	 * 
 	 * @param project
-	 * @param componentName
 	 * @return
 	 */
-	public static IFolder getWebComponentServerRoot(IProject project, String componentName){
+	public static IFolder getWebComponentServerRoot(IProject project){
 		
       IFolder webModuleServerRoot = null;
-      IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
+      IVirtualComponent vc = ComponentCore.createComponent(project);
       if (vc.exists())
         webModuleServerRoot = J2EEUtils.getOutputContainerRoot(vc);
 
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
index 3c36524f3..d362d858c 100644
--- 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
@@ -353,7 +353,7 @@ public final class ServerUtils {
 		String[] serverIds = null;
 
 		if (project != null) {
-			IServer[] servers = ServerUtil.getServersByModule(getModule(project, component.getName()), null);
+			IServer[] servers = ServerUtil.getServersByModule(getModule(project), null);
 			if (servers != null) {
 				serverIds = new String[servers.length];
 
@@ -390,18 +390,12 @@ public final class ServerUtils {
 		return (String[]) serverIds.toArray(new String[serverIds.size()]);
 	}
 
-	public static IModule getModule(IProject project, String componentName) {
+	public static IModule getModule(IProject project) {
 		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;
-			}
+		if (modules!=null && modules.length!=0) {
+			return modules[0];
 		}
-
-		return moduleFound;
+		return null;
 	}
   
 	/**
@@ -414,9 +408,9 @@ public final class ServerUtils {
 	 * @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) {
+	public static String getWebComponentURL(IProject project) {
 		String webProjectURL = null;
-		IModule module = getModule(project, componentName);
+		IModule module = getModule(project);
 		if (module != null) {
 			IServer serverInstance = getServerForModule(module);
 			if (serverInstance != null) {
@@ -469,10 +463,10 @@ public final class ServerUtils {
 	 *         nature or has no association to a server instance.
 	 */
 	public static String getWebComponentURL(IProject project,
-			String componentName, String serverFactoryId, IServer server) {
+			String serverFactoryId, IServer server) {
 
 		String webProjectURL = null;
-		IModule module = getModule(project, componentName);
+		IModule module = getModule(project);
 		if (module != null) {
 			IServer serverInstance = ServerUtils.getServerForModule(module, serverFactoryId, server, true, new NullProgressMonitor());
 			if (serverInstance != null) {
@@ -489,8 +483,8 @@ public final class ServerUtils {
 		return webProjectURL;
 	}
 
-	public static String getEncodedWebComponentURL(IProject project, String componentName) {
-		String url = getWebComponentURL(project, componentName);
+	public static String getEncodedWebComponentURL(IProject project) {
+		String url = getWebComponentURL(project);
 		if (url != null) {
 			int index = url.lastIndexOf('/');
 			if (index != -1) {
@@ -520,7 +514,7 @@ public final class ServerUtils {
 
 	public static IServer getDefaultExistingServer(IVirtualComponent component) {
 		IProject project = component.getProject();
-		IModule module = getModule(project, component.getName());
+		IModule module = getModule(project);
 		IServer preferredServer = ServerCore.getDefaultServer(module);
 		if (preferredServer != null)
 			return preferredServer;
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java
index 611b32eb2..2f24307da 100644
--- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java
+++ b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java
@@ -10,7 +10,6 @@ import org.eclipse.wst.server.core.IServer;
 
 public class TestInfo {
   private String jspFolder;
-  private String generationModule;
   private String generationProject;
   private String serviceProject;
   private String proxyBean;
@@ -54,18 +53,6 @@ public class TestInfo {
   }
   
   /**
-   * This is the Module the user has chosen to generate artifacts to  
-   * @param generationModule
-   */
-   public void setGenerationModule(String generationModule){
-     this.generationModule = generationModule;	  
-   }
-   
-   public String getGenerationModule(){
-     return generationModule;	  
-   }
-  
-  /**
   * The proxy bean was generated by us this is the name of it  
   * @param proxyBean
   */
author	kchan	2005-10-19 21:37:10 +0000
committer	kchan	2005-10-19 21:37:10 +0000
commit	226fd3d2b9319252f8300d18e2858615196fe88c (patch)
tree	59f2122a1a1125ea3bab018978997cc1a72e6b8d /bundles
parent	d6c65fdcc140494ae3000fcee4c443ea2a106f30 (diff)
download	webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.tar.gz webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.tar.xz webtools.webservices-226fd3d2b9319252f8300d18e2858615196fe88c.zip