Attachment #85138 for bug #200193

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 12-17 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java (-3 / +11 lines)
12	* 20060324 122799 rsinha@ca.ibm.com - Rupam Kuehner	12	* 20060324 122799 rsinha@ca.ibm.com - Rupam Kuehner
13	* 20060503 138478 rsinha@ca.ibm.com - Rupam Kuehner	13	* 20060503 138478 rsinha@ca.ibm.com - Rupam Kuehner
14	* 20060510 141115 rsinha@ca.ibm.com - Rupam Kuehner	14	* 20060510 141115 rsinha@ca.ibm.com - Rupam Kuehner
		15	* 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
15	*******************************************************************************/	16	*******************************************************************************/
16	package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;	17	package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
17		18
Lines 71-76 Link Here
71	this.testInfo = testInfo;	72	this.testInfo = testInfo;
72	}	73	}
73		74
		75	// Defect 200193 - This default constructor is put as a temporary fix for allowing other
		76	// code to have access to methods in this command without calling execute().
		77	public AddModuleDependenciesCommand()
		78	{
		79	}
		80
74	/**	81	/**
75	* Execute WebServerDefaultingTask Set the default server name and id given a	82	* Execute WebServerDefaultingTask Set the default server name and id given a
76	* deployable.	83	* deployable.
Lines 237-243 Link Here
237	return Status.OK_STATUS;	244	return Status.OK_STATUS;
238	}	245	}
239		246
240	private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException	247	public void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
241	{	248	{
242	if (J2EEUtils.isWebComponent(project))	249	if (J2EEUtils.isWebComponent(project))
243	{	250	{
Lines 247-257 Link Here
247	}	254	}
248	}	255	}
249		256
250	private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)	257	public void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
251	{	258	{
252	try {	259	try {
253	IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());	260	IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
254	migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());	261	migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
		262	migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
255	migrationdm.getDefaultOperation().execute(monitor, null);	263	migrationdm.getDefaultOperation().execute(monitor, null);
256		264
257		265
Lines 272-278 Link Here
272	}	280	}
273		281
274		282
275	private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException	283	public void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
276	{	284	{
277	IJavaProject javaProject = JavaCore.create(referencingProject);	285	IJavaProject javaProject = JavaCore.create(referencingProject);
278	if (javaProject != null)	286	if (javaProject != null)

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %PLUGIN_NAME	3	Bundle-Name: %PLUGIN_NAME
4	Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true	4	Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
5	Bundle-Version: 1.0.106.qualifier	5	Bundle-Version: 1.0.107.qualifier
6	Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin	6	Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
7	Bundle-Vendor: %PLUGIN_PROVIDER	7	Bundle-Vendor: %PLUGIN_PROVIDER
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin




 * 20060131 121071   rsinha@ca.ibm.com - Rupam Kuehner     
 * 20060221   119111 rsinha@ca.ibm.com - Rupam Kuehner
 * 20060331   128827 kathy@ca.ibm.com - Kathy Chan
 * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
 *******************************************************************************/

package org.eclipse.jst.ws.internal.creation.ui.extension;

		
		//Mappings from framework to framework commands
  	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
	registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
  	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
	registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
  	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
  	registry.addMapping( PreServiceDevelopCommand.class, "InitialProject", PreServiceAssembleCommand.class );
  	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );
		
    registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );

Lines 15-35 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java (+44 lines)
15	* 20060529 141422 kathy@ca.ibm.com - Kathy Chan	15	* 20060529 141422 kathy@ca.ibm.com - Kathy Chan
16	* 20070123 167487 makandre@ca.ibm.com - Andrew Mak	16	* 20070123 167487 makandre@ca.ibm.com - Andrew Mak
17	* 20070403 173654 kathy@ca.ibm.com - Kathy Chan	17	* 20070403 173654 kathy@ca.ibm.com - Kathy Chan
		18	* 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
18	*******************************************************************************/	19	*******************************************************************************/
19		20
20	package org.eclipse.jst.ws.internal.creation.ui.extension;	21	package org.eclipse.jst.ws.internal.creation.ui.extension;
21		22
		23	import java.io.IOException;
		24
