Skip to content

Commit 7b6d214

Browse files
luiseufrasioluiseufrasio
committed
Merge branch '2.x' into FISH-6772-javaee8-to-jakartaee10
2 parents 8279d73 + e69732c commit 7b6d214

49 files changed

Lines changed: 2198 additions & 1770 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
/.metadata/.plugins/org.eclipse.m2e.core.ui/dialog_settings.xml
3232
/.metadata/.plugins/org.eclipse.m2e.core/workspaceState.ser
3333
/.metadata/.plugins/org.eclipse.m2e.logback/0.log
34-
/.metadata/.plugins/org.eclipse.m2e.logback/logback.2.1.0.20221015-0744.xml
34+
/.metadata/.plugins/org.eclipse.m2e.logback/logback.2.2.0.20221015-0744.xml
3535
/.metadata/.plugins/org.eclipse.oomph.setup/workspace.setup
3636
/.metadata/.plugins/org.eclipse.tips.ide/dialog_settings.xml
3737
/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

‎bundles/fish.payara.eclipse.tools.micro/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Payara Micro Tools
44
Bundle-SymbolicName: fish.payara.eclipse.tools.micro;singleton:=true
5-
Bundle-Version: 2.1.0
5+
Bundle-Version: 2.2.0
66
Bundle-ClassPath: .
77
Bundle-Localization: plugin
88
Bundle-Activator: fish.payara.eclipse.tools.micro.PayaraMicroPlugin

‎bundles/fish.payara.eclipse.tools.micro/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>fish.payara.eclipse</groupId>
1111
<artifactId>fish.payara.eclipse.bundles</artifactId>
12-
<version>2.1.0</version>
12+
<version>2.2.0</version>
1313
</parent>
1414
<build>
1515
<sourceDirectory>src</sourceDirectory>

‎bundles/fish.payara.eclipse.tools.micro/src/fish/payara/eclipse/tools/micro/ui/wizards/MicroProjectWizardPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void createControl(Composite parent) {
6060
createUI(composite);
6161
validate();
6262
createAdvancedSettings(composite, new GridData(SWT.FILL, SWT.TOP, false, false, 3, 1));
63-
resolverConfigurationComponent.setModifyListener(e -> validate());
63+
// resolverConfigurationComponent.setModifyListener(e -> validate());
6464
setControl(composite);
6565
}
6666

‎bundles/fish.payara.eclipse.tools.server/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Payara Server Tools
44
Bundle-SymbolicName: fish.payara.eclipse.tools.server;singleton:=true
5-
Bundle-Version: 2.1.0
5+
Bundle-Version: 2.2.0
66
Bundle-ClassPath: .
77
Bundle-Localization: plugin
88
Bundle-Activator: fish.payara.eclipse.tools.server.PayaraServerPlugin

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

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@
163163

164164
<project-facet-version facet="glassfish.web" version="3.1">
165165
<action type="INSTALL">
166-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetInstallDelegate"/>
166+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
167167
</action>
168168
<action type="UNINSTALL">
169-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetUninstallDelegate"/>
169+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
170170
</action>
171171
<constraint>
172172
<requires facet="jst.web"/>
@@ -175,10 +175,10 @@
175175

176176
<project-facet-version facet="glassfish.web" version="4.0">
177177
<action type="INSTALL">
178-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetInstallDelegate"/>
178+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
179179
</action>
180180
<action type="UNINSTALL">
181-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetUninstallDelegate"/>
181+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
182182
</action>
183183
<constraint>
184184
<requires facet="jst.web"/>
@@ -187,10 +187,10 @@
187187

188188
<project-facet-version facet="glassfish.web" version="5">
189189
<action type="INSTALL">
190-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetInstallDelegate"/>
190+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetInstallDelegate"/>
191191
</action>
192192
<action type="UNINSTALL">
193-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishWebFacetUninstallDelegate"/>
193+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraWebFacetUninstallDelegate"/>
194194
</action>
195195
<constraint>
196196
<requires facet="jst.web"/>
@@ -199,10 +199,10 @@
199199

200200
<project-facet-version facet="glassfish.ejb" version="3.1">
201201
<action type="INSTALL">
202-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetInstallDelegate"/>
202+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
203203
</action>
204204
<action type="UNINSTALL">
205-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetUninstallDelegate"/>
205+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
206206
</action>
207207
<constraint>
208208
<requires facet="jst.ejb"/>
@@ -211,10 +211,10 @@
211211

212212
<project-facet-version facet="glassfish.ejb" version="4.0">
213213
<action type="INSTALL">
214-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetInstallDelegate"/>
214+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
215215
</action>
216216
<action type="UNINSTALL">
217-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetUninstallDelegate"/>
217+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
218218
</action>
219219
<constraint>
220220
<requires facet="jst.ejb"/>
@@ -223,10 +223,10 @@
223223

224224
<project-facet-version facet="glassfish.ejb" version="5">
225225
<action type="INSTALL">
226-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetInstallDelegate"/>
226+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetInstallDelegate"/>
227227
</action>
228228
<action type="UNINSTALL">
229-
<delegate class="fish.payara.eclipse.tools.server.facets.GlassfishEjbFacetUninstallDelegate"/>
229+
<delegate class="fish.payara.eclipse.tools.server.facets.PayaraEjbFacetUninstallDelegate"/>
230230
</action>
231231
<constraint>
232232
<requires facet="jst.ejb"/>
@@ -686,7 +686,7 @@
686686
class="fish.payara.eclipse.tools.server.handlers.PayaraStateTester"
687687
id="fish.payara.eclipse.tools.server.PayaraStateTester"
688688
namespace="fish.payara.eclipse.tools.server"
689-
properties="isRunning,isRemote"
689+
properties="isRunning,isRemote,isWSLInstance"
690690
type="org.eclipse.wst.server.core.IServer">
691691
</propertyTester>
692692
<propertyTester
@@ -739,6 +739,16 @@
739739
</and>
740740
</adapt>
741741
</definition>
742+
<definition id="fish.payara.eclipse.tools.server.isWSLInstance">
743+
<and>
744+
<count value="1"/>
745+
<iterate ifEmpty="false">
746+
<and>
747+
<test property="fish.payara.eclipse.tools.server.isWSLInstance"/>
748+
</and>
749+
</iterate>
750+
</and>
751+
</definition>
742752

743753
<definition id="fish.payara.eclipse.tools.server.moreGlassfishSelected">
744754
<iterate ifEmpty="false">
@@ -969,9 +979,12 @@
969979
>
970980
<enabledWhen>
971981
<and>
972-
<not>
973-
<reference definitionId="fish.payara.eclipse.tools.server.isRemoteGlassfish"/>
974-
</not>
982+
<or>
983+
<reference definitionId="fish.payara.eclipse.tools.server.isWSLInstance"/>
984+
<not>
985+
<reference definitionId="fish.payara.eclipse.tools.server.isRemoteGlassfish"/>
986+
</not>
987+
</or>
975988
<reference definitionId="fish.payara.eclipse.tools.server.oneGlassfishSelected"/>
976989
</and>
977990
</enabledWhen>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>fish.payara.eclipse</groupId>
1111
<artifactId>fish.payara.eclipse.bundles</artifactId>
12-
<version>2.1.0</version>
12+
<version>2.2.0</version>
1313
</parent>
1414
<build>
1515
<sourceDirectory>src</sourceDirectory>

0 commit comments

Comments
 (0)