Skip to content

Commit 7f2dcc0

Browse files
jGauravGuptajGauravGupta
authored
Merge pull request #82 from jGauravGupta/FISH-7888
FISH-7888 Payara Tools for Eclipse does not allow the creation of Dynamic Web Project 6.0
2 parents ec05173 + e94b3d0 commit 7f2dcc0

1 file changed

Lines changed: 73 additions & 23 deletions

File tree

  • bundles/fish.payara.eclipse.tools.server

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

Lines changed: 73 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
name="%runtimeTypeNameglassfish"
2727
description="%runtimeTypeDescriptionglassfish"
2828
vendor="%runtimeTypeGlassFishVendor">
29-
<moduleType types="jst.web" versions="2.2, 2.3, 2.4, 2.5, 3.0, 3.1, 4.0"/>
30-
<moduleType types="jst.ejb" versions="1.1, 2.0, 2.1, 3.0, 3.1, 3.2"/>
31-
<moduleType types="jst.connector" versions="1.0, 1.5, 1.6, 1.7"/>
32-
<moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0"/>
29+
<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"/>
30+
<moduleType types="jst.ejb" versions="1.1, 2.0, 2.1, 3.0, 3.1, 3.2, 4.0, 4.1"/>
31+
<moduleType types="jst.connector" versions="1.0, 1.5, 1.6, 1.7, 2.0, 2.1"/>
32+
<moduleType types="jst.ear" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0"/>
3333
<moduleType types="jst.utility" versions="1.0"/>
34-
<moduleType types="jst.appclient" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0"/>
34+
<moduleType types="jst.appclient" versions="1.2, 1.3, 1.4, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0"/>
3535
</runtimeType>
3636
</extension>
3737

@@ -117,8 +117,8 @@
117117

118118
<supported>
119119
<runtime-component id="payara.runtime" version="5"/>
120-
<facet id="glassfish.web" version="5]"/>
121-
<facet id="glassfish.ejb" version="5]"/>
120+
<facet id="glassfish.web" version="5.0]"/>
121+
<facet id="glassfish.ejb" version="5.0]"/>
122122
<facet id="jst.web" version="4.0]"/>
123123
<facet id="jst.ejb" version="3.2]"/>
124124
<facet id="jst.ear" version="8.0]"/>
@@ -130,15 +130,15 @@
130130

131131
<supported>
132132
<runtime-component id="payara.runtime" version="6"/>
133-
<facet id="glassfish.web" version="6]"/>
134-
<facet id="glassfish.ejb" version="6]"/>
135-
<facet id="jst.web" version="4.0]"/>
136-
<facet id="jst.ejb" version="3.2]"/>
137-
<facet id="jst.ear" version="8.0]"/>
138-
<facet id="jst.connector" version="1.7]"/>
139-
<facet id="jst.appclient" version="8.0]"/>
133+
<facet id="glassfish.web" version="6.0]"/>
134+
<facet id="glassfish.ejb" version="6.0]"/>
135+
<facet id="jst.web" version="6.0]"/>
136+
<facet id="jst.ejb" version="4.0]"/>
137+
<facet id="jst.ear" version="10.0]"/>
138+
<facet id="jst.connector" version="2.1]"/>
139+
<facet id="jst.appclient" version="10.0]"/>
140140
<facet id="jst.utility" version="1.0"/>
141-
<facet id="jst.webfragment" version="4.0]" />
141+
<facet id="jst.webfragment" version="6.0]" />
142142
</supported>
143143
</extension>
144144

@@ -185,7 +185,31 @@
185185
</constraint>
186186
</project-facet-version>
187187

188-
<project-facet-version facet="glassfish.web" version="5">
188+
<project-facet-version facet="glassfish.web" version="5.0">
189+
<action type="INSTALL">
190+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
191+
</action>
192+
<action type="UNINSTALL">
193+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
194+
</action>
195+
<constraint>
196+
<requires facet="jst.web"/>
197+
</constraint>
198+
</project-facet-version>
199+
200+
<project-facet-version facet="glassfish.web" version="6.0">
201+
<action type="INSTALL">
202+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
203+
</action>
204+
<action type="UNINSTALL">
205+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
206+
</action>
207+
<constraint>
208+
<requires facet="jst.web"/>
209+
</constraint>
210+
</project-facet-version>
211+
212+
<project-facet-version facet="glassfish.web" version="6.1">
189213
<action type="INSTALL">
190214
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
191215
</action>
@@ -208,6 +232,18 @@
208232
<requires facet="jst.ejb"/>
209233
</constraint>
210234
</project-facet-version>
235+
236+
<project-facet-version facet="glassfish.ejb" version="3.2">
237+
<action type="INSTALL">
238+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
239+
</action>
240+
<action type="UNINSTALL">
241+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
242+
</action>
243+
<constraint>
244+
<requires facet="jst.ejb"/>
245+
</constraint>
246+
</project-facet-version>
211247

212248
<project-facet-version facet="glassfish.ejb" version="4.0">
213249
<action type="INSTALL">
@@ -221,7 +257,7 @@
221257
</constraint>
222258
</project-facet-version>
223259

224-
<project-facet-version facet="glassfish.ejb" version="5">
260+
<project-facet-version facet="glassfish.ejb" version="4.1">
225261
<action type="INSTALL">
226262
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
227263
</action>
@@ -272,26 +308,40 @@
272308
<runtime-component id="payara.runtime" version="5"/>
273309
<fixed-facet id="jst.web"/>
274310
</context>
275-
<facet id="glassfish.web" version="5" />
311+
<facet id="glassfish.web" version="5.0" />
276312
</default-facets>
277313

278314
<default-facets>
279315
<context>
280316
<runtime-component id="payara.runtime" version="5"/>
281317
<fixed-facet id="jst.ejb"/>
282318
</context>
283-
<facet id="glassfish.ejb" version="5" />
319+
<facet id="glassfish.ejb" version="5.0" />
320+
</default-facets>
321+
322+
<default-facets>
323+
<context>
324+
<runtime-component id="payara.runtime" version="6"/>
325+
<fixed-facet id="jst.web"/>
326+
</context>
327+
<facet id="glassfish.web" version="6.0" />
328+
</default-facets>
329+
330+
<default-facets>
331+
<context>
332+
<runtime-component id="payara.runtime" version="6"/>
333+
<fixed-facet id="jst.ejb"/>
334+
</context>
335+
<facet id="glassfish.ejb" version="6.0" />
284336
</default-facets>
285337
</extension>
286-
338+
287339
<extension point="org.eclipse.wst.common.project.facet.core.runtimeBridges">
288340
<bridge
289341
id="fish.payara.eclipse.tools.server.bridge"
290342
class="fish.payara.eclipse.tools.server.internal.PayaraRuntimeBridge"/>
291343
</extension>
292-
293-
294-
344+
295345

296346
<!--
297347
JST Facets

0 commit comments

Comments
 (0)