22	import org.eclipse.core.resources.IProject;	25	import org.eclipse.core.resources.IProject;
23	import org.eclipse.core.resources.ResourcesPlugin;	26	import org.eclipse.core.resources.ResourcesPlugin;
		27	import org.eclipse.core.runtime.CoreException;
24	import org.eclipse.core.runtime.IAdaptable;	28	import org.eclipse.core.runtime.IAdaptable;
25	import org.eclipse.core.runtime.IProgressMonitor;	29	import org.eclipse.core.runtime.IProgressMonitor;
26	import org.eclipse.core.runtime.IStatus;	30	import org.eclipse.core.runtime.IStatus;
27	import org.eclipse.core.runtime.Status;	31	import org.eclipse.core.runtime.Status;
		32	import org.eclipse.jdt.core.JavaModelException;
28	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;	33	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
29	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;	34	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
30	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;	35	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
		36	import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
		37	import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
31	import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;	38	import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
32	import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;	39	import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
		40	import org.eclipse.osgi.util.NLS;
		41	import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
33	import org.eclipse.wst.command.internal.env.core.context.ResourceContext;	42	import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
34	import org.eclipse.wst.common.environment.IEnvironment;	43	import org.eclipse.wst.common.environment.IEnvironment;
35	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;	44	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
Lines 39-44 Link Here
39	import org.eclipse.wst.ws.internal.wsrt.IWebService;	48	import org.eclipse.wst.ws.internal.wsrt.IWebService;
40	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;	49	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
41	import org.eclipse.wst.ws.internal.wsrt.SimpleContext;	50	import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
		51	import org.eclipse.wst.ws.internal.wsrt.TestInfo;
42	import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;	52	import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
43	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;	53	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
44	import org.eclipse.wst.ws.internal.wsrt.WebServiceState;	54	import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
Lines 54-59 Link Here
54	private String moduleType_;	64	private String moduleType_;
55	private String earProject_;	65	private String earProject_;
56	private String ear_;	66	private String ear_;
		67	private IProject initialProject_;
57		68
58	private IWebService webService_;	69	private IWebService webService_;
59	private String j2eeLevel_;	70	private String j2eeLevel_;
Lines 159-164 Link Here
159	}	170	}
160	}	171	}
161	}	172	}
		173
		174	// add the module dependency if the initial project is Java project
		175	if(FacetUtils.isJavaProject(initialProject_)){
		176	AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand();
		177	// Should not call AddModuleDependenciesCommand execute() method here since the
		178	// necessary testInfo is not set up. We are just using some methods here.
		179	addMod.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
		180	try
		181	{
		182	String uri = initialProject_.getName() + ".jar";
		183	addMod.addJAROrModuleDependency(project, uri);
		184	} catch (CoreException ce)
		185	{
		186	String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
		187	IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
		188	environment.getStatusHandler().reportError(errorStatus);
		189	} catch (IOException ioe)
		190	{
		191	String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
		192	IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
		193	environment.getStatusHandler().reportError(errorStatus);
		194	}
		195	}
162	}	196	}
163	return status;	197	return status;
164		198
Lines 280-285 Link Here
280	{	314	{
281	client_ = genProxy;	315	client_ = genProxy;
282	}	316	}
		317
		318	public void setInitialProject(IProject initialProject)
		319	{
		320	initialProject_ = initialProject;
		321	}
		322
		323	public IProject getInitialProject()
		324	{
		325	return initialProject_;
		326	}
283		327
284		328
285	}	329	}




 * 20060330 128827   kathy@ca.ibm.com - Kathy Chan
 * 20060524   141925 kathy@ca.ibm.com - Kathy Chan
 * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
 * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
 *******************************************************************************/

package org.eclipse.jst.ws.internal.creation.ui.extension;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;

import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
import org.eclipse.jst.ws.internal.consumption.command.common.SkeletonMergeCommand;
import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
import org.eclipse.wst.common.environment.IEnvironment;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.ws.internal.wsrt.IContext;
import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.TestInfo;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;

public class PreServiceAssembleCommand extends AbstractDataModelOperation 
{
	private IWebService		webService_;
	private String			project_;
	private String          module_;
	private String			earProject_;
	private String          ear_;
	private IContext        context_;
	private IProject		initialProject_;

