|
Lines 11-18
Link Here
|
| 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; |
13 |
import java.io.IOException; |
|
|
14 |
import java.io.InputStream; |
| 14 |
import java.util.List; |
15 |
import java.util.List; |
| 15 |
|
16 |
|
|
|
17 |
import org.eclipse.core.resources.IFile; |
| 16 |
import org.eclipse.core.resources.IProject; |
18 |
import org.eclipse.core.resources.IProject; |
| 17 |
import org.eclipse.core.runtime.CoreException; |
19 |
import org.eclipse.core.runtime.CoreException; |
| 18 |
import org.eclipse.core.runtime.IAdaptable; |
20 |
import org.eclipse.core.runtime.IAdaptable; |
|
Lines 26-31
Link Here
|
| 26 |
import org.eclipse.jdt.core.JavaModelException; |
28 |
import org.eclipse.jdt.core.JavaModelException; |
| 27 |
import org.eclipse.jem.util.emf.workbench.ProjectUtilities; |
29 |
import org.eclipse.jem.util.emf.workbench.ProjectUtilities; |
| 28 |
import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; |
30 |
import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; |
|
|
31 |
import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl; |
| 29 |
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; |
32 |
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; |
| 30 |
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; |
33 |
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; |
| 31 |
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; |
34 |
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; |
|
Lines 37-42
Link Here
|
| 37 |
import org.eclipse.wst.common.componentcore.ComponentCore; |
40 |
import org.eclipse.wst.common.componentcore.ComponentCore; |
| 38 |
import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties; |
41 |
import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties; |
| 39 |
import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider; |
42 |
import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider; |
|
|
43 |
import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities; |
| 40 |
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; |
44 |
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; |
| 41 |
import org.eclipse.wst.common.environment.IEnvironment; |
45 |
import org.eclipse.wst.common.environment.IEnvironment; |
| 42 |
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; |
46 |
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; |
|
Lines 67-96
Link Here
|
| 67 |
public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) |
71 |
public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) |
| 68 |
{ |
72 |
{ |
| 69 |
IEnvironment env = getEnvironment(); |
73 |
IEnvironment env = getEnvironment(); |
| 70 |
try |
|
|
| 71 |
{ |
| 72 |
createSampleProjects(env, monitor ); |
74 |
createSampleProjects(env, monitor ); |
| 73 |
clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); |
75 |
clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); |
| 74 |
|
76 |
|
| 75 |
if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)) |
77 |
if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject)) |
| 76 |
{ |
78 |
{ |
| 77 |
String uri = clientIProject.getName() + ".jar"; |
79 |
if (J2EEUtils.isJavaComponent(clientIProject)){ |
| 78 |
if (J2EEUtils.isJavaComponent(clientIProject)) |
80 |
addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject,monitor); |
| 79 |
addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri,monitor); |
81 |
addJavaProjectAsUtilityJar(clientIProject, sampleIProject,monitor); |
| 80 |
addJAROrModuleDependency(sampleIProject, uri); |
82 |
} |
| 81 |
addBuildPath(sampleIProject, clientIProject); |
83 |
} |
| 82 |
} |
84 |
|
| 83 |
} |
|
|
| 84 |
catch (IOException ioe) |
| 85 |
{ |
| 86 |
} |
| 87 |
catch (CoreException ce) |
| 88 |
{ |
| 89 |
} |
| 90 |
return Status.OK_STATUS; |
85 |
return Status.OK_STATUS; |
| 91 |
} |
86 |
} |
| 92 |
|
87 |
|
| 93 |
private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri,IProgressMonitor monitor) |
88 |
private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject,IProgressMonitor monitor) |
| 94 |
{ |
89 |
{ |
| 95 |
try { |
90 |
try { |
| 96 |
IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider()); |
91 |
IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider()); |
|
Lines 102-110
Link Here
|
| 102 |
List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); |
97 |
List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); |
| 103 |
|
98 |
|
| 104 |
IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject); |
99 |
IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject); |
|
|
100 |
IVirtualComponent sourcecomponent = ComponentUtilities.getComponent(earProject.getName()); |
| 105 |
targetCompList.add(targetcomponent); |
101 |
targetCompList.add(targetcomponent); |
| 106 |
|
102 |
|
| 107 |
refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earProject); |
103 |
refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT,sourcecomponent ); |
| 108 |
refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList); |
104 |
refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList); |
| 109 |
refdm.getDefaultOperation().execute(monitor, null); |
105 |
refdm.getDefaultOperation().execute(monitor, null); |
| 110 |
}catch (Exception e) { |
106 |
}catch (Exception e) { |
|
Lines 114-120
Link Here
|
| 114 |
|
110 |
|
| 115 |
private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException |
111 |
private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException |
| 116 |
{ |
112 |
{ |
| 117 |
ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project); |
113 |
IVirtualComponent vc = ComponentUtilities.getComponent(testInfo.getGenerationProject()); |
|
|
114 |
IFile file = project.getFile("MANIFEST.MF"); |
| 115 |
InputStream in = file.getContents(); |
| 116 |
ArchiveManifest manifest = new ArchiveManifestImpl(in); |
| 117 |
//ArchiveManifest manifest = J2EEProjectUtilities.readManifest(vc.getProject()); |
| 118 |
manifest.mergeClassPath(new String[]{uri}); |
118 |
manifest.mergeClassPath(new String[]{uri}); |
| 119 |
J2EEProjectUtilities.writeManifest(project, manifest); |
119 |
J2EEProjectUtilities.writeManifest(project, manifest); |
| 120 |
|
120 |
|
|
Lines 206-212
Link Here
|
| 206 |
} |
206 |
} |
| 207 |
} |
207 |
} |
| 208 |
|
208 |
|
| 209 |
StartServerCommand startServer = new StartServerCommand(false, true); |
209 |
StartServerCommand startServer = new StartServerCommand(true); |
| 210 |
startServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); |
210 |
startServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); |
| 211 |
startServer.setEnvironment( env ); |
211 |
startServer.setEnvironment( env ); |
| 212 |
status = startServer.execute( monitor, null ); |
212 |
status = startServer.execute( monitor, null ); |
