Attachment 85747 Details for Bug 200193 – Patch for R2_0_maintenance branch containing all the above patches

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

[patch] Patch for R2_0_maintenance branch containing all the above patches

CombinedPatch200193R20.txt (text/plain), 26.94 KB, created by Kathy Chan

on 2007-12-22 00:43:08 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kathy Chan

Created: 2007-12-22 00:43:08 EST

Size: 26.94 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#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	21 Dec 2007 23:58:23 -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.37
>diff -u -r1.37 PreServiceDevelopCommand.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java	9 May 2007 21:00:24 -0000	1.37
>+++ src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java	21 Dec 2007 23:58:23 -0000
>@@ -16,22 +16,31 @@
>  * 20070123   167487 makandre@ca.ibm.com - Andrew Mak
>  * 20070403   173654 kathy@ca.ibm.com - Kathy Chan
>  * 20070509   182274 kathy@ca.ibm.com - Kathy Chan
>+ * 20071212	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>+ * 20071220   213640 kathy@ca.ibm.com - Kathy Chan
>  *******************************************************************************/
> 
> 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.jst.ws.internal.common.J2EEUtils;
> 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.wsrt.ServiceRuntimeDescriptor;
> 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;
>@@ -57,6 +66,7 @@
>   private String			moduleType_;
>   private String			earProject_;
>   private String            ear_;
>+  private IProject			initialProject_;
> 	
>   private IWebService       webService_;
>   private String            j2eeLevel_;
>@@ -166,7 +176,24 @@
> 		        	}      
> 		        }
> 		  }
>-	  }
>+	  
>+	  
>+		  if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)){
>+			  J2EEUtils.addJavaProjectAsUtilityJar(initialProject_, project, monitor);
>+			  try{
>+		  		String uri = initialProject_.getName() + ".jar";
>+		  		J2EEUtils.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;
> 
>   }
>@@ -288,5 +315,14 @@
>     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.18
>diff -u -r1.18 PreServiceAssembleCommand.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java	9 May 2007 21:00:24 -0000	1.18
>+++ src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java	21 Dec 2007 23:58:23 -0000
>@@ -14,18 +14,30 @@
>  * 20060524   141925 kathy@ca.ibm.com - Kathy Chan
>  * 20060529   141422 kathy@ca.ibm.com - Kathy Chan
>  * 20070509   182274 kathy@ca.ibm.com - Kathy Chan
>+ * 20071218	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>+ * 20071220   213640 kathy@ca.ibm.com - Kathy Chan
>  *******************************************************************************/
> 
> 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.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
>+import org.eclipse.jst.ws.internal.common.J2EEUtils;
> 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.common.FacetUtils;
> import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion;
>+import org.eclipse.jst.ws.internal.consumption.ui.ConsumptionUIMessages;
>+import org.eclipse.osgi.util.NLS;
>+import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
> import org.eclipse.wst.common.environment.IEnvironment;
> import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
> import org.eclipse.wst.ws.internal.plugin.WSPlugin;
>@@ -43,6 +55,7 @@
> 	private String						earProject_;
>   private String            ear_;
>   private IContext          context_;
>+  private IProject		initialProject_;
> 
>   public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
>   {
>@@ -106,10 +119,27 @@
> 			  environment.getStatusHandler().reportError(status);		  
> 		  }			
> 
>+		  //make sure the ear file has been created.
>+		  
>+		  if(initialProject_ != null && FacetUtils.isJavaProject(initialProject_)) {
>+			  IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProject_);
>+			  J2EEUtils.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.55
>diff -u -r1.55 ServerRuntimeSelectionWidgetDefaultingCommand.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java	23 Apr 2007 18:09:24 -0000	1.55
>+++ src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java	21 Dec 2007 23:58:24 -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.35
>diff -u -r1.35 MANIFEST.MF
>--- META-INF/MANIFEST.MF	15 Aug 2007 19:31:00 -0000	1.35
>+++ META-INF/MANIFEST.MF	21 Dec 2007 23:58:23 -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.205.qualifier
>+Bundle-Version: 1.0.206.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.57
>diff -u -r1.57 ServerWidgetBinding.java
>--- src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java	2 May 2007 13:34:33 -0000	1.57
>+++ src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java	21 Dec 2007 23:58:24 -0000
>@@ -524,6 +524,7 @@
>       dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
>       dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
>       dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
>+      dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", PreServiceDevelopCommand.class );
>       dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
>       
>       dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "InstallService", ServerExtensionDefaultingCommand.class);  
>#P org.eclipse.jst.ws
>Index: src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java,v
>retrieving revision 1.51
>diff -u -r1.51 J2EEUtils.java
>--- src/org/eclipse/jst/ws/internal/common/J2EEUtils.java	25 Jul 2007 17:45:24 -0000	1.51
>+++ src/org/eclipse/jst/ws/internal/common/J2EEUtils.java	21 Dec 2007 23:58:28 -0000
>@@ -14,11 +14,16 @@
>  * 20060503   126819 rsinha@ca.ibm.com - Rupam Kuehner
>  * 20060524   131132 mahutch@ca.ibm.com - Mark Hutchinson
>  * 20070723   194434 kathy@ca.ibm.com - Kathy Chan, Check for non-existing EAR with content not deleted
>+ * 20071218	  200193 gilberta@ca.ibm.com - Gilbert Andrews
>+ * 20071221   213726 kathy@ca.ibm.com - Kathy Chan
>  *******************************************************************************/
> 
> package org.eclipse.jst.ws.internal.common;
> 
>+import java.io.IOException;
> import java.util.ArrayList;
>+import java.util.Collection;
>+import java.util.Collections;
> import java.util.Iterator;
> import java.util.List;
> import java.util.Set;
>@@ -33,6 +38,7 @@
> import org.eclipse.core.resources.ResourcesPlugin;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IPath;
>+import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.NullProgressMonitor;
> import org.eclipse.core.runtime.Path;
>@@ -40,6 +46,7 @@
> import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
> import org.eclipse.jem.util.logger.proxy.Logger;
> import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
>+import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
> import org.eclipse.jst.j2ee.ejb.EJBJar;
> import org.eclipse.jst.j2ee.ejb.EJBResource;
> import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
>@@ -48,12 +55,17 @@
> import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
> import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
> import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
>+import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
> import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
> import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
>+import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
>+import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
> import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
> import org.eclipse.wst.common.componentcore.ComponentCore;
> import org.eclipse.wst.common.componentcore.ModuleCoreNature;
> import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
>+import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
>+import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
> import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
> import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
> import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
>@@ -1419,4 +1431,51 @@
> 		return status;
>     }
> 	
>+
>+	 public static void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
>+	  {
>+	    if (J2EEUtils.isWebComponent(project))
>+	    {
>+	      ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
>+	      manifest.mergeClassPath(new String[]{uri});
>+	      J2EEProjectUtilities.writeManifest(project, manifest);
>+	      forceClasspathUpdate(project);
>+	    }
>+	  }
>+	  
>+	  public static 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);
>+	 
>+	 
>+			  IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
>+			  List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
>+	 
>+			  IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);
>+			  IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName());
>+			  targetCompList.add(targetcomponent);
>+	 
>+			  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent );
>+			  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
>+			  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,  "/WEB-INF/lib");
>+			  refdm.getDefaultOperation().execute(monitor, null);
>+			  
>+			  forceClasspathUpdate(earProject);
>+			  
>+		  }catch (Exception e) {
>+			  
>+		  }
>+	  }
>+	  
>+	//Forcing classpath update
>+	  public static void forceClasspathUpdate (IProject project) {
>+		  J2EEComponentClasspathUpdater classpathUpdater = J2EEComponentClasspathUpdater.getInstance();
>+		  Collection projCollection = Collections.singleton(project);
>+		  classpathUpdater.forceUpdate(projCollection, false);
>+	  }
>+
> }
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/webtools/webservices/plugins/org.eclipse.jst.ws/META-INF/MANIFEST.MF,v
>retrieving revision 1.32
>diff -u -r1.32 MANIFEST.MF
>--- META-INF/MANIFEST.MF	25 Jul 2007 17:45:23 -0000	1.32
>+++ META-INF/MANIFEST.MF	21 Dec 2007 23:58:28 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %PLUGIN_NAME
> Bundle-SymbolicName: org.eclipse.jst.ws
>-Bundle-Version: 1.0.204.qualifier
>+Bundle-Version: 1.0.205.qualifier
> Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
> Bundle-Vendor: %PLUGIN_PROVIDER
> Bundle-Localization: plugin
>#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	21 Dec 2007 23:58:29 -0000
>@@ -12,29 +12,20 @@
>  * 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;
> 
> import java.io.IOException;
>-import java.util.List;
> 
> import org.eclipse.core.resources.IProject;
> 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.NullProgressMonitor;
> import org.eclipse.core.runtime.Status;
>-import org.eclipse.jdt.core.IClasspathEntry;
>-import org.eclipse.jdt.core.IJavaProject;
>-import org.eclipse.jdt.core.JavaCore;
>-import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
>-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
> import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
>-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
>-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
>-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
> import org.eclipse.jst.ws.internal.common.J2EEUtils;
> import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
> import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
>@@ -45,15 +36,8 @@
> import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
> import org.eclipse.osgi.util.NLS;
> import org.eclipse.wst.command.internal.env.core.common.StatusUtils;
>-import org.eclipse.wst.common.componentcore.ComponentCore;
>-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
>-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
>-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
>-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
> import org.eclipse.wst.common.environment.IEnvironment;
> import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
>-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
>-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
> import org.eclipse.wst.ws.internal.wsrt.TestInfo;
> 
> public class AddModuleDependenciesCommand extends AbstractDataModelOperation
>@@ -203,14 +187,14 @@
> 
> 		if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)) {
> 			if (J2EEUtils.isJavaComponent(clientIProject)) {				
>-				addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, monitor);
>-				addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
>+				J2EEUtils.addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, monitor);
>+				J2EEUtils.addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
> 			}
> 
> 				try
> 				{
> 				  String uri = clientIProject.getName() + ".jar";
>-				  addJAROrModuleDependency(sampleIProject, uri);
>+				  J2EEUtils.addJAROrModuleDependency(sampleIProject, uri);
> 				} catch (CoreException ce)
> 				{
> 					String errorMessage = NLS.bind(ConsumptionUIMessages.MSG_ERROR_MODULE_DEPENDENCY, new String[]{sampleIProject.getName(), clientIProject.getName()});
>@@ -223,70 +207,15 @@
> 					env.getStatusHandler().reportError(errorStatus);					
> 				}							
> 			
>-			try {		
>-				addBuildPath(sampleIProject, clientIProject);
>-			} catch (JavaModelException jme) {
>-				// Do nothing in this catch block. The worst that
>-				// will happen is that the sample Web project
>-				// will show some compile errors. The sample will
>-				// likely still launch successfully on the server
>-				// and the user will be able to use it.
>-			}
>+			
> 		}      	  
>     
>     return Status.OK_STATUS;
>   }
>   
>-  private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
>-  {
>-    if (J2EEUtils.isWebComponent(project))
>-    {
>-      ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
>-      manifest.mergeClassPath(new String[]{uri});
>-      J2EEProjectUtilities.writeManifest(project, manifest);
>-    }
>-  }
>-  
>-  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
>-  {
>-	  try {
>-		  IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
>-		  migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName());
>-		  migrationdm.getDefaultOperation().execute(monitor, null);
>- 
>- 
>-		  IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
>-		  List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
>  
>-		  IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);
>-		  IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName());
>-		  targetCompList.add(targetcomponent);
>- 
>-		  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent );
>-		  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
>-		  refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,  "/WEB-INF/lib");
>-		  refdm.getDefaultOperation().execute(monitor, null);
>-	  }catch (Exception e) {
>-		  
>-	  }
>-  }
> 
>   
>-  private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
>-  {
>-    IJavaProject javaProject = JavaCore.create(referencingProject);
>-    if (javaProject != null)
>-    {
>-      IClasspathEntry[] oldCp = javaProject.getRawClasspath();
>-	  IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length + 1];
>-	  for (int i = 0; i < oldCp.length; i++)
>-        newCp[i] = oldCp[i];
>-	  newCp[newCp.length - 1] = JavaCore.newProjectEntry(referencedProject.getFullPath());
>-	  javaProject.setRawClasspath(newCp, new NullProgressMonitor());
>-    }
>-  }
>- 
>-
>   public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
>  
> }

Actions: View | Diff

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