|
Lines 11-16
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.util.List; |
| 15 |
|
| 14 |
import org.eclipse.core.resources.IProject; |
16 |
import org.eclipse.core.resources.IProject; |
| 15 |
import org.eclipse.core.runtime.CoreException; |
17 |
import org.eclipse.core.runtime.CoreException; |
| 16 |
import org.eclipse.core.runtime.IAdaptable; |
18 |
import org.eclipse.core.runtime.IAdaptable; |
|
Lines 25-37
Link Here
|
| 25 |
import org.eclipse.jem.util.emf.workbench.ProjectUtilities; |
27 |
import org.eclipse.jem.util.emf.workbench.ProjectUtilities; |
| 26 |
import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; |
28 |
import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; |
| 27 |
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; |
29 |
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; |
|
|
30 |
import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties; |
| 31 |
import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider; |
| 28 |
import org.eclipse.jst.ws.internal.common.J2EEUtils; |
32 |
import org.eclipse.jst.ws.internal.common.J2EEUtils; |
| 29 |
import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand; |
33 |
import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand; |
| 30 |
import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; |
34 |
import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; |
| 31 |
import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; |
35 |
import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; |
| 32 |
import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand; |
36 |
import org.eclipse.jst.ws.internal.consumption.ui.command.StartServerCommand; |
|
|
37 |
import org.eclipse.wst.common.componentcore.ComponentCore; |
| 38 |
import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties; |
| 39 |
import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider; |
| 40 |
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; |
| 33 |
import org.eclipse.wst.common.environment.IEnvironment; |
41 |
import org.eclipse.wst.common.environment.IEnvironment; |
| 34 |
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; |
42 |
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; |
|
|
43 |
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; |
| 44 |
import org.eclipse.wst.common.frameworks.datamodel.IDataModel; |
| 35 |
import org.eclipse.wst.ws.internal.wsrt.TestInfo; |
45 |
import org.eclipse.wst.ws.internal.wsrt.TestInfo; |
| 36 |
|
46 |
|
| 37 |
public class AddModuleDependenciesCommand extends AbstractDataModelOperation |
47 |
public class AddModuleDependenciesCommand extends AbstractDataModelOperation |
|
Lines 66-72
Link Here
|
| 66 |
{ |
76 |
{ |
| 67 |
String uri = clientIProject.getName() + ".jar"; |
77 |
String uri = clientIProject.getName() + ".jar"; |
| 68 |
if (J2EEUtils.isJavaComponent(clientIProject)) |
78 |
if (J2EEUtils.isJavaComponent(clientIProject)) |
| 69 |
addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri); |
79 |
addJavaProjectAsUtilityJar(clientIProject, sampleEARIProject, uri,monitor); |
| 70 |
addJAROrModuleDependency(sampleIProject, uri); |
80 |
addJAROrModuleDependency(sampleIProject, uri); |
| 71 |
addBuildPath(sampleIProject, clientIProject); |
81 |
addBuildPath(sampleIProject, clientIProject); |
| 72 |
} |
82 |
} |
|
Lines 80-90
Link Here
|
| 80 |
return Status.OK_STATUS; |
90 |
return Status.OK_STATUS; |
| 81 |
} |
91 |
} |
| 82 |
|
92 |
|
| 83 |
private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri) |
93 |
private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri,IProgressMonitor monitor) |
| 84 |
{ |
94 |
{ |
| 85 |
// TODO Remove refs to old command |
95 |
try { |
| 86 |
// AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(earProject, uri, javaProject); |
96 |
IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider()); |
| 87 |
// cmd.execute(); |
97 |
migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, javaProject.getName()); |
|
|
98 |
migrationdm.getDefaultOperation().execute(monitor, null); |
| 99 |
|
| 100 |
|
| 101 |
IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider()); |
| 102 |
List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); |
| 103 |
|
| 104 |
IVirtualComponent targetcomponent = ComponentCore.createComponent(javaProject); |
| 105 |
targetCompList.add(targetcomponent); |
| 106 |
|
| 107 |
refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earProject); |
| 108 |
refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList); |
| 109 |
refdm.getDefaultOperation().execute(monitor, null); |
| 110 |
}catch (Exception e) { |
| 111 |
|
| 112 |
} |
| 88 |
} |
113 |
} |
| 89 |
|
114 |
|
| 90 |
private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException |
115 |
private void addJAROrModuleDependency(IProject project, String uri) throws IOException, CoreException |
|
Lines 99-107
Link Here
|
| 99 |
|
124 |
|
| 100 |
private void createSampleProjects(IEnvironment env, IProgressMonitor monitor ) |
125 |
private void createSampleProjects(IEnvironment env, IProgressMonitor monitor ) |
| 101 |
{ |
126 |
{ |
| 102 |
|
|
|
| 103 |
|
| 104 |
|
| 105 |
sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject()); |
127 |
sampleIProject = ProjectUtilities.getProject(testInfo.getGenerationProject()); |
| 106 |
clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); |
128 |
clientIProject = ProjectUtilities.getProject(testInfo.getClientProject()); |
| 107 |
|
129 |
|
|
Lines 123-129
Link Here
|
| 123 |
createEAR.setServerFactoryId(testInfo.getClientServerTypeID()); |
145 |
createEAR.setServerFactoryId(testInfo.getClientServerTypeID()); |
| 124 |
createEAR.setModuleType(CreateModuleCommand.EAR); |
146 |
createEAR.setModuleType(CreateModuleCommand.EAR); |
| 125 |
createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject)); |
147 |
createEAR.setJ2eeLevel(J2EEUtils.getJ2EEVersionAsString(clientIProject)); |
| 126 |
createEAR.setEnvironment( env ); |
148 |
createEAR.setEnvironment( env ); |
| 127 |
IStatus status = createEAR.execute( monitor, null ); |
149 |
IStatus status = createEAR.execute( monitor, null ); |
| 128 |
if (status.getSeverity()==Status.ERROR) |
150 |
if (status.getSeverity()==Status.ERROR) |
| 129 |
{ |
151 |
{ |
|
Lines 134-140
Link Here
|
| 134 |
modToServer.setModule(sampleEARModule); |
156 |
modToServer.setModule(sampleEARModule); |
| 135 |
modToServer.setProject(sampleEARProject); |
157 |
modToServer.setProject(sampleEARProject); |
| 136 |
modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); |
158 |
modToServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); |
| 137 |
modToServer.setEnvironment( env ); |
159 |
modToServer.setEnvironment( env ); |
| 138 |
status = modToServer.execute( monitor, null ); |
160 |
status = modToServer.execute( monitor, null ); |
| 139 |
if (status.getSeverity()==Status.ERROR) |
161 |
if (status.getSeverity()==Status.ERROR) |
| 140 |
{ |
162 |
{ |
|
Lines 161-167
Link Here
|
| 161 |
associateCommand.setProject(testInfo.getGenerationProject()); |
183 |
associateCommand.setProject(testInfo.getGenerationProject()); |
| 162 |
associateCommand.setEARProject(sampleEARProject); |
184 |
associateCommand.setEARProject(sampleEARProject); |
| 163 |
associateCommand.setEar(sampleEARModule); |
185 |
associateCommand.setEar(sampleEARModule); |
| 164 |
associateCommand.setEnvironment( env ); |
186 |
associateCommand.setEnvironment( env ); |
| 165 |
status = associateCommand.execute( monitor, null ); |
187 |
status = associateCommand.execute( monitor, null ); |
| 166 |
if (status.getSeverity()==Status.ERROR) |
188 |
if (status.getSeverity()==Status.ERROR) |
| 167 |
{ |
189 |
{ |
|
Lines 186-192
Link Here
|
| 186 |
|
208 |
|
| 187 |
StartServerCommand startServer = new StartServerCommand(false, true); |
209 |
StartServerCommand startServer = new StartServerCommand(false, true); |
| 188 |
startServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); |
210 |
startServer.setServerInstanceId(testInfo.getClientExistingServer().getId()); |
| 189 |
startServer.setEnvironment( env ); |
211 |
startServer.setEnvironment( env ); |
| 190 |
status = startServer.execute( monitor, null ); |
212 |
status = startServer.execute( monitor, null ); |
| 191 |
if (status.getSeverity()==Status.ERROR) |
213 |
if (status.getSeverity()==Status.ERROR) |
| 192 |
{ |
214 |
{ |
