Attachment #84452 for bug #200193

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

Lines 44-48 Link Here

(-)META-INF/MANIFEST.MF (-1 / +2 lines)
44	org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",	44	org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
45	org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",	45	org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
46	org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)",	46	org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)",
47	org.eclipse.wst.ws.ui;bundle-version="[1.0.103,1.1.0)"	47	org.eclipse.wst.ws.ui;bundle-version="[1.0.103,1.1.0)",
		48	org.eclipse.emf.ecore
48	Eclipse-LazyStart: true	49	Eclipse-LazyStart: true

Lines 98-107 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java (-2 / +3 lines)
98		98
99	//Mappings from framework to framework commands	99	//Mappings from framework to framework commands
100	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );	100	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
101	registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );	101	registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
102	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );	102	registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
103	registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );	103	registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
104	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );	104	registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
		105	registry.addMapping( PreServiceDevelopCommand.class, "InitialProject", PreServiceAssembleCommand.class );
105	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );	106	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceAssembleCommand.class );
106		107
107	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );	108	registry.addMapping( PreServiceDevelopCommand.class, "Context", PreServiceDeployCommand.class );




import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
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.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
import org.eclipse.wst.command.internal.env.core.context.ResourceContext;

import org.eclipse.wst.ws.internal.wsrt.IWebService;
import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
import org.eclipse.wst.ws.internal.wsrt.TestInfo;
import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
import org.eclipse.wst.ws.internal.wsrt.WebServiceState;

  private String			moduleType_;
  private String			earProject_;
  private String            ear_;
  private IProject		initialProject_;
	
  private IWebService       webService_;
  private String            j2eeLevel_;

		        	}      
		        }
		  }
		  AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(new TestInfo()); 
		  if(FacetUtils.isJavaProject(initialProject_))
			  addMod.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
		  
	  
	  }
	  return status;


  {
    client_ = genProxy;  
  }	
  
  public void setInitialProject(IProject initialProject)
  {
	  initialProject_ = initialProject;  
  }	
  
  public IProject getInitialProject()
  {
	  return initialProject_;  
  }	
	

}





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
		  
		  AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(new TestInfo()); 
		  
		  //make sure the ear file has been created.
		  IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
		  if(FacetUtils.isJavaProject(initialProject_))
			  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 552-557 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java (+5 lines)
552	initialProject_ = initialProject;	552	initialProject_ = initialProject;
553	}	553	}
554		554
		555	public IProject getInitialProject()
		556	{
		557	return initialProject_;
		558	}
		559
555	public void setInitialComponentName(String name)	560	public void setInitialComponentName(String name)
556	{	561	{
557	//TODO This method and any mappings to it	562	//TODO This method and any mappings to it

Lines 191-196 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java (-1 / +3 lines)
191	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);	191	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);
192	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);	192	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);
193	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh	193	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh
		194	dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
194		195
195	// After ServerWizardWidget	196	// After ServerWizardWidget
196	dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);	197	dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
Lines 559-565 Link Here
559	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );	560	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
560	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );	561	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
561	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null );	562	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null );
562		563	dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceNeedEAR", PreServiceDevelopCommand.class);
		564
563	dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );	565	dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
564		566
565	// Map ClientExtensionDefaultingCommand	567	// Map ClientExtensionDefaultingCommand

Return to bug 200193

Lines 28-33 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java (+18 lines)
28	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;	28	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
29	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;	29	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
30	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;	30	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
		31	import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
31	import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;	32	import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
32	import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;	33	import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
33	import org.eclipse.wst.command.internal.env.core.context.ResourceContext;	34	import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
Lines 39-44 Link Here
39	import org.eclipse.wst.ws.internal.wsrt.IWebService;	40	import org.eclipse.wst.ws.internal.wsrt.IWebService;
40	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;	41	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
41	import org.eclipse.wst.ws.internal.wsrt.SimpleContext;	42	import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
		43	import org.eclipse.wst.ws.internal.wsrt.TestInfo;
