Merge pull request #65 from jGauravGupta/FISH-612

FISH-612 Release Payara VSCode extension 1.0.0
payara · Dec 18, 2020 · c6abd00 · c6abd00
2 parents b28b3e7 + 7b4d23f
commit c6abd00
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "payara-vscode",
 	"displayName": "Payara Tools",
 	"description": "Payara Tools for Visual Studio Code",
-	"version": "0.0.5-SNAPSHOT",
+	"version": "1.0.0",
 	"publisher": "Payara",
 	"icon": "resources/payara.png",
 	"repository": {

diff --git a/src/main/fish/payara/project/Gradle.ts b/src/main/fish/payara/project/Gradle.ts
@@ -65,13 +65,15 @@ export class Gradle implements Build {
                         var filename = path.join(buildDir, artifacts[i]);
                         if (remote) {
                             if (artifacts[i].endsWith('.war')
-                                || artifacts[i].endsWith('.jar')) {
+                                || artifacts[i].endsWith('.jar')
+                                || artifacts[i].endsWith('.rar')) {
                                 artifact = filename;
                                 break;
                             }
                         } else {
                             if (artifacts[i].endsWith('.war')
                                 || artifacts[i].endsWith('.jar')
+                                || artifacts[i].endsWith('.rar')
                                 || artifacts[i] === this.getBuildReader().getFinalName()) {
                                 artifact = filename;
                                 break;
@@ -81,7 +83,13 @@ export class Gradle implements Build {
                     if (artifact !== null) {
                         callback(artifact);
                     } else {
-                        vscode.window.showErrorMessage(artifact + ' not found.');
+                        let errorMessage = 'Deployment artifact not found in the target.';
+                        if(remote) {
+                            vscode.window.showErrorMessage(errorMessage 
+                                + ' Make sure the deployment file ends with .jar, .rar, or .war to deploy an application to the remote instance.');
+                        } else {
+                            vscode.window.showErrorMessage(errorMessage);
+                        }
                     }
                 }
                 if (code !== 0) {

diff --git a/src/main/fish/payara/project/Maven.ts b/src/main/fish/payara/project/Maven.ts
@@ -64,13 +64,15 @@ export class Maven implements Build {
                         var filename = path.join(targetDir, artifacts[i]);
                         if (remote) {
                             if (artifacts[i].endsWith('.war')
-                                || artifacts[i].endsWith('.jar')) {
+                                || artifacts[i].endsWith('.jar')
+                                || artifacts[i].endsWith('.rar')) {
                                 artifact = filename;
                                 break;
                             }
                         } else {
                             if (artifacts[i].endsWith('.war')
                                 || artifacts[i].endsWith('.jar')
+                                || artifacts[i].endsWith('.rar')
                                 || artifacts[i] === this.getBuildReader().getFinalName()) {
                                 artifact = filename;
                                 break;
@@ -80,7 +82,13 @@ export class Maven implements Build {
                     if (artifact !== null) {
                         callback(artifact);
                     } else {
-                        vscode.window.showErrorMessage(artifact + ' not found.');
+                        let errorMessage = 'Deployment artifact not found in the target.';
+                        if(remote) {
+                            vscode.window.showErrorMessage(errorMessage 
+                                + ' Make sure the deployment file ends with .jar, .rar, or .war to deploy an application to the remote instance.');
+                        } else {
+                            vscode.window.showErrorMessage(errorMessage);
+                        }
                     }
                 }
                 if (code !== 0) {