  public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
  {

			  environment.getStatusHandler().reportError(status);		  
		  }			

		  // add the module dependency if the initial project is Java project
		  if(FacetUtils.isJavaProject(initialProject_)) {
			  AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(); 
			  // Should not call AddModuleDependenciesCommand execute() method here since the 
			  // necessary testInfo is not set up.  We are just using some methods here.
			  IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
			  addMod.addJavaProjectAsUtilityJar(initialProject_, earProject, monitor);
		  }		  
		  
	  }
	  return status;	  
  }
	
  public void setInitialProject(IProject initialProject)
  {
	  initialProject_ = initialProject;  
  }	
  
  public IProject getInitialProject()
  {
	  return initialProject_;  
  }	
  
  
  public void setProject( String project )
  {
	  project_ = project;

Lines 20-25 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java (-1 / +10 lines)
20	* 20060525 143843 joan@ca.ibm.com - Joan Haggarty	20	* 20060525 143843 joan@ca.ibm.com - Joan Haggarty
21	* 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime	21	* 20060905 156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
22	* 20070319 159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks	22	* 20070319 159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks
		23	* 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
23	*******************************************************************************/	24	*******************************************************************************/
24	package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;	25	package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
25		26
Lines 295-301 Link Here
295	{	296	{
296	//Choose an existing server the module is already associated with if possible	297	//Choose an existing server the module is already associated with if possible
297	IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);	298	IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
298	IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);	299	IServer[] configuredServers = null;
		300	if(serviceProject.exists())
		301	configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
		302
299	if (configuredServers!=null && configuredServers.length>0)	303	if (configuredServers!=null && configuredServers.length>0)
300	{	304	{
301	serviceIds_.setServerId(configuredServers[0].getServerType().getId());	305	serviceIds_.setServerId(configuredServers[0].getServerType().getId());
Lines 552-557 Link Here
552	initialProject_ = initialProject;	556	initialProject_ = initialProject;
553	}	557	}
554		558
		559	public IProject getInitialProject()
		560	{
		561	return initialProject_;
		562	}
		563
555	public void setInitialComponentName(String name)	564	public void setInitialComponentName(String name)
556	{	565	{
557	//TODO This method and any mappings to it	566	//TODO This method and any mappings to it

Lines 2-8 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
2	Bundle-ManifestVersion: 2	2	Bundle-ManifestVersion: 2
3	Bundle-Name: %PLUGIN_NAME	3	Bundle-Name: %PLUGIN_NAME
4	Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true	4	Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
5	Bundle-Version: 1.0.105.qualifier	5	Bundle-Version: 1.0.106.qualifier
6	Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin	6	Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
7	Bundle-Vendor: %PLUGIN_PROVIDER	7	Bundle-Vendor: %PLUGIN_PROVIDER
8	Bundle-Localization: plugin	8	Bundle-Localization: plugin

Lines 26-31 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java (+2 lines)
26	* 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor	26	* 20060810 135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
27	* 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime	27	* 20060821 153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
28	* 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk	28	* 20060825 155114 pmoogk@ca.ibm.com - Peter Moogk
		29	* 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
29	*******************************************************************************/	30	*******************************************************************************/
30	package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;	31	package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
31		32
Lines 191-196 Link Here
191	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);	192	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);
192	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);	193	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);
193	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh	194	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh
		195	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
194		196
195	// After ServerWizardWidget	197	// After ServerWizardWidget
196	dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);	198	dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);

Return to bug 200193

Lines 12-17 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java (-2 / +4 lines)
12	* 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner	12	* 20060131 121071 rsinha@ca.ibm.com - Rupam Kuehner
13	* 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner	13	* 20060221 119111 rsinha@ca.ibm.com - Rupam Kuehner
14	* 20060331 128827 kathy@ca.ibm.com - Kathy Chan	14	* 20060331 128827 kathy@ca.ibm.com - Kathy Chan
		15	* 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
