Fixed merging issues

WebGde/.classpath

@@ -11,11 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.payara.tools.lib.system">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -29,5 +24,10 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.payara.tools.lib.system">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

WebGde/.settings/org.eclipse.wst.common.project.facet.core.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Payara Server 5 (5.2022.1)"/>
+  <runtime name="Payara Server 5 (5.2021.1)"/>
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>

WebGde/WebContent/config.js

@@ -39,7 +39,7 @@ var HIGH_LIGHT_SCHEMA = "./src/highlight/dbSchema_anno.xlsx"
 //this determines if the images will be retrieved from the gfs
 var DOMAIN = "http://35.169.23.0:8080"
 var CONTEXTROOT = "gfs-explorer-ws"
-var GFS_URL = "http://35.169.23.0:8080" + "/WebGde/svc/gfs-rest"
+var GFS_URL = "http://54.175.99.64:8080" + "/WebGde/svc/gfs-rest"
 var FOLDER_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/"
 var DOWNLOAD_URL = DOMAIN + "/" + CONTEXTROOT +  "/svc/gfs-rest/get-download-link"
 var IS_RETRIEVE_FROM_GFS = "N"
@@ -48,11 +48,11 @@ var INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLoc
 
 //BPO CONFIG
 var IS_RETRIEVE_FROM_BPO = "Y"
-var BPO_URL = "http://35.169.23.0:8080/bpo/"
-var CURRENT_NODE = "Web_GDE_DEV_2"
+var BPO_URL = "http://54.175.99.64:8080/bpo/"
+var CURRENT_NODE = "Web GDE"
 var ENCODING_PASS = "PASS1"
-var NEXT_NODE = "Complete_DEV"
-var EXCEPTION_NODE = "Exception_DEV"
+var NEXT_NODE = "Complete"
+var EXCEPTION_NODE = "Exception"
 
 var PDF_EXTENSION = ".pdf"
 var JPG_EXTENSION = ".jpg"

WebGde/WebContent/src/accessFile/accessFile.js

@@ -80,7 +80,7 @@ async function accessFile() {
 								if (ctrlImg) {
 								  ctrlImg.outerHTML="";	
 								}
-                                displayPdf(idQuery.result.path);
+                                displayPdf(url);
                             } 
                             else if(idQuery.result.name.endsWith(JPG_EXTENSION) || idQuery.result.name.endsWith(PNG_EXTENSION)){
                             	sessionStorage.setItem("file_Name", idQuery.result.name);
@@ -137,7 +137,7 @@ async function accessFile() {
 								if (ctrlImg) {
 								  ctrlImg.outerHTML="";	
 								}
-                                displayPdf(idQuery.result.path);
+                                displayPdf(url);
                             } 
                             else if(idQuery.result.name.endsWith(JPG_EXTENSION) || idQuery.result.name.endsWith(PNG_EXTENSION)){
                             	sessionStorage.setItem("file_Name", idQuery.result.name);
@@ -291,7 +291,7 @@ async function accessFile() {
 						if (ctrlImg) {
 						  ctrlImg.outerHTML="";	
 						}
-                        displayPdf(img);
+                        displayPdf(url);
                     } 
                     else if(filename.endsWith(JPG_EXTENSION) || filename.endsWith(PNG_EXTENSION)){
                     	sessionStorage.setItem("file_Name", filename);
@@ -733,7 +733,7 @@ function refreshImage() {
 						  ctrlTiff.outerHTML="";
 						  ctrlImg.outerHTML="";	
 						}
-                        displayPdf(idQuery.result.path);
+                        displayPdf(url);
                     } 
                     else if(idQuery.result.name.endsWith(JPG_EXTENSION) || idQuery.result.name.endsWith(PNG_EXTENSION)){
                     	sessionStorage.setItem("file_Name", idQuery.result.name);

WebGde/src/main/java/com/svi/webgde/restservice/services/GDEWebServices.java

 package com.svi.webgde.restservice.services;
 
-import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileReader;
@@ -9,10 +8,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.nio.file.Files;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Iterator;
 import java.util.TimeZone;
 
 import javax.json.JsonObject;
@@ -27,12 +24,10 @@ import javax.ws.rs.core.Response.ResponseBuilder;
 import javax.ws.rs.core.StreamingOutput;
 
 import org.json.JSONObject;
-import org.json.simple.JSONArray;
 
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
-import com.svi.template.restservice.globals.AppConfig;
-import com.svi.training.services.Request;
+import com.svi.webgde.restservice.object.Request;
 import com.svi.webgde.restservice.object.XMLContents;
 import com.svi.webgde.restservice.utils.XMLUtil;
 
@@ -277,7 +272,7 @@ public class GDEWebServices {
 
 	    // return file contents in blob format with filename in content-disposition header
 	    ResponseBuilder response = Response.ok(file);
-	    response.header("content-disposition", "attachment; filename = " + file.getName());
+	    response.header("content-disposition", String.format("attachment; filename=\"%s\"", file.getName()));
 	    return response.build();
 	}
 }