318736 ImportDataModel unsafely checks java facet name 314295 Need java facet aliasing/compatibility for Ganymede stream
diff --git a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html index 26e8dd2..69aac07 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html +++ b/features/org.eclipse.jst.web_core.feature.patch/buildnotes_org.eclipse.jst.web_core.feature.patch.html
@@ -99,6 +99,7 @@ <p>Bug <a href='https://bugs.eclipse.org/303963'>303963</a>. Error Exception logged during deploy</p> <p>Bug <a href='https://bugs.eclipse.org/305252'>305252</a>. ClassCastException:j2ee.application.internal.impl.ApplicationImpl incompatible with javaee.application.Application</p> <p>Bug <a href='https://bugs.eclipse.org/305253'>305253</a>. Performance issue in Manual EAR validation</p> +<p>Bug <a href='https://bugs.eclipse.org/318736'>318736</a>. ImportDataModel unsafely checks java facet name</p> </body> </html> \ No newline at end of file
diff --git a/features/org.eclipse.jst.web_core.feature.patch/feature.properties b/features/org.eclipse.jst.web_core.feature.patch/feature.properties index bd94a35..5361ea3 100644 --- a/features/org.eclipse.jst.web_core.feature.patch/feature.properties +++ b/features/org.eclipse.jst.web_core.feature.patch/feature.properties
@@ -115,7 +115,9 @@ Bug https://bugs.eclipse.org/303963 Error Exception logged during deploy\n\ Bug https://bugs.eclipse.org/305252 ClassCastException:j2ee.application.internal.impl.ApplicationImpl incompatible with javaee.application.Application\n\ Bug https://bugs.eclipse.org/305253 Performance issue in Manual EAR validation\n\ +Bug https://bugs.eclipse.org/318736 ImportDataModel unsafely checks java facet name\n\ \n\ + # "copyright" property - text of the "Feature Update Copyright" copyright=\ Copyright (c) 2008 IBM Corporation and others.\n\
diff --git a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF index d83f096..5dc6dc4 100644 --- a/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.jst.j2ee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.j2ee; singleton:=true -Bundle-Version: 1.1.213.qualifier +Bundle-Version: 1.1.214.qualifier Bundle-Activator: org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java index 80e4a93..acfc553 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModelProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; @@ -42,7 +43,6 @@ import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; -import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider; import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent; import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor; @@ -329,7 +329,7 @@ for(Iterator iterator = projectFacets.iterator(); iterator.hasNext();){ IDataModel facetDataModel = map.getFacetDataModel(((IProjectFacet)iterator.next()).getId()); IProjectFacetVersion facetVersion = (IProjectFacetVersion)facetDataModel.getProperty(IFacetDataModelProperties.FACET_VERSION); - if(facetVersion.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA)){ + if(facetVersion.getProjectFacet().equals(JavaFacet.FACET)){ Set set = Collections.singleton(facetVersion.getProjectFacet()); try { Set correctSet = runtime.getDefaultFacets(set); @@ -337,7 +337,7 @@ Iterator correctVersions = correctSet.iterator(); while(correctVersions.hasNext() && correctVersion == null){ IProjectFacetVersion version = (IProjectFacetVersion)correctVersions.next(); - if(version.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA)){ + if(version.getProjectFacet().equals(JavaFacet.FACET)){ correctVersion = version; } }