From d7ece67c364e76f3efaef4a2837d9f5026b43450 Mon Sep 17 00:00:00 2001 From: Andrea Manzi Date: Wed, 24 Apr 2013 22:01:46 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-transfer/uri-resolver@74040 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 3 +-- .../datatransfer/resolver/http/HttpResolver.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8204ca7..3356216 100644 --- a/pom.xml +++ b/pom.xml @@ -25,14 +25,12 @@ org.gcube.contentmanagement storage-manager-wrapper [2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT) - provided org.gcube.contentmanagement storage-manager-core [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) - provided slf4j-nop @@ -44,6 +42,7 @@ javax.servlet javax.servlet-api 3.0.1 + provided diff --git a/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java b/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java index 430810d..9558114 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java @@ -5,6 +5,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.URL; import java.net.URLConnection; +import java.net.URLStreamHandler; import javax.servlet.ServletConfig; @@ -15,6 +16,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.gcube.contentmanager.storageclient.model.protocol.smp.Handler; +import org.gcube.contentmanager.storageclient.model.protocol.smp.SMPURLConnection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +42,7 @@ public class HttpResolver extends HttpServlet { protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { + logger.info("The http session id is: " + request.getSession().getId()); @@ -66,8 +69,15 @@ public class HttpResolver extends HttpServlet { response.addHeader("content-disposition", "attachment; filename=" +name); response.setContentType("unknown/unknown"); + - URL url = new URL(uri); + URL url = new URL(null, uri, new URLStreamHandler() { + + @Override + protected URLConnection openConnection(URL u) throws IOException { + return new SMPURLConnection(u); + } + }); URLConnection uc = null;