15	*******************************************************************************/	16	*******************************************************************************/
16		17
17	package org.eclipse.jst.ws.internal.creation.ui.extension;	18	package org.eclipse.jst.ws.internal.creation.ui.extension;
Lines 98-107 Link Here
98		99
99	//Mappings from framework to framework commands	100	//Mappings from framework to framework commands
100	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );	101	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
101	registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );	102	registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
102	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );	103	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
103	registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );	104	registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
104	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );	105	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
		106	registry.addMapping( PreServiceDevelopCommand.class, "InitialProject", PreServiceAssembleCommand.class );
105	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );	107	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );
106		108
107	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );	109	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );

Lines 13-22 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java (-6 / +33 lines)
13	* 20060330 128827 kathy@ca.ibm.com - Kathy Chan	13	* 20060330 128827 kathy@ca.ibm.com - Kathy Chan
14	* 20060524 141925 kathy@ca.ibm.com - Kathy Chan	14	* 20060524 141925 kathy@ca.ibm.com - Kathy Chan
15	* 20060529 141422 kathy@ca.ibm.com - Kathy Chan	15	* 20060529 141422 kathy@ca.ibm.com - Kathy Chan
		16	* 20071212 200193 gilberta@ca.ibm.com - Gilbert Andrews
16	*******************************************************************************/	17	*******************************************************************************/
17		18
18	package org.eclipse.jst.ws.internal.creation.ui.extension;	19	package org.eclipse.jst.ws.internal.creation.ui.extension;
19		20
		21	import org.eclipse.core.resources.IProject;
		22	import org.eclipse.core.resources.ResourcesPlugin;
20	import org.eclipse.core.runtime.IAdaptable;	23	import org.eclipse.core.runtime.IAdaptable;
21	import org.eclipse.core.runtime.IProgressMonitor;	24	import org.eclipse.core.runtime.IProgressMonitor;
22	import org.eclipse.core.runtime.IStatus;	25	import org.eclipse.core.runtime.IStatus;
Lines 25-45 Link Here
25	import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;	28	import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
26	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;	29	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
27	import org.eclipse.jst.ws.internal.consumption.command.common.SkeletonMergeCommand;	30	import org.eclipse.jst.ws.internal.consumption.command.common.SkeletonMergeCommand;
		31	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
28	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;	32	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
		33	import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
29	import org.eclipse.wst.common.environment.IEnvironment;	34	import org.eclipse.wst.common.environment.IEnvironment;
30	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;	35	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
31	import org.eclipse.wst.ws.internal.wsrt.IContext;	36	import org.eclipse.wst.ws.internal.wsrt.IContext;
32	import org.eclipse.wst.ws.internal.wsrt.IWebService;	37	import org.eclipse.wst.ws.internal.wsrt.IWebService;
		38	import org.eclipse.wst.ws.internal.wsrt.TestInfo;
33	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;	39	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
34		40
35	public class PreServiceAssembleCommand extends AbstractDataModelOperation	41	public class PreServiceAssembleCommand extends AbstractDataModelOperation
36	{	42	{
37	private IWebService webService_;	43	private IWebService webService_;
38	private String project_;	44	private String project_;
39	private String module_;	45	private String module_;
40	private String earProject_;	46	private String earProject_;
41	private String ear_;	47	private String ear_;
42	private IContext context_;	48	private IContext context_;
		49	private IProject initialProject_;
43		50
44	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )	51	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
45	{	52	{
Lines 102-111 Link Here
102	environment.getStatusHandler().reportError(status);	109	environment.getStatusHandler().reportError(status);
103	}	110	}
104		111
		112	// add the module dependency if the initial project is Java project
		113	if(FacetUtils.isJavaProject(initialProject_)) {
		114	AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand();
		115	// Should not call AddModuleDependenciesCommand execute() method here since the
		116	// necessary testInfo is not set up. We are just using some methods here.
		117	IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
		118	addMod.addJavaProjectAsUtilityJar(initialProject_, earProject, monitor);
		119	}
		120
105	}	121	}
106	return status;	122	return status;
107	}	123	}
108		124
		125	public void setInitialProject(IProject initialProject)
		126	{
		127	initialProject_ = initialProject;
		128	}
		129
		130	public IProject getInitialProject()
		131	{
		132	return initialProject_;
		133	}
		134
		135
109	public void setProject( String project )	136	public void setProject( String project )
110	{	137	{
111	project_ = project;	138	project_ = project;