Merge branch 'master' into copilot/support-custom-gradle-build-directory

Author: jGauravGupta

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

@@ -235,7 +235,14 @@ export class Maven implements Build {
     }
 
     public getBuildDir(): string {
-        let targetDir = path.join(this.workspaceFolder.uri.fsPath, 'target');
+        let buildDirValue = 'target';
+        if (this.pomReader instanceof MavenPomReader) {
+            let customDir = this.pomReader.getBuildDirectory();
+            if (customDir.length > 0) {
+                buildDirValue = customDir;
+            }
+        }
+        let targetDir = path.resolve(this.workspaceFolder.uri.fsPath, buildDirValue);
         if (!fs.existsSync(targetDir)) {
             throw Error("no target dir found: " + targetDir);
         }

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

@@ -29,6 +29,7 @@ export class MavenPomReader implements BuildReader {
     private artifactId: string = '';
     private version: string = '';
     private finalName: string = '';
+    private buildDirectory: string = '';
 
     public constructor(public workspaceFolder: WorkspaceFolder) {
         this.parsePom();
@@ -54,14 +55,20 @@ export class MavenPomReader implements BuildReader {
                         reader.groupId = project.groupId[0];
                         reader.artifactId = project.artifactId[0];
                         reader.version = project.version[0];
-                        reader.finalName = reader.parseBuild(project.build);
+                        reader.finalName = reader.parseFinalName(project.build);
+                        reader.buildDirectory = reader.parseBuildDirectory(project.build);
                         if (project.profiles
                             && project.profiles[0].profile) {
                             for (let profile of project.profiles[0].profile) {
-                                if (reader.finalName.length > 0) {
+                                if (reader.finalName.length > 0 && reader.buildDirectory.length > 0) {
                                     break;
                                 }
-                                reader.finalName = reader.parseBuild(profile.build);
+                                if (reader.finalName.length < 1) {
+                                    reader.finalName = reader.parseFinalName(profile.build);
+                                }
+                                if (reader.buildDirectory.length < 1) {
+                                    reader.buildDirectory = reader.parseBuildDirectory(profile.build);
+                                }
                             }
                         }
                         if (reader.finalName.length < 1) {
@@ -73,7 +80,7 @@ export class MavenPomReader implements BuildReader {
         }
     }
 
-    private parseBuild(build: any): string {
+    private parseFinalName(build: any): string {
         if (build
             && build[0]
             && build[0].finalName) {
@@ -82,6 +89,15 @@ export class MavenPomReader implements BuildReader {
         return '';
     }
 
+    private parseBuildDirectory(build: any): string {
+        if (build
+            && build[0]
+            && build[0].directory) {
+            return build[0].directory.toString();
+        }
+        return '';
+    }
+
     public getGroupId(): string {
         return this.groupId;
     }
@@ -98,4 +114,8 @@ export class MavenPomReader implements BuildReader {
         return this.finalName;
     }
 
+    public getBuildDirectory(): string {
+        return this.buildDirectory;
+    }
+
 }