Skip to content

Commit 3ab32a9

Browse files
committed
FISH-7326 Enabled domain directory for WSL instance
1 parent 3fe2aaf commit 3ab32a9

3 files changed

Lines changed: 26 additions & 5 deletions

File tree

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

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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/src/fish/payara/eclipse/tools/server/PayaraServer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ public void setAdminUser(String value) {
535535
}
536536

537537
public String getDomainsFolder() {
538-
if (!isRemote()) {
538+
if (!isRemote() || isWSLInstance()) {
539539
return new File(getDomainPath()).getParent();
540540
}
541541

bundles/fish.payara.eclipse.tools.server/src/fish/payara/eclipse/tools/server/handlers/PayaraStateTester.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@ public boolean test(Object receiver, String property, Object[] args, Object expe
4444
}
4545
}
4646

47+
if (property.equals("isWSLInstance")) {
48+
PayaraServer payaraServer = load(server, PayaraServer.class);
49+
50+
if (payaraServer != null) {
51+
return payaraServer.isWSLInstance();
52+
}
53+
}
54+
4755
return false;
4856
}
4957

0 commit comments

Comments
 (0)