From 05c63f1d309396e528d66ebf3bb250351f5d5104 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Mon, 20 Jan 2014 18:35:42 +0000 Subject: [PATCH] added FTP Maanager git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerSocial@90272 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../social/ftp/FTPManager.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ftp/FTPManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ftp/FTPManager.java index 9598da8..5dea787 100644 --- a/src/main/java/org/gcube/applicationsupportlayer/social/ftp/FTPManager.java +++ b/src/main/java/org/gcube/applicationsupportlayer/social/ftp/FTPManager.java @@ -7,6 +7,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.util.List; +import java.util.ServiceConfigurationError; import java.util.UUID; import org.apache.commons.io.IOUtils; @@ -32,6 +33,7 @@ public class FTPManager { */ private static String RUNTIME_RESOURCE_NAME = "SocialPortalStorage"; private static String CATEGORY_NAME = "FTPServer"; + private static String UPLOAD_FOLDER_NAME = "previews"; private static FTPManager singleton; @@ -65,7 +67,7 @@ public class FTPManager { String user = ""; String pwd = ""; String httpBaseURL = ""; - String fileName = UUID.randomUUID() + "." + imageExtension.toString().toLowerCase(); + String fileName = UPLOAD_FOLDER_NAME + "/" + UUID.randomUUID() + "." + imageExtension.toString().toLowerCase(); try { ServiceEndpoint res = endPoint; AccessPoint ac = res.profile().accessPoints().iterator().next(); @@ -99,11 +101,18 @@ public class FTPManager { _log.error( "Problem disconnecting from FTP server" ); } } - StringBuilder sb = new StringBuilder().append(httpBaseURL).append("/").append(fileName); + StringBuilder sb = new StringBuilder().append(httpBaseURL).append(fileName); _log.info( "Uploaded file FTP server: http url: " + sb ); return sb.toString(); } + public String getBaseURL() throws Exception { + String httpBaseURL = endPoint.profile().runtime().hostedOn()+UPLOAD_FOLDER_NAME+"/"; + if (httpBaseURL != null) { + return httpBaseURL; + } + else throw new ServiceConfigurationError("Could not find a valid FTP Server in the infrastructure"); + } /** * * @return the runtime resource of the FTP Server node