diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DownloadServlet.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DownloadServlet.java deleted file mode 100644 index d7ce8e9..0000000 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DownloadServlet.java +++ /dev/null @@ -1,58 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.dataminermanager.server; - - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.io.IOUtils; -import org.gcube.portlets.user.dataminermanager.server.storage.StorageUtil; - -/** - * - * @author Giancarlo Panichi - * email: g.panichi@isti.cnr.it - * - */ -public class DownloadServlet extends HttpServlet{ - - private static final long serialVersionUID = -8423345575690165644L; - - public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException { - - String requestType = (String)req.getParameter("type"); - - String smpUrl = (String)req.getParameter("url"); - - String fileName = req.getParameter("name"); - - System.out.println("DOWNLOAD SERVLET"); - System.out.println("SMP URL: "+smpUrl); - System.out.println("File name: "+fileName); - - try{ - if (requestType==null || !requestType.toUpperCase().contentEquals("IMAGES")) - resp.setHeader( "Content-Disposition", "attachment; filename=\"" + fileName + "\"" ); - - InputStream inputStream = StorageUtil.getStorageClientInputStream(smpUrl); - - OutputStream out = resp.getOutputStream(); - IOUtils.copy(inputStream, resp.getOutputStream()); - out.close(); - } catch (Exception e) { - System.out.println("Error during external item sending "+smpUrl); -// e.printStackTrace(); - resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "Error during data retrieving: "+e.getMessage()); - return; - } - } - - -} diff --git a/src/main/webapp/DataMinerManager.css b/src/main/webapp/DataMinerManager.css index eb4172d..680d968 100644 --- a/src/main/webapp/DataMinerManager.css +++ b/src/main/webapp/DataMinerManager.css @@ -159,7 +159,7 @@ margin: 0px 5px 5px 10px; /* top right bottom left*/ padding: 5px; overflow: hidden; - height: 64px; + height: 78px; } .operatorPanel-selected { diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index f897e40..8d3e60c 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -11,10 +11,6 @@ jUnitHostImpl com.google.gwt.junit.server.JUnitHostImpl - - DownloadService - org.gcube.portlets.user.dataminermanager.server.DownloadServlet - DownloadFolderServlet org.gcube.portlets.user.dataminermanager.server.DownloadFolderServlet @@ -47,10 +43,6 @@ jUnitHostImpl /dataminermanager/junithost/* - - DownloadService - /dataminermanager/DownloadService - DownloadFolderServlet /dataminermanager/DownloadFolderServlet