Attachment 85138 Details for Bug 200193 – Modified patch

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

[patch] Modified patch

ModifiedPatch200193.txt (text/plain), 18.80 KB, created by Kathy Chan

on 2007-12-12 18:16:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kathy Chan

Created: 2007-12-12 18:16:06 EST

Size: 18.80 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jst.ws.consumption.ui
>Index: src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java,v
>retrieving revision 1.18
>diff -u -r1.18 AddModuleDependenciesCommand.java
>--- src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java	10 May 2006 20:41:40 -0000	1.18
>+++ src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java	12 Dec 2007 22:16:51 -0000
>@@ -12,6 +12,7 @@
>  * 20060324   122799 rsinha@ca.ibm.com - Rupam Kuehner
>  * 20060503   138478 rsinha@ca.ibm.com - Rupam Kuehner
>  * 20060510   141115 rsinha@ca.ibm.com - Rupam Kuehner
>+ * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
> 
>@@ -71,6 +72,12 @@
>     this.testInfo = testInfo;
>   }
> 
>+  // Defect 200193 - This default constructor is put as a temporary fix for allowing other
>+  // code to have access to methods in this command without calling execute().  
>+  public AddModuleDependenciesCommand()
>+  {   
>+  }
>+  
>   /**
>    * Execute WebServerDefaultingTask Set the default server name and id given a
>    * deployable.
>@@ -237,7 +244,7 @@
>     return Status.OK_STATUS;
>   }
>   
>-  private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
>+  public void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
>   {
>     if (J2EEUtils.isWebComponent(project))
>     {
>@@ -247,11 +254,12 @@
>     }
>   }
>   
>-  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
>+  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);
>  
>  
>@@ -272,7 +280,7 @@
>   }
> 
>   
>-  private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
>+  public void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
>   {
>     IJavaProject javaProject = JavaCore.create(referencingProject);
>     if (javaProject != null)
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF,v
>retrieving revision 1.28.2.5
>diff -u -r1.28.2.5 MANIFEST.MF
>--- META-INF/MANIFEST.MF	18 Jul 2007 19:25:35 -0000	1.28.2.5
>+++ META-INF/MANIFEST.MF	12 Dec 2007 22:16:51 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %PLUGIN_NAME
> Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
>-Bundle-Version: 1.0.106.qualifier
>+Bundle-Version: 1.0.107.qualifier
> Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
> Bundle-Vendor: %PLUGIN_PROVIDER
> Bundle-Localization: plugin
>#P org.eclipse.jst.ws.creation.ui
>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	12 Dec 2007 22:16:51 -0000
>@@ -12,6 +12,7 @@
>  * 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;
>@@ -98,10 +99,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	12 Dec 2007 22:16:51 -0000
>@@ -15,21 +15,30 @@
>  * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
>  * 20070123   167487 makandre@ca.ibm.com - Andrew Mak
>  * 20070403   173654 kathy@ca.ibm.com - Kathy Chan
>+ * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>  *******************************************************************************/
> 
> package org.eclipse.jst.ws.internal.creation.ui.extension;
> 
>+import java.io.IOException;
>+
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.ResourcesPlugin;
>+import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IAdaptable;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Status;
>+import org.eclipse.jdt.core.JavaModelException;
> 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.ConsumptionUIMessages;
>+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.osgi.util.NLS;
>+import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
> import org.eclipse.wst.command.internal.env.core.context.ResourceContext;
> import org.eclipse.wst.common.environment.IEnvironment;
> import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
>@@ -39,6 +48,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 +64,7 @@
>   private String			moduleType_;
>   private String			earProject_;
>   private String            ear_;
>+  private IProject		initialProject_;
> 	
>   private IWebService       webService_;
>   private String            j2eeLevel_;
>@@ -159,6 +170,29 @@
> 		        	}      
> 		        }
> 		  }
>+		   
>+		  // 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.
>+			  addMod.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
>+			  try
>+			  {
>+				  String uri = initialProject_.getName() + ".jar";
>+				  addMod.addJAROrModuleDependency(project, uri);
>+			  } catch (CoreException ce)
>+			  {
>+				  String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
>+				  IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
>+				  environment.getStatusHandler().reportError(errorStatus);
>+			  } catch (IOException ioe)
>+			  {
>+				  String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{project.getName(), initialProject_.getName()});
>+				  IStatus errorStatus = StatusUtils.errorStatus(errorMessage);
>+				  environment.getStatusHandler().reportError(errorStatus);					
>+			  }							
>+		  }
> 	  }
> 	  return status;
> 
>@@ -280,6 +314,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	12 Dec 2007 22:16:51 -0000
>@@ -13,10 +13,13 @@
>  * 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;
>@@ -25,21 +28,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 +109,30 @@
> 			  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;
>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	12 Dec 2007 22:16:51 -0000
>@@ -20,6 +20,7 @@
>  * 20060525   143843 joan@ca.ibm.com - Joan Haggarty
>  * 20060905   156230 kathy@ca.ibm.com - Kathy Chan, Handling projects with no target runtime
>  * 20070319	  159458 mahutch@ca.ibm.com - Mark Hutchinson added in some null checks
>+ * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
> 
>@@ -295,7 +296,10 @@
>   {
>     //Choose an existing server the module is already associated with if possible
>     IProject serviceProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serviceProjectName_);
>-    IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
>+    IServer[] configuredServers = null;
>+    if(serviceProject.exists())
>+    	configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(serviceProject), null);
>+    
>     if (configuredServers!=null && configuredServers.length>0)
>     {
>       serviceIds_.setServerId(configuredServers[0].getServerType().getId());
>@@ -552,6 +556,11 @@
>     initialProject_ = initialProject;
>   }
>   
>+  public IProject getInitialProject()
>+  {
>+    return initialProject_;  
>+  }
>+  
>   public void setInitialComponentName(String name)
>   {
>     //TODO This method and any mappings to it
>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	12 Dec 2007 22:16:51 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %PLUGIN_NAME
> Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
>-Bundle-Version: 1.0.105.qualifier
>+Bundle-Version: 1.0.106.qualifier
> Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
> Bundle-Vendor: %PLUGIN_PROVIDER
> Bundle-Localization: plugin
>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	12 Dec 2007 22:16:51 -0000
>@@ -26,6 +26,7 @@
>  * 20060810   135395 makandre@ca.ibm.com - Andrew Mak, Enable WTP Web service framework opening Java editor
>  * 20060821   153833 makandre@ca.ibm.com - Andrew Mak, Allow the Web Service Test extension point to specify the supported client runtime
>  * 20060825   155114 pmoogk@ca.ibm.com - Peter Moogk
>+ * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>  *******************************************************************************/
> package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
> 
>@@ -191,6 +192,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);

Actions: View | Diff

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