Attachment 33788 Details for Bug 117930 – This adds a new line to the .component file

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

[patch] This adds a new line to the .component file

org[1].eclipse.jst.ws.consumption.ui.txt (text/plain), 5.00 KB, created by Gilbert Andrews

on 2006-01-30 10:50:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Gilbert Andrews

Created: 2006-01-30 10:50:48 EST

Size: 5.00 KB

patch

obsolete

>Index: src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java
>===================================================================
>RCS file: /home/webtools/jst/components/ws/plugins/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java,v
>retrieving revision 1.14
>diff -u -r1.14 AddModuleDependenciesCommand.java
>--- src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java	19 Jan 2006 21:10:39 -0000	1.14
>+++ src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java	30 Jan 2006 15:48:50 -0000
>@@ -10,11 +10,9 @@
>  *******************************************************************************/
> 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;
>@@ -25,8 +23,6 @@
> 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.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;
>@@ -37,6 +33,7 @@
> 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;
>@@ -67,30 +64,21 @@
>   public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
>   {
>     IEnvironment env = getEnvironment();
>-    try
>-    {
>       createSampleProjects(env, monitor );
> 	  clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
> 	        
>       if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject))
>       {
>-        String uri = clientIProject.getName() + ".jar";
>-		if (J2EEUtils.isJavaComponent(clientIProject))
>-          addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri,monitor);
>-        addJAROrModuleDependency(sampleIProject, uri);
>-        addBuildPath(sampleIProject, clientIProject);
>-      }
>-    }
>-    catch (IOException ioe)
>-    {
>-    }
>-    catch (CoreException ce)
>-    {
>-    }
>+        if (J2EEUtils.isJavaComponent(clientIProject)){
>+          addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject,monitor);
>+          addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
>+		}
>+	  }
>+    
>     return Status.OK_STATUS;
>   }
> 
>-  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri,IProgressMonitor monitor)
>+  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
>   {
> 	  try {
> 		  IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
>@@ -102,23 +90,19 @@
> 		  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, earProject);
>+		  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 addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
>-  {
>-     ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
>-     manifest.mergeClassPath(new String[]{uri});
>-     J2EEProjectUtilities.writeManifest(project, manifest);
>-    
>-  }
>+ 
> 
>   public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
>

Actions: View | Diff

Attachments on bug 117930: 31342 | 33471 | 33472 | 33788