gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed unused jsp. refactored class

This commit is contained in:
Francesco Mangiacrapa 2024-04-30 15:41:08 +02:00
parent 9127e2b192
commit 7f21316769
4 changed files with 5 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/HTML_Page.java → src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/Geoportal_HTML_Page.java
View File

@ -1,6 +1,6 @@
package org.gcube.datatransfer.resolver.geoportal.exporter;
public class HTML_Page {
public class Geoportal_HTML_Page {
/**
* Sets the HTML message.

4
src/main/java/org/gcube/datatransfer/resolver/services/GeoportalExporter.java
View File

@ -32,7 +32,7 @@ import org.gcube.common.authorization.utils.user.User;
import org.gcube.datatransfer.resolver.ConstantsResolver;
import org.gcube.datatransfer.resolver.geoportal.exporter.FetchPDF;
import org.gcube.datatransfer.resolver.geoportal.exporter.GeoportalJsonResponse;
import org.gcube.datatransfer.resolver.geoportal.exporter.HTML_Page;
import org.gcube.datatransfer.resolver.geoportal.exporter.Geoportal_HTML_Page;
import org.gcube.datatransfer.resolver.services.error.ExceptionManager;
import org.gcube.datatransfer.resolver.services.exceptions.BadRequestException;
import org.gcube.datatransfer.resolver.util.SingleFileStreamingOutput;
@ -190,7 +190,7 @@ public class GeoportalExporter {
String serviceViewPDF_URL = String.format("%s/%s/view/%s", Util.getServerURL(req), "geoportal",
jobCode);
String entity = HTML_Page.entityHTMLMessage("Exporting as PDF...",
String entity = Geoportal_HTML_Page.entityHTMLMessage("Exporting as PDF...",
"The project with id: " + projectID, true, serviceViewPDF_URL);
LOG.info("returning waiting HTML page");

43
src/main/webapp/WEB-INF/jsp/geoportal_exporter.jsp
View File

@ -1,43 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<meta content="text/html;charset=utf-8" http-equiv="Content-Type">
<meta content="utf-8" http-equiv="encoding">
<style>
html, body {
margin: 10px;
width: 100%;
height: 100%;
display: table
}
#content {
position: absolute;
left: 50%;
top: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
text-align: center;
}
#message {
color: gray;
font-size: 24px;
}
</style>
<title>D4Science Geoportal - Action</title>
</head>
<body>
<img alt="D4Science Logo"
src="https://services.d4science.org/image/layout_set_logo?img_id=32727">
<br />
<div id="content">
<p style="font-size: 18px;">Exporting as PDF...</p>
<img alt="D4Science Geoportal Loading..."
src="uri-resolver/img/loading-gears.gif"><br />
<br />
<p id="message">The project with 661d2c6f8804530afb90b132</p>
</div>
</body>
</html>

4
src/test/java/gis/RuntimeResourceReader.java
View File

@ -127,9 +127,9 @@ public class RuntimeResourceReader {
// String scope = "/pred4s/preprod/preVRE";
// String scope = "/d4science.research-infrastructures.eu/D4OS/GNA";
// String scope = "/gcube/devsec/devVRE";
String scope = "/gcube/devsec/devVRE";
//String scope = "/d4science.research-infrastructures.eu/gCubeApps/Esquiline";
String scope = "/d4science.research-infrastructures.eu/D4OS/ARIADNEplus_Project";
// String scope = "/d4science.research-infrastructures.eu/D4OS/ARIADNEplus_Project";
String platformName = "geonetwork";
String category = "Gis";