Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Collier2017-11-02 19:40:36 +0000
committerJohn Collier2017-11-02 19:40:36 +0000
commit3da0555ebceac635d5f5599aac167d08d34a3b3f (patch)
tree5f48b5c20ca66001e614020d3fd4c434b62a82a8 /plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet
parent45f52af446c4582c9039d5476de8029e40509831 (diff)
downloadwebtools.javaee-3da0555ebceac635d5f5599aac167d08d34a3b3f.tar.gz
webtools.javaee-3da0555ebceac635d5f5599aac167d08d34a3b3f.tar.xz
webtools.javaee-3da0555ebceac635d5f5599aac167d08d34a3b3f.zip
[518383] Add basic Java EE 8 support to WTP Java EE Tools
This patch adds basic Java EE 8 support to the Java EE Tools component. Allows for Dynamic Web 4.0, EAR 8.0, App Client 8.0, etc, projects to be created and for their respective deployment descriptor files to be generated and updated. Signed-off-by: John Collier <John.J.Collier@ibm.com>
Diffstat (limited to 'plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet')
-rw-r--r--plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java2
-rw-r--r--plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java7
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
index 1fe44dcdf..8525c9846 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebModuleTypeDialog.java
@@ -30,7 +30,7 @@ public class ConvertToWebModuleTypeDialog extends Dialog {
private String fShellTitle = IWebWizardConstants.CONVERT_TO_WEB_TITLE;
private String fLabelText = IWebWizardConstants.SELECT_WEB_VERSION;
private static String fSelection= null;
- private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT, J2EEVersionConstants.VERSION_3_1_TEXT};
+ private String[] fAllowedStrings = new String[] {J2EEVersionConstants.VERSION_2_2_TEXT, J2EEVersionConstants.VERSION_2_3_TEXT, J2EEVersionConstants.VERSION_2_4_TEXT, J2EEVersionConstants.VERSION_2_5_TEXT, J2EEVersionConstants.VERSION_3_0_TEXT, J2EEVersionConstants.VERSION_3_1_TEXT, J2EEVersionConstants.VERSION_4_0_TEXT};
private int fInitialSelectionIndex = fAllowedStrings.length-1;
public static String getSelectedVersion() {
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
index 8eac03222..49b31d0a6 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebProjectFirstPage.java
@@ -54,8 +54,11 @@ public class WebProjectFirstPage extends J2EEComponentFacetCreationWizardPage {
}
else {
facets.add( primaryFacetVersion );
-
- if( primaryFacetVersion == WebFacetUtils.WEB_31 )
+ if (primaryFacetVersion == WebFacetUtils.WEB_40)
+ {
+ facets.add( JavaFacet.VERSION_1_8);
+ }
+ else if( primaryFacetVersion == WebFacetUtils.WEB_31 )
{
facets.add( JavaFacet.VERSION_1_7 );
}

Back to the top