Attachment 84452 Details for Bug 200193 – creation

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

[patch] creation

creation.ui.txt (text/plain), 11.37 KB, created by Gilbert Andrews

on 2007-12-04 14:53:44 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Gilbert Andrews

Created: 2007-12-04 14:53:44 EST

Size: 11.37 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.creation.ui
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.21.2.3
>diff -u -r1.21.2.3 MANIFEST.MF
>--- META-INF/MANIFEST.MF	4 Apr 2007 19:06:29 -0000	1.21.2.3
>+++ META-INF/MANIFEST.MF	28 Nov 2007 21:01:35 -0000
>@@ -44,5 +44,6 @@
>  org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
>  org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,1.2.0)",
>  org.eclipse.ui.forms;bundle-version="[3.2.0,3.3.0)",
>- org.eclipse.wst.ws.ui;bundle-version="[1.0.103,1.1.0)"
>+ org.eclipse.wst.ws.ui;bundle-version="[1.0.103,1.1.0)",
>+ org.eclipse.emf.ecore
> Eclipse-LazyStart: true
>Index: src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java,v
>retrieving revision 1.10
>diff -u -r1.10 ServiceRootFragment.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java	1 Apr 2006 05:07:54 -0000	1.10
>+++ src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java	28 Nov 2007 21:01:35 -0000
>@@ -98,10 +98,11 @@
> 		
> 		//Mappings from framework to framework commands
>   	registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
>-		registry.addMapping( PreServiceDevelopCommand.class, "Project", 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, "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 );
>Index: src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java,v
>retrieving revision 1.34.2.2
>diff -u -r1.34.2.2 PreServiceDevelopCommand.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java	4 Apr 2007 18:55:49 -0000	1.34.2.2
>+++ src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java	28 Nov 2007 21:01:35 -0000
>@@ -28,6 +28,7 @@
> 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;
>@@ -39,6 +40,7 @@
> 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;
>@@ -54,6 +56,7 @@
>   private String			moduleType_;
>   private String			earProject_;
>   private String            ear_;
>+  private IProject		initialProject_;
> 	
>   private IWebService       webService_;
>   private String            j2eeLevel_;
>@@ -159,6 +162,11 @@
> 		        	}      
> 		        }
> 		  }
>+		  AddModuleDependenciesCommand addMod = new AddModuleDependenciesCommand(new TestInfo()); 
>+		  if(FacetUtils.isJavaProject(initialProject_))
>+			  addMod.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
>+		  
>+	  
> 	  }
> 	  return status;
> 
>@@ -280,6 +288,16 @@
>   {
>     client_ = genProxy;  
>   }	
>+  
>+  public void setInitialProject(IProject initialProject)
>+  {
>+	  initialProject_ = initialProject;  
>+  }	
>+  
>+  public IProject getInitialProject()
>+  {
>+	  return initialProject_;  
>+  }	
> 	
> 
> }
>Index: src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java,v
>retrieving revision 1.17
>diff -u -r1.17 PreServiceAssembleCommand.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java	30 May 2006 03:12:34 -0000	1.17
>+++ src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java	28 Nov 2007 21:01:35 -0000
>@@ -17,6 +17,8 @@
> 
> 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;
>@@ -25,21 +27,25 @@
> 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 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 )
>   {
>@@ -102,10 +108,32 @@
> 			  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;
>Index: src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java,v
>retrieving revision 1.53.2.1
>diff -u -r1.53.2.1 ServerRuntimeSelectionWidgetDefaultingCommand.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java	4 Apr 2007 19:15:17 -0000	1.53.2.1
>+++ src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java	28 Nov 2007 21:01:35 -0000
>@@ -552,6 +552,11 @@
>     initialProject_ = initialProject;
>   }
>   
>+  public IProject getInitialProject()
>+  {
>+    return initialProject_;  
>+  }
>+  
>   public void setInitialComponentName(String name)
>   {
>     //TODO This method and any mappings to it
>Index: src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java,v
>retrieving revision 1.56
>diff -u -r1.56 ServerWidgetBinding.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java	25 Aug 2006 18:40:30 -0000	1.56
>+++ src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java	28 Nov 2007 21:01:35 -0000
>@@ -191,6 +191,7 @@
>     dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerWizardWidget.class);
>     dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerWizardWidget.class);
>     dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ServerWizardWidget.class); //jvh
>+    dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
>                 
>     // After ServerWizardWidget  
>     dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
>@@ -559,7 +560,8 @@
>       dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
>       dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
>       dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null );      
>-			
>+      dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceNeedEAR", PreServiceDevelopCommand.class);		
>+      
> 	  dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
>  
>       // Map ClientExtensionDefaultingCommand

Actions: View | Diff

Attachments on bug 200193: 84451 | 84452 | 84671 | 85089 | 85138 | 85140 | 85141 | 85484 | 85688 | 85719 | 85747