Skip to content

Commit c6abd00

Browse files
authored
Merge pull request #65 from jGauravGupta/FISH-612
FISH-612 Release Payara VSCode extension 1.0.0
2 parents b28b3e7 + 7b4d23f commit c6abd00

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "payara-vscode",
33
"displayName": "Payara Tools",
44
"description": "Payara Tools for Visual Studio Code",
5-
"version": "0.0.5-SNAPSHOT",
5+
"version": "1.0.0",
66
"publisher": "Payara",
77
"icon": "resources/payara.png",
88
"repository": {

src/main/fish/payara/project/Gradle.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,15 @@ export class Gradle implements Build {
6565
var filename = path.join(buildDir, artifacts[i]);
6666
if (remote) {
6767
if (artifacts[i].endsWith('.war')
68-
|| artifacts[i].endsWith('.jar')) {
68+
|| artifacts[i].endsWith('.jar')
69+
|| artifacts[i].endsWith('.rar')) {
6970
artifact = filename;
7071
break;
7172
}
7273
} else {
7374
if (artifacts[i].endsWith('.war')
7475
|| artifacts[i].endsWith('.jar')
76+
|| artifacts[i].endsWith('.rar')
7577
|| artifacts[i] === this.getBuildReader().getFinalName()) {
7678
artifact = filename;
7779
break;
@@ -81,7 +83,13 @@ export class Gradle implements Build {
8183
if (artifact !== null) {
8284
callback(artifact);
8385
} else {
84-
vscode.window.showErrorMessage(artifact + ' not found.');
86+
let errorMessage = 'Deployment artifact not found in the target.';
87+
if(remote) {
88+
vscode.window.showErrorMessage(errorMessage
89+
+ ' Make sure the deployment file ends with .jar, .rar, or .war to deploy an application to the remote instance.');
90+
} else {
91+
vscode.window.showErrorMessage(errorMessage);
92+
}
8593
}
8694
}
8795
if (code !== 0) {

src/main/fish/payara/project/Maven.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,15 @@ export class Maven implements Build {
6464
var filename = path.join(targetDir, artifacts[i]);
6565
if (remote) {
6666
if (artifacts[i].endsWith('.war')
67-
|| artifacts[i].endsWith('.jar')) {
67+
|| artifacts[i].endsWith('.jar')
68+
|| artifacts[i].endsWith('.rar')) {
6869
artifact = filename;
6970
break;
7071
}
7172
} else {
7273
if (artifacts[i].endsWith('.war')
7374
|| artifacts[i].endsWith('.jar')
75+
|| artifacts[i].endsWith('.rar')
7476
|| artifacts[i] === this.getBuildReader().getFinalName()) {
7577
artifact = filename;
7678
break;
@@ -80,7 +82,13 @@ export class Maven implements Build {
8082
if (artifact !== null) {
8183
callback(artifact);
8284
} else {
83-
vscode.window.showErrorMessage(artifact + ' not found.');
85+
let errorMessage = 'Deployment artifact not found in the target.';
86+
if(remote) {
87+
vscode.window.showErrorMessage(errorMessage
88+
+ ' Make sure the deployment file ends with .jar, .rar, or .war to deploy an application to the remote instance.');
89+
} else {
90+
vscode.window.showErrorMessage(errorMessage);
91+
}
8492
}
8593
}
8694
if (code !== 0) {

0 commit comments

Comments
 (0)