42	import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;	44	import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
43	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;	45	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
44	import org.eclipse.wst.ws.internal.wsrt.WebServiceState;	46	import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
Lines 54-59 Link Here
54	private String moduleType_;	56	private String moduleType_;
55	private String earProject_;	57	private String earProject_;
56	private String ear_;	58	private String ear_;
		59	private IProject initialProject_;
57		60
58	private IWebService webService_;	61	private IWebService webService_;
59	private String j2eeLevel_;	62	private String j2eeLevel_;
Lines 159-164 Link Here
159	}	162	}
160	}	163	}
161	}	164	}
		165	AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(new TestInfo());
		166	if(FacetUtils.isJavaProject(initialProject_))
		167	addMod.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
		168
		169
162	}	170	}
163	return status;	171	return status;
164		172
Lines 280-285 Link Here
280	{	288	{
281	client_ = genProxy;	289	client_ = genProxy;
282	}	290	}
		291
		292	public void setInitialProject(IProject initialProject)
		293	{
		294	initialProject_ = initialProject;
		295	}
		296
		297	public IProject getInitialProject()
		298	{
		299	return initialProject_;
		300	}
283		301
284		302
285	}	303	}

Lines 17-22 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java (-6 / +34 lines)
17		17
18	package org.eclipse.jst.ws.internal.creation.ui.extension;	18	package org.eclipse.jst.ws.internal.creation.ui.extension;
19		19
		20	import org.eclipse.core.resources.IProject;
		21	import org.eclipse.core.resources.ResourcesPlugin;
20	import org.eclipse.core.runtime.IAdaptable;	22	import org.eclipse.core.runtime.IAdaptable;
21	import org.eclipse.core.runtime.IProgressMonitor;	23	import org.eclipse.core.runtime.IProgressMonitor;
22	import org.eclipse.core.runtime.IStatus;	24	import org.eclipse.core.runtime.IStatus;
Lines 25-45 Link Here
25	import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;	27	import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
26	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;	28	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
27	import org.eclipse.jst.ws.internal.consumption.command.common.SkeletonMergeCommand;	29	import org.eclipse.jst.ws.internal.consumption.command.common.SkeletonMergeCommand;
		30	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
28	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;	31	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
		32	import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
29	import org.eclipse.wst.common.environment.IEnvironment;	33	import org.eclipse.wst.common.environment.IEnvironment;
30	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;	34	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
31	import org.eclipse.wst.ws.internal.wsrt.IContext;	35	import org.eclipse.wst.ws.internal.wsrt.IContext;
32	import org.eclipse.wst.ws.internal.wsrt.IWebService;	36	import org.eclipse.wst.ws.internal.wsrt.IWebService;
		37	import org.eclipse.wst.ws.internal.wsrt.TestInfo;
33	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;	38	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
34		39
35	public class PreServiceAssembleCommand extends AbstractDataModelOperation	40	public class PreServiceAssembleCommand extends AbstractDataModelOperation
36	{	41	{
37	private IWebService webService_;	42	private IWebService webService_;
38	private String project_;	43	private String project_;
39	private String module_;	44	private String module_;
40	private String earProject_;	45	private String earProject_;
41	private String ear_;	46	private String ear_;
42	private IContext context_;	47	private IContext context_;
		48	private IProject initialProject_;
43		49
44	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )	50	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
45	{	51	{
Lines 102-111 Link Here
102	environment.getStatusHandler().reportError(status);	108	environment.getStatusHandler().reportError(status);
103	}	109	}
104		110
		111	// add the module
		112
		113	AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(new TestInfo());
		114
		115	//make sure the ear file has been created.
		116	IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
		117	if(FacetUtils.isJavaProject(initialProject_))
		118	addMod.addJavaProjectAsUtilityJar(initialProject_, earProject, monitor);
		119
		120
		121
105	}	122	}
106	return status;	123	return status;
107	}	124	}
108		125
		126	public void setInitialProject(IProject initialProject)
		127	{
		128	initialProject_ = initialProject;
		129	}
		130
		131	public IProject getInitialProject()
		132	{
		133	return initialProject_;
		134	}
		135
		136
109	public void setProject( String project )	137	public void setProject( String project )
110	{	138	{
111	project_ = project;	139	project_ = project;