| commit | 8f4e5d86c13c891dc0f5f20e0e89a25344c61280 | [log] [tgz] |
|---|---|---|
| author | Carl Anderson <ccc@us.ibm.com> | Fri Nov 03 17:29:41 2017 -0400 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Fri Nov 03 17:29:41 2017 -0400 |
| tree | ae32c0b82b926ad4cbac601e89c86b999bf30e96 | |
| parent | f0966412159679031563c65cef3cdfceaa8a82af [diff] | |
| parent | 0cc41add5cd05f91e09945a68ed5b762dc118d09 [diff] |
Merge "[518393] Add project explorer icons for Java EE 8"
diff --git a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java index c2afe21..143f610 100644 --- a/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/jee-models/org/eclipse/jst/javaee/webfragment/internal/metadata/WebfragmentPackage.java
@@ -362,7 +362,7 @@ * <!-- end-user-doc --> * @generated */ - String eNS_URI = J2EEConstants.WEBFRAGMENT_SCHEMA_3_0; + String eNS_URI = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_0; String eNS_URI2 = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_3_1; String eNS_URI3 = J2EEConstants.WEBFRAGMENT_SCHEMA_LOC_4_0; /**
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java index 4c0f5d8..85879ce 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentImportDataModelProvider.java
@@ -79,8 +79,8 @@ @Override protected void handleUnknownType(JavaEEQuickPeek jqp) { jqp.setType(J2EEVersionConstants.WEB_TYPE); - jqp.setVersion(J2EEVersionConstants.WEB_3_1_ID); - jqp.setJavaEEVersion(J2EEVersionConstants.JEE_7_0_ID); + jqp.setVersion(J2EEVersionConstants.WEB_4_0_ID); + jqp.setJavaEEVersion(J2EEVersionConstants.JEE_8_0_ID); }