Attachment #33788 for bug #117930

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




 *******************************************************************************/
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.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;

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;

  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))
      {
        if (J2EEUtils.isJavaComponent(clientIProject)){
          addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject,monitor);
          addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
		}
	  }
    
    }
    catch (IOException ioe)
    {
    }
    catch (CoreException ce)
    {
    }
    return Status.OK_STATUS;
  }

  private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
  {
	  try {
		  IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());

		  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) {
		  
	  }
  }

 
  {
     ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
     manifest.mergeClassPath(new String[]{uri});
     J2EEProjectUtilities.writeManifest(project, manifest);
    
  }

  public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
  

Return to bug 117930

Lines 10-20 Link Here

(-)src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/AddModuleDependenciesCommand.java (-28 / +12 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;	11	package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
12		12
13	import java.io.IOException;
14	import java.util.List;	13	import java.util.List;
15		14
16	import org.eclipse.core.resources.IProject;	15	import org.eclipse.core.resources.IProject;
17	import org.eclipse.core.runtime.CoreException;
18	import org.eclipse.core.runtime.IAdaptable;	16	import org.eclipse.core.runtime.IAdaptable;
19	import org.eclipse.core.runtime.IProgressMonitor;	17	import org.eclipse.core.runtime.IProgressMonitor;
20	import org.eclipse.core.runtime.IStatus;	18	import org.eclipse.core.runtime.IStatus;
Lines 25-32 Link Here
25	import org.eclipse.jdt.core.JavaCore;	23	import org.eclipse.jdt.core.JavaCore;
26	import org.eclipse.jdt.core.JavaModelException;	24	import org.eclipse.jdt.core.JavaModelException;
27	import org.eclipse.jem.util.emf.workbench.ProjectUtilities;	25	import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
28	import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
29	import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
30	import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;	26	import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
31	import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;	27	import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
32	import org.eclipse.jst.ws.internal.common.J2EEUtils;	28	import org.eclipse.jst.ws.internal.common.J2EEUtils;
Lines 37-42 Link Here
37	import org.eclipse.wst.common.componentcore.ComponentCore;	33	import org.eclipse.wst.common.componentcore.ComponentCore;
38	import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;	34	import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
39	import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;	35	import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
		36	import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
40	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;	37	import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
41	import org.eclipse.wst.common.environment.IEnvironment;	38	import org.eclipse.wst.common.environment.IEnvironment;
42	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;	39	import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
Lines 67-96 Link Here
67	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )	64	public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable )
68	{	65	{
69	IEnvironment env = getEnvironment();	66	IEnvironment env = getEnvironment();
70	try
71	{
72	createSampleProjects(env, monitor );	67	createSampleProjects(env, monitor );
73	clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());	68	clientIProject = ProjectUtilities.getProject(testInfo.getClientProject());
74		69
75	if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject))	70	if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject))
76	{	71	{
77	String uri = clientIProject.getName() + ".jar";	72	if (J2EEUtils.isJavaComponent(clientIProject)){
78	if (J2EEUtils.isJavaComponent(clientIProject))	73	addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject,monitor);
79	addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri,monitor);	74	addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor);
80	addJAROrModuleDependency(sampleIProject, uri);	75	}
81	addBuildPath(sampleIProject, clientIProject);	76	}
82	}	77
83	}
84	catch (IOException ioe)
85	{
86	}
87	catch (CoreException ce)
88	{
89	}
90	return Status.OK_STATUS;	78	return Status.OK_STATUS;
91	}	79	}
92		80
93	private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri,IProgressMonitor monitor)	81	private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor)
94	{	82	{
95	try {	83	try {
96	IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());	84	IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
Lines 102-124 Link Here
102	List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);	90	List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
103		91
104	IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);	92	IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject);
		93	IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName());
105	targetCompList.add(targetcomponent);	94	targetCompList.add(targetcomponent);
106		95
107	refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earProject);	96	refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent );
108	refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);	97	refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
		98	refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/WEB-INF/lib");
109	refdm.getDefaultOperation().execute(monitor, null);	99	refdm.getDefaultOperation().execute(monitor, null);
110	}catch (Exception e) {	100	}catch (Exception e) {
111		101
112	}	102	}
113	}	103	}
114		104
115	private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException	105
116	{
117	ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
118	manifest.mergeClassPath(new String[]{uri});
119	J2EEProjectUtilities.writeManifest(project, manifest);
120
121	}
122		106
123	public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";	107	public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
124		108