Attachment #84671 for bug #200193

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

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




    return Status.OK_STATUS;
  }
  
  public void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
  {
    if (J2EEUtils.isWebComponent(project))
    {

    }
  }
  
  public void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
  {
	  try {
		  IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
		  migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
		  migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
		  migrationdm.getDefaultOperation().execute(monitor, null);
 
 

  }

  
  public void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
  {
    IJavaProject javaProject = JavaCore.create(referencingProject);
    if (javaProject != null)

Lines 19-35 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java (+51 lines)
19		19
20	package org.eclipse.jst.ws.internal.creation.ui.extension;	20	package org.eclipse.jst.ws.internal.creation.ui.extension;
21		21
		22	import java.io.IOException;
		23
22	import org.eclipse.core.resources.IProject;	24	import org.eclipse.core.resources.IProject;
23	import org.eclipse.core.resources.ResourcesPlugin;	25	import org.eclipse.core.resources.ResourcesPlugin;
		26	import org.eclipse.core.runtime.CoreException;
24	import org.eclipse.core.runtime.IAdaptable;	27	import org.eclipse.core.runtime.IAdaptable;
25	import org.eclipse.core.runtime.IProgressMonitor;	28	import org.eclipse.core.runtime.IProgressMonitor;
26	import org.eclipse.core.runtime.IStatus;	29	import org.eclipse.core.runtime.IStatus;
27	import org.eclipse.core.runtime.Status;	30	import org.eclipse.core.runtime.Status;
		31	import org.eclipse.jdt.core.JavaModelException;
28	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;	32	import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand;
29	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;	33	import org.eclipse.jst.ws.internal.consumption.common.FacetUtils;
30	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;	34	import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
		35	import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
		36	import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.AddModuleDependenciesCommand;
31	import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;	37	import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2;
32	import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;	38	import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
		39	import org.eclipse.osgi.util.NLS;
		40	import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
33	import org.eclipse.wst.command.internal.env.core.context.ResourceContext;	41	import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
34	import org.eclipse.wst.common.environment.IEnvironment;	42	import org.eclipse.wst.common.environment.IEnvironment;
35	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;	43	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
Lines 39-44 Link Here
39	import org.eclipse.wst.ws.internal.wsrt.IWebService;	47	import org.eclipse.wst.ws.internal.wsrt.IWebService;
40	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;	48	import org.eclipse.wst.ws.internal.wsrt.IWebServiceRuntime;
41	import org.eclipse.wst.ws.internal.wsrt.SimpleContext;	49	import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
		50	import org.eclipse.wst.ws.internal.wsrt.TestInfo;
42	import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;	51	import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo;
43	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;	52	import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario;
44	import org.eclipse.wst.ws.internal.wsrt.WebServiceState;	53	import org.eclipse.wst.ws.internal.wsrt.WebServiceState;
Lines 54-59 Link Here
54	private String moduleType_;	63	private String moduleType_;
55	private String earProject_;	64	private String earProject_;
56	private String ear_;	65	private String ear_;
		66	private IProject initialProject_;
57		67
58	private IWebService webService_;	68	private IWebService webService_;
59	private String j2eeLevel_;	69	private String j2eeLevel_;
Lines 159-164 Link Here
159	}	169	}
160	}	170	}
161	}	171	}
		172
		173	AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(new TestInfo());
		174	if(FacetUtils.isJavaProject(initialProject_))
		175	addMod.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
		176
		177
		178	try
		179	{
		180	String uri = initialProject_.getName() + ".jar";
		181	addMod.addJAROrModuleDependency(project, uri);
		182	} catch (CoreException ce)
		183	{
		184	String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
		185	IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
		186	environment.getStatusHandler().reportError(errorStatus);
		187	} catch (IOException ioe)
		188	{
		189	String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
		190	IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
		191	environment.getStatusHandler().reportError(errorStatus);
		192	}
		193
		194	try {
		195	addMod.addBuildPath(project, initialProject_);
		196	} catch (JavaModelException jme) {
		197	// Do nothing in this catch block. The worst that
		198	// will happen is that the sample Web project
		199	// will show some compile errors. The sample will
		200	// likely still launch successfully on the server
		201	// and the user will be able to use it.
		202	}
162	}	203	}
163	return status;	204	return status;
164		205
Lines 280-285 Link Here
280	{	321	{
281	client_ = genProxy;	322	client_ = genProxy;
282	}	323	}
		324
		325	public void setInitialProject(IProject initialProject)
		326	{
		327	initialProject_ = initialProject;
		328	}
		329
		330	public IProject getInitialProject()
		331	{
		332	return initialProject_;
		333	}
283		334
284		335
285	}	336	}

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





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 2-8 Link Here

(-)META-INF/MANIFEST.MF (-2 / +3 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 44-48 Link Here
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 295-301 Link Here

(-)src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java (-1 / +9 lines)
295	{	295	{
296	//Choose an existing server the module is already associated with if possible	296	//Choose an existing server the module is already associated with if possible
297	IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);	297	IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
298	IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);	298	IServer[] configuredServers = null;
		299	if(serviceProject.exists())
		300	configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
		301
299	if (configuredServers!=null && configuredServers.length>0)	302	if (configuredServers!=null && configuredServers.length>0)
300	{	303	{
301	serviceIds_.setServerId(configuredServers[0].getServerType().getId());	304	serviceIds_.setServerId(configuredServers[0].getServerType().getId());
Lines 552-557 Link Here
552	initialProject_ = initialProject;	555	initialProject_ = initialProject;
553	}	556	}
554		557
		558	public IProject getInitialProject()
		559	{
		560	return initialProject_;
		561	}
		562
555	public void setInitialComponentName(String name)	563	public void setInitialComponentName(String name)
556	{	564	{
557	//TODO This method and any mappings to it	565	//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 237-243 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java (-3 / +4 lines)
237	return Status.OK_STATUS;	237	return Status.OK_STATUS;
238	}	238	}
239		239
240	private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException	240	public void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
241	{	241	{
242	if (J2EEUtils.isWebComponent(project))	242	if (J2EEUtils.isWebComponent(project))
243	{	243	{
Lines 247-257 Link Here
247	}	247	}
248	}	248	}
249		249
250	private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)	250	public void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
251	{	251	{
252	try {	252	try {
253	IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());	253	IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
254	migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());	254	migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
		255	migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
255	migrationdm.getDefaultOperation().execute(monitor, null);	256	migrationdm.getDefaultOperation().execute(monitor, null);
256		257
257		258
Lines 272-278 Link Here
272	}	273	}
273		274
274		275
275	private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException	276	public void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
276	{	277	{
277	IJavaProject javaProject = JavaCore.create(referencingProject);	278	IJavaProject javaProject = JavaCore.create(referencingProject);
278	if (javaProject != null)	279	if (javaProject != null)