Attachment 33472 Details for Bug 117930 – Code that adds the java utility jar to the webproject

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

[patch] Code that adds the java utility jar to the webproject

org.eclipse.jst.ws.consumption.ui (text/plain), 5.37 KB, created by Gilbert Andrews

on 2006-01-23 13:14:06 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Gilbert Andrews

Created: 2006-01-23 13:14:06 EST

Size: 5.37 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.13
>diff -u -r1.13 AddModuleDependenciesCommand.java
>--- src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java	7 Dec 2005 22:09:22 -0000	1.13
>+++ src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java	23 Jan 2006 18:06:39 -0000
>@@ -11,8 +11,10 @@
> package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
> 
> import java.io.IOException;
>+import java.io.InputStream;
> import java.util.List;
> 
>+import org.eclipse.core.resources.IFile;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IAdaptable;
>@@ -26,6 +28,7 @@
> 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.commonarchivecore.internal.helpers.ArchiveManifestImpl;
> import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
> import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
> import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
>@@ -37,6 +40,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 +71,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,9 +97,10 @@
> 		  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.getDefaultOperation().execute(monitor, null);
> 	  }catch (Exception e) {
>@@ -114,7 +110,11 @@
> 
>   private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException
>   {
>-     ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
>+	 IVirtualComponent vc = ComponentUtilities.getComponent(testInfo.getGenerationProject());
>+	 IFile file = project.getFile("MANIFEST.MF");
>+	 InputStream in = file.getContents();
>+	 ArchiveManifest manifest = new ArchiveManifestImpl(in);
>+	 //ArchiveManifest manifest = J2EEProjectUtilities.readManifest(vc.getProject());
>      manifest.mergeClassPath(new String[]{uri});
>      J2EEProjectUtilities.writeManifest(project, manifest);
>     
>@@ -206,7 +206,7 @@
>         }              
>        }
> 		
>-		StartServerCommand startServer = new StartServerCommand(false, true);
>+		StartServerCommand startServer = new StartServerCommand(true);
> 		startServer.setServerInstanceId(testInfo.getClientExistingServer().getId());
> 		startServer.setEnvironment( env );
> 		status = startServer.execute( monitor, null );

Actions: View | Diff

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