[113162] Remove module from signature.

10 files changed, 36 insertions, 59 deletions

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());