|
Lines 11-21
Link Here
|
| 11 |
package org.eclipse.jst.j2ee.internal.ejb.archiveoperations; |
11 |
package org.eclipse.jst.j2ee.internal.ejb.archiveoperations; |
| 12 |
|
12 |
|
| 13 |
import org.eclipse.core.commands.ExecutionException; |
13 |
import org.eclipse.core.commands.ExecutionException; |
|
|
14 |
import org.eclipse.core.runtime.CoreException; |
| 14 |
import org.eclipse.core.runtime.IAdaptable; |
15 |
import org.eclipse.core.runtime.IAdaptable; |
| 15 |
import org.eclipse.core.runtime.IProgressMonitor; |
16 |
import org.eclipse.core.runtime.IProgressMonitor; |
| 16 |
import org.eclipse.core.runtime.IStatus; |
17 |
import org.eclipse.core.runtime.IStatus; |
| 17 |
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties; |
18 |
import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties; |
| 18 |
import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider; |
19 |
import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider; |
|
|
20 |
import org.eclipse.jst.common.project.facet.core.JavaFacet; |
| 19 |
import org.eclipse.jst.j2ee.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties; |
21 |
import org.eclipse.jst.j2ee.ejb.archiveoperations.IEjbClientProjectCreationDataModelProperties; |
| 20 |
import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin; |
22 |
import org.eclipse.jst.j2ee.ejb.internal.plugin.EjbPlugin; |
| 21 |
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; |
23 |
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; |
|
Lines 23-33
Link Here
|
| 23 |
import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties; |
25 |
import org.eclipse.jst.j2ee.project.facet.IUtilityFacetInstallDataModelProperties; |
| 24 |
import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationOperation; |
26 |
import org.eclipse.jst.j2ee.project.facet.JavaUtilityProjectCreationOperation; |
| 25 |
import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider; |
27 |
import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider; |
|
|
28 |
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; |
| 26 |
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; |
29 |
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; |
|
|
30 |
import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin; |
| 27 |
import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation; |
31 |
import org.eclipse.wst.common.componentcore.internal.operation.FacetProjectCreationOperation; |
| 28 |
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; |
32 |
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; |
| 29 |
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; |
33 |
import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; |
| 30 |
import org.eclipse.wst.common.frameworks.datamodel.IDataModel; |
34 |
import org.eclipse.wst.common.frameworks.datamodel.IDataModel; |
|
|
35 |
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; |
| 31 |
import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; |
36 |
import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; |
| 32 |
|
37 |
|
| 33 |
public class EjbClientProjectCreationOperation |
38 |
public class EjbClientProjectCreationOperation |
|
Lines 85-90
Link Here
|
| 85 |
|
90 |
|
| 86 |
utildm.setProperty( IUtilityFacetInstallDataModelProperties.FACET_RUNTIME, runtime ); |
91 |
utildm.setProperty( IUtilityFacetInstallDataModelProperties.FACET_RUNTIME, runtime ); |
| 87 |
dm.setProperty(UtilityProjectCreationDataModelProvider.FACET_RUNTIME, runtime); |
92 |
dm.setProperty(UtilityProjectCreationDataModelProvider.FACET_RUNTIME, runtime); |
|
|
93 |
|
| 94 |
//Ensure Java DM has latest supported version |
| 95 |
try { |
| 96 |
IProjectFacetVersion oldVersion = (IProjectFacetVersion) javadm.getProperty(IFacetDataModelProperties.FACET_VERSION); |
| 97 |
IProjectFacetVersion newVersion = JavaFacet.FACET.getLatestSupportedVersion(runtime); |
| 98 |
if (newVersion != null && (oldVersion == null || oldVersion.getVersionString().compareTo(newVersion.getVersionString()) < 0 || !runtime.supports(oldVersion))) { |
| 99 |
javadm.setProperty(IFacetDataModelProperties.FACET_VERSION, newVersion); |
| 100 |
} |
| 101 |
} catch (CoreException e) { |
| 102 |
ModulecorePlugin.logError(e); |
| 103 |
} |
| 88 |
|
104 |
|
| 89 |
FacetProjectCreationOperation op = new FacetProjectCreationOperation(dm); |
105 |
FacetProjectCreationOperation op = new FacetProjectCreationOperation(dm); |
| 90 |
try { |
106 |
try { |
