FISH-7888 Payara Tools for Eclipse does not allow the creation of Dynamic Web Project 6.0

Author: jGauravGupta

bundles/fish.payara.eclipse.tools.server/plugin.xml

@@ -26,12 +26,12 @@
             name="%runtimeTypeNameglassfish"
             description="%runtimeTypeDescriptionglassfish"
             vendor="%runtimeTypeGlassFishVendor">
-            <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1, 4.0"/>
-            <moduleType types="jst.ejb" versions="1.1, 2.0, 2.1, 3.0, 3.1, 3.2"/>
-            <moduleType types="jst.connector" versions="1.0, 1.5, 1.6, 1.7"/>
-            <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0"/>
+            <moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1, 4.0, 5.0, 6.0, 6.1"/>
+            <moduleType types="jst.ejb" versions="1.1, 2.0, 2.1, 3.0, 3.1, 3.2, 4.0"/>
+            <moduleType types="jst.connector" versions="1.0, 1.5, 1.6, 1.7, 2.0, 2.1"/>
+            <moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0, 9.0, 9.1, 10.0"/>
             <moduleType types="jst.utility"  versions="1.0"/>
-            <moduleType types="jst.appclient" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0"/>
+            <moduleType types="jst.appclient" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0, 9.0, 9.1, 10.0"/>
         </runtimeType>
     </extension>
 
@@ -117,8 +117,8 @@
 
         <supported>
             <runtime-component id="payara.runtime" version="5"/>
-            <facet id="glassfish.web" version="5]"/>
-            <facet id="glassfish.ejb" version="5]"/>
+            <facet id="glassfish.web" version="5.0]"/>
+            <facet id="glassfish.ejb" version="5.0]"/>
             <facet id="jst.web" version="4.0]"/>
             <facet id="jst.ejb" version="3.2]"/>
             <facet id="jst.ear" version="8.0]"/>
@@ -130,10 +130,10 @@
 
         <supported>
             <runtime-component id="payara.runtime" version="6"/>
-            <facet id="glassfish.web" version="6]"/>
-            <facet id="glassfish.ejb" version="6]"/>
-            <facet id="jst.web" version="4.0]"/>
-            <facet id="jst.ejb" version="3.2]"/>
+            <facet id="glassfish.web" version="6.0]"/>
+            <facet id="glassfish.ejb" version="6.0]"/>
+            <facet id="jst.web" version="6.0]"/>
+            <facet id="jst.ejb" version="4.0]"/>
             <facet id="jst.ear" version="8.0]"/>
             <facet id="jst.connector" version="1.7]"/>
             <facet id="jst.appclient" version="8.0]"/>
@@ -185,7 +185,19 @@
             </constraint>
         </project-facet-version>
 
-        <project-facet-version facet="glassfish.web" version="5">
+        <project-facet-version facet="glassfish.web" version="5.0">
+            <action type="INSTALL">
+                <delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
+            </action>
+            <action  type="UNINSTALL">
+                <delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
+            </action>   
+            <constraint>
+                <requires facet="jst.web"/>
+            </constraint>
+        </project-facet-version>
+
+        <project-facet-version facet="glassfish.web" version="6.0">
             <action type="INSTALL">
                 <delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
             </action>
@@ -221,7 +233,7 @@
             </constraint>
         </project-facet-version>
 
-        <project-facet-version facet="glassfish.ejb" version="5">
+        <project-facet-version facet="glassfish.ejb" version="5.0">
             <action type="INSTALL">
                 <delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
             </action>
@@ -272,26 +284,40 @@
                 <runtime-component id="payara.runtime" version="5"/>
                 <fixed-facet id="jst.web"/>
             </context>
-            <facet id="glassfish.web" version="5" />
+            <facet id="glassfish.web" version="5.0" />
         </default-facets>        
 
         <default-facets>
             <context>
                 <runtime-component id="payara.runtime" version="5"/>
                 <fixed-facet id="jst.ejb"/>
             </context>
-            <facet id="glassfish.ejb" version="5" />
+            <facet id="glassfish.ejb" version="5.0" />
+        </default-facets>  
+
+        <default-facets>
+            <context>
+                <runtime-component id="payara.runtime" version="6"/>
+                <fixed-facet id="jst.web"/>
+            </context>
+            <facet id="glassfish.web" version="6.0" />
+        </default-facets>   
+
+        <default-facets>
+            <context>
+                <runtime-component id="payara.runtime" version="6"/>
+                <fixed-facet id="jst.ejb"/>
+            </context>
+            <facet id="glassfish.ejb" version="6.0" />
         </default-facets>        
     </extension>
-    
+
     <extension point="org.eclipse.wst.common.project.facet.core.runtimeBridges">    
         <bridge
             id="fish.payara.eclipse.tools.server.bridge"
             class="fish.payara.eclipse.tools.server.internal.PayaraRuntimeBridge"/>
     </extension>
-  
-  
-  
+
 
     <!--
        JST Facets