From f635ae38717a174bad8283e2349c47d5e8a80900 Mon Sep 17 00:00:00 2001
From: "giancarlo.panichi" <giancarlo.panichi@isti.cnr.it>
Date: Tue, 22 Nov 2016 15:06:25 +0000
Subject: [PATCH] Updated support for Storage

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager@134536 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  6 ++--
 distro/changelog.xml                          |  5 ++++
 pom.xml                                       |  2 +-
 .../server/storage/StorageUtil.java           | 28 +++++--------------
 4 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/.classpath b/.classpath
index d03a6f4..30095de 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/accounting-manager-1.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/accounting-manager-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/accounting-manager-1.4.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/accounting-manager-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/accounting-manager-1.4.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/accounting-manager-1.5.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index ffd066a..694dce3 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets.admin.accounting-manager.1-5-0"
+		date="2016-12-01">
+		<Change>Added Context Chart</Change>
+		<Change>Added Cache</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets.admin.accounting-manager.1-4-0"
 		date="2016-10-01">
 		<Change>Updated to AUTH2.0</Change>
diff --git a/pom.xml b/pom.xml
index fc6483e..c740917 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.admin</groupId>
 	<artifactId>accounting-manager</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java
index 990a6c0..9dad10a 100644
--- a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java
+++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/storage/StorageUtil.java
@@ -4,15 +4,8 @@ import java.io.InputStream;
 
 import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.HomeLibrary;
-import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
-import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.exceptions.InsufficientPrivilegesException;
-import org.gcube.common.homelibrary.home.workspace.exceptions.ItemAlreadyExistException;
-import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException;
-import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException;
-import org.gcube.common.homelibrary.home.workspace.exceptions.WrongDestinationException;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.portlets.admin.accountingmanager.shared.exception.ServiceException;
@@ -56,8 +49,9 @@ public class StorageUtil {
 						"Attention no public link for this item!");
 			}
 
-		} catch (Exception e) {
-			e.printStackTrace();
+		} catch (Throwable e) {
+			logger.error("getPublicLink: "
+					+ e.getLocalizedMessage(),e);
 			throw new ServiceException(e.getLocalizedMessage());
 
 		}
@@ -85,13 +79,9 @@ public class StorageUtil {
 			}
 			return workspaceItem.getId();
 
-		} catch (WorkspaceFolderNotFoundException | InternalErrorException
-				| HomeNotFoundException | InsufficientPrivilegesException
-				| ItemAlreadyExistException | WrongDestinationException
-				| ItemNotFoundException e) {
+		} catch (Throwable e) {
 			logger.error("CreateAccountingFolderOnWorkspace: "
-					+ e.getLocalizedMessage());
-			e.printStackTrace();
+					+ e.getLocalizedMessage(),e);
 			throw new ServiceException(e.getLocalizedMessage(), e);
 
 		}
@@ -130,12 +120,8 @@ public class StorageUtil {
 				throw new ServiceException("Invalid destination folder!");
 			}
 
-		} catch (WorkspaceFolderNotFoundException | InternalErrorException
-				| HomeNotFoundException | InsufficientPrivilegesException
-				| ItemAlreadyExistException | WrongDestinationException
-				| ItemNotFoundException e) {
-			logger.error("SaveOnWorkspace: " + e.getLocalizedMessage());
-			e.printStackTrace();
+		} catch (Throwable e) {
+			logger.error("SaveOnWorkspace: " + e.getLocalizedMessage(), e);
 			throw new ServiceException(e.getLocalizedMessage(), e);
 
 		}