diff --git a/src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/HTML_Page.java b/src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/Geoportal_HTML_Page.java similarity index 99% rename from src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/HTML_Page.java rename to src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/Geoportal_HTML_Page.java index d2a6f28..bca482f 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/HTML_Page.java +++ b/src/main/java/org/gcube/datatransfer/resolver/geoportal/exporter/Geoportal_HTML_Page.java @@ -1,6 +1,6 @@ package org.gcube.datatransfer.resolver.geoportal.exporter; -public class HTML_Page { +public class Geoportal_HTML_Page { /** * Sets the HTML message. diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalExporter.java b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalExporter.java index 13a8d68..3d0a46d 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalExporter.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/GeoportalExporter.java @@ -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"); diff --git a/src/main/webapp/WEB-INF/jsp/geoportal_exporter.jsp b/src/main/webapp/WEB-INF/jsp/geoportal_exporter.jsp deleted file mode 100644 index d232f58..0000000 --- a/src/main/webapp/WEB-INF/jsp/geoportal_exporter.jsp +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -D4Science Geoportal - Action - - - - D4Science Logo -
-
-

Exporting as PDF...

- D4Science Geoportal Loading...
-
-

The project with 661d2c6f8804530afb90b132

-
- - \ No newline at end of file diff --git a/src/test/java/gis/RuntimeResourceReader.java b/src/test/java/gis/RuntimeResourceReader.java index 12cf884..ebec3fd 100644 --- a/src/test/java/gis/RuntimeResourceReader.java +++ b/src/test/java/gis/RuntimeResourceReader.java @@ -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";