[400488] Java EE 7 Project creation for core module types
diff --git a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
index 472e0cc..374905a 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.jca/plugin.xml
@@ -111,7 +111,7 @@
<project-facet-version facet="jst.connector" version="1.6">
<constraint>
<and>
- <requires facet="jst.java" version="[6.0"/>
+ <requires facet="jst.java" version="[1.6"/>
<conflicts group="modules"/>
</and>
</constraint>
@@ -133,7 +133,7 @@
<config-factory class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetInstallDataModelProvider"/>
</action>
- <event-handler facet="jst.connector" version="[1.0-1.6]" type="POST_INSTALL">
+ <event-handler facet="jst.connector" version="[1.0-1.7]" type="POST_INSTALL">
<delegate class="org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetPostInstallDelegate"/>
</event-handler>
diff --git a/plugins/org.eclipse.jst.j2ee.web/plugin.xml b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
index ecc37c2..8020744 100644
--- a/plugins/org.eclipse.jst.j2ee.web/plugin.xml
+++ b/plugins/org.eclipse.jst.j2ee.web/plugin.xml
@@ -479,7 +479,7 @@
<project-facet-version facet="jst.webfragment" version="3.0">
<constraint>
<and>
- <requires facet="jst.java" version="[6.0"/>
+ <requires facet="jst.java" version="[1.6"/>
<conflicts group="modules"/>
</and>
</constraint>
@@ -489,7 +489,7 @@
<project-facet-version facet="jst.webfragment" version="3.1">
<constraint>
<and>
- <requires facet="jst.java" version="[7.0"/>
+ <requires facet="jst.java" version="[1.7"/>
<conflicts group="modules"/>
</and>
</constraint>
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
index 23cd5e6..076d595 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetUtils.java
@@ -26,6 +26,7 @@
public static final IProjectFacetVersion WEB_30 = WEB_FACET.getVersion("3.0"); //$NON-NLS-1$
public static final IProjectFacetVersion WEB_31 = WEB_FACET.getVersion("3.1"); //$NON-NLS-1$
public static final IProjectFacetVersion WEBFRAGMENT_30 = WEBFRAGMENT_FACET.getVersion("3.0"); //$NON-NLS-1$
+ public static final IProjectFacetVersion WEBFRAGMENT_31 = WEBFRAGMENT_FACET.getVersion("3.1"); //$NON-NLS-1$
public static final IProjectFacet WEB_XDOCLET_FACET = getWebDocletFacet();
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
index 1b86aa5..38ba6b1 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/project/facet/WebFragmentProjectFirstPage.java
@@ -18,7 +18,7 @@
import java.util.List;
import java.util.Set;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentFacetCreationWizardPage;
import org.eclipse.jst.j2ee.web.project.facet.IWebFragmentProjectCreationDataModelProperties;
import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
@@ -101,9 +101,13 @@
else {
facets.add(primaryFacetVersion);
- if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
+ if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_31)
{
- facets.add(JavaFacetUtils.JAVA_60);
+ facets.add(JavaFacet.VERSION_1_7);
+ }
+ else if(primaryFacetVersion == WebFacetUtils.WEBFRAGMENT_30)
+ {
+ facets.add(JavaFacet.VERSION_1_6);
}
}
return Collections.unmodifiableSet( facets );
