129: Updating workspace and workspace tree

Task-Url: https://support.d4science.org/issues/129

Converted all objects to GcubeItem
Updated pom version at 6.8.0

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@114816 82a268e6-3cf1-43bd-a215-b396298e98cf

pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace-tree-widget</artifactId>
-	<version>6.7.2-SNAPSHOT</version>
+	<version>6.8.0-SNAPSHOT</version>
 	<name>gCube Workspace Tree Widget</name>
 	<description>
 		gCube Workspace Tree Widget.
@@ -67,8 +67,8 @@
 			<artifactId>gxt2.2.5-gwt2.X</artifactId>
 			<version>2.7.0</version>
 			<scope>compile</scope>
-<!-- 			<scope>system</scope> -->
-<!-- 			<systemPath>/home/francesco-mangiacrapa/wseclipse/gxt2.2.5-gwt2.X/target/gxt2.2.5-gwt2.X.jar</systemPath> -->
+			<!-- <scope>system</scope> -->
+			<!-- <systemPath>/home/francesco-mangiacrapa/wseclipse/gxt2.2.5-gwt2.X/target/gxt2.2.5-gwt2.X.jar</systemPath> -->
 		</dependency>
 
 		<!-- PORTAL MANAGER -->
@@ -146,13 +146,15 @@
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library-jcr</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.common</groupId>
 			<artifactId>home-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<!-- <version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version> -->
+			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 			<exclusions>
 				<exclusion>
@@ -168,6 +170,11 @@
 			<version>3.1</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<version>1.4.5</version>
+		</dependency>
 		<!-- FILE UPLOAD-progress-bar -->
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>

src/main/java/org/gcube/portlets/user/workspace/client/AppControllerExplorer.java

@@ -615,7 +615,7 @@ public class AppControllerExplorer implements EventHandler, TreeAppControllerInt
 					//int last = currentUrl.lastIndexOf("/");
 					//String shareLinkUrl = currentUrl.substring(0,last+1) + "?" +ConstantsExplorer.GET_ITEMID_PARAMETER+"="+getLinkEvent.getSourceFile().getIdentifier();
 					String shareLinkUrl = currentUrl+ "?" +ConstantsExplorer.GET_ITEMID_PARAMETER+"="+getLinkEvent.getSourceFile().getIdentifier();
-					shareLinkUrl+="&"+ConstantsExplorer.GET_OPEARATION_PARAMETER+"="+WsPortletInitOperation.gotofolder;
+					shareLinkUrl+="&"+ConstantsExplorer.GET_OPERATION_PARAMETER+"="+WsPortletInitOperation.gotofolder;
 
 					DialogShareLink dialog = new DialogShareLink("Copy to clipboard Share Link: Ctrl+C", shareLinkUrl);
 					dialog.show();

src/main/java/org/gcube/portlets/user/workspace/client/ConstantsExplorer.java

@@ -196,7 +196,7 @@ public class ConstantsExplorer {
 	//USED IN HTTP GET AS PARAMETER.. THIS PARAMS ARE REPLICATED IN THE CONSTANTS OF TREE WIDGET
 	public static final String GET_SEARCH_PARAMETER ="search";
 	public static final String GET_ITEMID_PARAMETER ="itemid";
-	public static final String GET_OPEARATION_PARAMETER ="operation";
+	public static final String GET_OPERATION_PARAMETER ="operation";
 	public static enum WsPortletInitOperation {sharelink, gotofolder}; //INIT OPERATIONS
 	//DEFAULT INIT OPERATION
 	public static final WsPortletInitOperation DEFAULT_OPERATION = WsPortletInitOperation.gotofolder;

src/main/java/org/gcube/portlets/user/workspace/client/view/windows/WindowImagePreview.java

@@ -51,9 +51,4 @@ public class WindowImagePreview {
 		window.setPosition(positionX, positionY);
 	}
 
-
-	
-	
-	
-
 }

src/main/java/org/gcube/portlets/user/workspace/client/workspace/folder/item/GWTImage.java

@@ -39,6 +39,6 @@ public interface GWTImage {
 	/**
 	 * @return the thumbnailLength
 	 */
-	public long getThumbnailLenght();
+//	public long getThumbnailLenght();
 
 }

src/main/java/org/gcube/portlets/user/workspace/client/workspace/folder/item/gcube/GWTImageDocument.java

@@ -42,6 +42,7 @@ public class GWTImageDocument extends GWTDocument implements IsSerializable, GWT
 			String imageUrl, String thumbnailUrl, int width, int height, int thumbnailWidth, int thumbnailHeight, long thumbnailLenght, 
 			long length, String mimeType, String oid, Map<String, GWTDocumentMetadata> metadata, Map<String,String> annotation, 
 			String collection, int numberOfAlternatives, int numberOfParts) {
+		
 		super(creationTime, id, properties, name, owner, description, lastModificationTime, lastAction, parent, length, oid, 
 				mimeType, metadata, annotation, collection, numberOfAlternatives, numberOfParts);
 		
@@ -102,12 +103,12 @@ public class GWTImageDocument extends GWTDocument implements IsSerializable, GWT
 		return thumbnailHeight;
 	}
 
-	/**
-	 * @return the thumbnailLength
-	 */
-	public long getThumbnailLenght() {
-		return thumbnailLenght;
-	}
+//	/**
+//	 * @return the thumbnailLength
+//	 */
+//	public long getThumbnailLenght() {
+//		return thumbnailLenght;
+//	}
 
 	/**
 	 * {@inheritDoc}

src/main/java/org/gcube/portlets/user/workspace/server/DownloadServlet.java

@@ -21,6 +21,7 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.NodeProperty;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
@@ -30,16 +31,14 @@ import org.gcube.common.homelibrary.home.workspace.exceptions.ExternalResourceBr
 import org.gcube.common.homelibrary.home.workspace.exceptions.ExternalResourcePluginNotFoundException;
 import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
-import org.gcube.common.homelibrary.home.workspace.folder.items.AquaMapsItem;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalResourceLink;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalUrl;
+import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem;
 import org.gcube.common.homelibrary.home.workspace.folder.items.Query;
 import org.gcube.common.homelibrary.home.workspace.folder.items.Report;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ReportTemplate;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.Document;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.Metadata;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ts.TimeSeries;
 import org.gcube.common.homelibrary.util.Extensions;
 import org.gcube.common.homelibrary.util.MimeTypeUtil;
@@ -417,7 +416,7 @@ public class DownloadServlet extends HttpServlet{
 							return;
 						}
 					}
-					case AQUAMAPS_ITEM:{
+					/*case AQUAMAPS_ITEM:{
 						try{
 							AquaMapsItem aquamaps = (AquaMapsItem)folderItem;
 							File tmpZip = ZipUtil.zipAquaMapsItem(aquamaps);
@@ -443,14 +442,14 @@ public class DownloadServlet extends HttpServlet{
 //							sendError(resp,HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during data retrieving: "+e.getMessage());
 							return;
 						}
-					}
+					}*/
 					case IMAGE_DOCUMENT:
 					case PDF_DOCUMENT:
 					case URL_DOCUMENT:
 					case DOCUMENT:{
 						try{
-							Document document = (Document)item;
-
+//							Document document = (Document)item;
+							GCubeItem document = (GCubeItem) item; //Cast GCubeItem
 
 							if (!viewContent){
 								File tmpZip = ZipUtil.zipDocument(document);
@@ -494,16 +493,18 @@ public class DownloadServlet extends HttpServlet{
 
 					case METADATA:{
 						try{
-							Metadata document = (Metadata)item;
-
+//							Metadata document = (Metadata)item;
+							GCubeItem metadata = (GCubeItem) item; //Cast GCubeItem
+							
 							resp.setContentType("text/html");
-							resp.setContentLength((int) document.getLength());
+							resp.setContentLength((int) metadata.getLength());
 							
 							//MODIFIED 22-05-2013 CLOSE STREAM
 							OutputStream out = resp.getOutputStream();
-							StringReader sr = new StringReader(document.getData());
-							IOUtils.copy(sr, out);
-							sr.close();
+//							StringReader sr = new StringReader(metadata.getData());
+							InputStream is = metadata.getData();
+							IOUtils.copy(is, out);
+							is.close();
 							
 							out.close();
 
@@ -523,8 +524,7 @@ public class DownloadServlet extends HttpServlet{
 						try{
 							ExternalResourceLink externalResourceLink = (ExternalResourceLink) folderItem;
 							OutputStream out = resp.getOutputStream();
-			
-							
+
 							try {
 								String mimeType = externalResourceLink.getMimeType();
 								if(mimeType == null){

src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java

@@ -8,19 +8,22 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.gcube.DocumentAlternativeLink;
+import org.gcube.common.homelibary.model.items.gcube.DocumentMetadata;
+import org.gcube.common.homelibary.model.items.gcube.DocumentPartLink;
+import org.gcube.common.homelibary.model.items.type.NodeProperty;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.User;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Properties;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceSmartFolder;
 import org.gcube.common.homelibrary.home.workspace.accessmanager.ACLType;
@@ -37,25 +40,11 @@ import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryUns
 import org.gcube.common.homelibrary.home.workspace.accounting.AccountingEntryUpdate;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderBulkCreator;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
-import org.gcube.common.homelibrary.home.workspace.folder.items.AquaMapsItem;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalPDFFile;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalUrl;
 import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem;
-import org.gcube.common.homelibrary.home.workspace.folder.items.Query;
-import org.gcube.common.homelibrary.home.workspace.folder.items.Report;
-import org.gcube.common.homelibrary.home.workspace.folder.items.ReportTemplate;
-import org.gcube.common.homelibrary.home.workspace.folder.items.WorkflowReport;
-import org.gcube.common.homelibrary.home.workspace.folder.items.WorkflowTemplate;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.Document;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.DocumentMetadata;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.ImageDocument;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.Metadata;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.PDFDocument;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.UrlDocument;
-import org.gcube.common.homelibrary.home.workspace.folder.items.ts.TimeSeries;
-import org.gcube.common.homelibrary.home.workspace.folder.items.ts.TimeSeriesInfo;
 import org.gcube.common.homelibrary.home.workspace.search.SearchFolderItem;
 import org.gcube.common.homelibrary.home.workspace.search.SearchItem;
 import org.gcube.common.homelibrary.home.workspace.sharing.WorkspaceMessage;
@@ -81,22 +70,10 @@ import org.gcube.portlets.user.workspace.client.workspace.GWTProperties;
 import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceFolder;
 import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItem;
 import org.gcube.portlets.user.workspace.client.workspace.GWTWorkspaceItemAction;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTAquaMapsItem;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExternalFile;
 import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExternalImage;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExternalPDFFile;
 import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTExternalUrl;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTQuery;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTReport;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTReportTemplate;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTTimeSeries;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTWorkflowReport;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.GWTWorkflowTemplate;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTDocument;
 import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTDocumentMetadata;
 import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTImageDocument;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTMetadata;
-import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTPDFDocument;
 import org.gcube.portlets.user.workspace.client.workspace.folder.item.gcube.GWTUrlDocument;
 import org.gcube.portlets.user.workspace.server.util.UserUtil;
 import org.gcube.portlets.user.workspace.server.util.WsUtil;
@@ -106,6 +83,8 @@ import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingEntryTyp
 import org.gcube.portlets.user.workspace.shared.accounting.GxtAccountingField;
 import org.gcube.vomanagement.usermanagement.model.UserModel;
 
+import com.thoughtworks.xstream.XStream;
+
 
 /**
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
@@ -209,7 +188,7 @@ public class GWTWorkspaceBuilder {
 	protected GWTProperties buildGWTProperties(Properties metadata) throws InternalErrorException
 	{
 		//FIXME temp solution
-		//GWTProperties gwtProperties = new GWTProperties(metadata.getId(), metadata.getProperties());
+//		GWTProperties gwtProperties = new GWTProperties(metadata.getId(), metadata.getProperties());
 		return new GWTProperties();
 	}
 	
@@ -235,376 +214,376 @@ public class GWTWorkspaceBuilder {
 	}
 	
 	
-	protected GWTExternalFile buildGWTExternalFile(ExternalFile file, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(file.getProperties());
-		GWTExternalFile gwtFile = new GWTExternalFile(
-				toDate(file.getCreationTime()), 
-				file.getId(),
-				gwtProperties,
-				file.getName(),
-				file.getOwner().getPortalLogin(),
-				file.getDescription(),
-				toDate(file.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(file.getLastAction().toString()),
-				parent,
-				file.getLength(),
-				file.getMimeType());
-		
-		return gwtFile;
-	}
-	
-	protected GWTExternalPDFFile buildGWTExternalPDFFile(ExternalPDFFile pdfFile, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(pdfFile.getProperties());
-		GWTExternalPDFFile gwtPDFFile = new GWTExternalPDFFile(
-				toDate(pdfFile.getCreationTime()), 
-				pdfFile.getId(),
-				gwtProperties,
-				pdfFile.getName(),
-				pdfFile.getOwner().getPortalLogin(),
-				pdfFile.getDescription(),
-				toDate(pdfFile.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(pdfFile.getLastAction().toString()),
-				parent,
-				pdfFile.getLength(),
-				pdfFile.getMimeType(),
-				pdfFile.getAuthor(),
-				pdfFile.getNumberOfPages(),
-				pdfFile.getProducer(),
-				pdfFile.getTitle(),
-				pdfFile.getVersion());
-		
-		return gwtPDFFile;
-	}
-	
-	protected GWTExternalImage buildGWTExternalImage(ExternalImage image, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(image.getProperties());
-		GWTExternalImage gwtImage = new GWTExternalImage(
-				toDate(image.getCreationTime()), 
-				image.getId(),
-				gwtProperties,
-				image.getName(),
-				image.getOwner().getPortalLogin(),
-				image.getDescription(),
-				toDate(image.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(image.getLastAction().toString()),
-				parent,
-				buildImageUrl(image.getId()),
-				buildThumbnailUrl(image.getId()),
-				image.getWidth(),
-				image.getHeight(),
-				image.getLength(),
-				image.getThumbnailWidth(),
-				image.getThumbnailHeight(),
-				image.getThumbnailLength(),
-				image.getMimeType());
-		
-		return gwtImage;
-	}
-	
-	protected GWTQuery buildGWTQuery(Query query, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(query.getProperties());
-		GWTQuery gwtQuery = new GWTQuery(
-				query.getId(), 
-				query.getName(),
-				query.getDescription(),
-				query.getOwner().getPortalLogin(),
-				toDate(query.getCreationTime()),
-				gwtProperties,
-				toDate(query.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(query.getLastAction().toString()),
-				parent,
-				query.getLength());
-		
-		return gwtQuery;
-	}
-	
-	protected GWTAquaMapsItem buildGWTAquaMapsItem(AquaMapsItem aquamapsItem, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(aquamapsItem.getProperties());
-		
-		GWTAquaMapsItem gwtAquaMapsItem = new GWTAquaMapsItem(
-				aquamapsItem.getId(), 
-				aquamapsItem.getName(),
-				aquamapsItem.getDescription(),
-				aquamapsItem.getOwner().getPortalLogin(),
-				toDate(aquamapsItem.getCreationTime()),
-				gwtProperties,
-				toDate(aquamapsItem.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(aquamapsItem.getLastAction().toString()),
-				parent,
-				aquamapsItem.getLength(),
-				aquamapsItem.getMapName(),
-				aquamapsItem.getMapType(),
-				aquamapsItem.getAuthor(),
-				aquamapsItem.getNumberOfSpecies(),
-				aquamapsItem.getBoundingBox(),
-				aquamapsItem.getPsoThreshold(),
-				aquamapsItem.getNumberOfGeneratedImages()
-		);
-	
-		return gwtAquaMapsItem;
-	}
-
-	
-	protected GWTTimeSeries buildGWTTimeSeries(TimeSeries timeseries, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(timeseries.getProperties());
-		
-		TimeSeriesInfo timeSeriesInfo = timeseries.getTimeSeriesInfo();
-		
-		GWTTimeSeries gwtTimeSeries = new GWTTimeSeries(
-				timeseries.getId(), 
-				timeseries.getName(),
-				timeseries.getDescription(),
-				timeseries.getOwner().getPortalLogin(),
-				toDate(timeseries.getCreationTime()),
-				gwtProperties,
-				toDate(timeseries.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(timeseries.getLastAction().toString()),
-				parent,
-				timeseries.getLength(),
-				timeSeriesInfo.getId(),
-				timeSeriesInfo.getTitle(),
-				timeSeriesInfo.getCreator(),
-				timeSeriesInfo.getDescription(),
-				timeSeriesInfo.getCreationDate(),
-				timeSeriesInfo.getPublisher(),
-				timeSeriesInfo.getSourceId(),
-				timeSeriesInfo.getSourceName(),
-				timeSeriesInfo.getRights(),
-				timeSeriesInfo.getDimension(),
-				new LinkedList<String>(timeseries.getHeaderLabels())
-		);
-		
-		return gwtTimeSeries;
-	}
-	
-	protected GWTReportTemplate buildGWTReportTemplate(ReportTemplate template, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(template.getProperties());
-		GWTReportTemplate gwtTemplate = new GWTReportTemplate(
-				template.getId(),
-				template.getName(),
-				template.getDescription(),
-				template.getOwner().getPortalLogin(),
-				toDate(template.getCreationTime()), 
-				gwtProperties,
-				toDate(template.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(template.getLastAction().toString()),
-				parent,
-				template.getLength(),
-				toDate(template.getCreated()),
-				toDate(template.getLastEdit()),
-				template.getAuthor(),
-				template.getLastEditBy(),
-				template.getNumberOfSections(),
-				template.getStatus());
-		
-		return gwtTemplate;
-	}
-	
-	protected GWTReport buildGWTReport(Report template, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(template.getProperties());
-		GWTReport gwtReport = new GWTReport(
-				template.getId(),
-				template.getName(),
-				template.getDescription(),
-				template.getOwner().getPortalLogin(),
-				toDate(template.getCreationTime()),
-				gwtProperties,
-				toDate(template.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(template.getLastAction().toString()),
-				parent,
-				template.getLength(),
-				toDate(template.getCreated()),
-				toDate(template.getLastEdit()),
-				template.getAuthor(),
-				template.getLastEditBy(),
-				template.getTemplateName(),
-				template.getNumberOfSections(),
-				template.getStatus()
-		);
-		return gwtReport;
-	}
-	
-	protected GWTWorkflowReport buildGWTWorkflowReport(WorkflowReport workflowReport, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(workflowReport.getProperties());
-		GWTWorkflowReport gwtWorkflowReport = new GWTWorkflowReport(
-				workflowReport.getId(),
-				workflowReport.getName(),
-				workflowReport.getDescription(),
-				workflowReport.getOwner().getPortalLogin(),
-				toDate(workflowReport.getCreationTime()),
-				gwtProperties,
-				toDate(workflowReport.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(workflowReport.getLastAction().toString()),
-				parent,
-				workflowReport.getLength()
-		);
-		gwtWorkflowReport.setWorkflowStatus(workflowReport.getWorkflowStatus());
-		return gwtWorkflowReport;
-	}
-	
-	protected GWTWorkflowTemplate buildGWTWorkflowTemplate(WorkflowTemplate workflowTemplate, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(workflowTemplate.getProperties());
-		GWTWorkflowTemplate gwtWorkflowReport = new GWTWorkflowTemplate(
-				workflowTemplate.getId(),
-				workflowTemplate.getName(),
-				workflowTemplate.getDescription(),
-				workflowTemplate.getOwner().getPortalLogin(),
-				toDate(workflowTemplate.getCreationTime()),
-				gwtProperties,
-				toDate(workflowTemplate.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(workflowTemplate.getLastAction().toString()),
-				parent,
-				workflowTemplate.getLength()
-		);
-		gwtWorkflowReport.setWorkflowStatus(workflowTemplate.getWorkflowStatus());
-		return gwtWorkflowReport;
-	}
-	
-	protected GWTImageDocument buildGWTImageDocument(ImageDocument image, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(image.getProperties());
-		
-		Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(image.getMetadata(), image.getId());
-		
-		GWTImageDocument gwtImage = new GWTImageDocument(
-				toDate(image.getCreationTime()), 
-				image.getId(),
-				gwtProperties,
-				image.getName(),
-				image.getOwner().getPortalLogin(),
-				image.getDescription(),
-				toDate(image.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(image.getLastAction().toString()),
-				parent,
-				buildImageUrl(image.getId()),
-				buildThumbnailUrl(image.getId()),
-				image.getWidth(),
-				image.getHeight(),
-				image.getThumbnailWidth(),
-				image.getThumbnailHeight(),
-				image.getThumbnailLength(),
-				image.getLength(),
-				image.getMimeType(),
-				image.getURI(),
-				gwtmetadatas,
-				new LinkedHashMap<String, String>(),
-				image.getCollectionName(),
-				image.getAlternatives().size(),
-				image.getParts().size()
-				
-				);
-		
-		return gwtImage;
-		
-	}
-	
-	protected GWTPDFDocument buildGWTPDFDocument(PDFDocument pdfDocument, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(pdfDocument.getProperties());
-		
-		Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(pdfDocument.getMetadata(), pdfDocument.getId());
-		
-		GWTPDFDocument gwtPDF = new GWTPDFDocument(
-				toDate(pdfDocument.getCreationTime()), 
-				pdfDocument.getId(),
-				gwtProperties,
-				pdfDocument.getName(),
-				pdfDocument.getOwner().getPortalLogin(),
-				pdfDocument.getDescription(),
-				toDate(pdfDocument.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(pdfDocument.getLastAction().toString()),
-				parent,
-				pdfDocument.getLength(),
-				pdfDocument.getURI(),
-				pdfDocument.getMimeType(),
-				gwtmetadatas,
-				new LinkedHashMap<String, String>(),
-				pdfDocument.getCollectionName(),
-				pdfDocument.getAlternatives().size(),
-				pdfDocument.getParts().size(),
-				pdfDocument.getAuthor(),
-				pdfDocument.getNumberOfPages(),
-				pdfDocument.getProducer(),
-				pdfDocument.getTitle(),
-				pdfDocument.getVersion(),
-				"DocumentService?id="+pdfDocument.getId()
-				);
-		
-		return gwtPDF;
-		
-	}
-	
-	protected GWTDocument buildGWTDocument(Document document, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(document.getProperties());
-		
-		Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(document.getMetadata(), document.getId());
-		
-		GWTDocument gwtPDF = new GWTDocument(
-				toDate(document.getCreationTime()), 
-				document.getId(),
-				gwtProperties,
-				document.getName(),
-				document.getOwner().getPortalLogin(),
-				document.getDescription(),
-				toDate(document.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()),
-				parent,
-				document.getLength(),
-				document.getURI(),
-				document.getMimeType(),
-				gwtmetadatas,
-				new LinkedHashMap<String, String>(),
-				document.getCollectionName(),
-				document.getAlternatives().size(),
-				document.getParts().size()
-				);
-		
-		return gwtPDF;
-		
-	}
-	
-	protected GWTMetadata buildGWTMetadata(Metadata metadata, GWTWorkspaceFolder parent) throws InternalErrorException
-	{
-		GWTProperties gwtProperties = buildGWTProperties(metadata.getProperties());
-		
-		GWTMetadata gwtMetadata = new GWTMetadata(
-				metadata.getId(),
-				metadata.getName(),
-				metadata.getDescription(),
-				metadata.getOwner().getPortalLogin(),
-				toDate(metadata.getCreationTime()), 
-				gwtProperties,
-				toDate(metadata.getLastModificationTime()),
-				GWTWorkspaceItemAction.valueOf(metadata.getLastAction().toString()),
-				parent,
-				metadata.getLength(),
-				metadata.getURI(),
-				metadata.getSchema(),
-				metadata.getLanguage(),
-				metadata.getCollectionName(),
-				"MetadataService?id="+metadata.getId()+"&type="+MetadataFormat.HTML,
-				"MetadataService?id="+metadata.getId()+"&type="+MetadataFormat.RAW_XML_AS_HTML
-				);
-		
-		return gwtMetadata;
-		
-	}
-	
+//	protected GWTExternalFile buildGWTExternalFile(ExternalFile file, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(file.getProperties());
+//		GWTExternalFile gwtFile = new GWTExternalFile(
+//				toDate(file.getCreationTime()), 
+//				file.getId(),
+//				gwtProperties,
+//				file.getName(),
+//				file.getOwner().getPortalLogin(),
+//				file.getDescription(),
+//				toDate(file.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(file.getLastAction().toString()),
+//				parent,
+//				file.getLength(),
+//				file.getMimeType());
+//		
+//		return gwtFile;
+//	}
+//	
+//	protected GWTExternalPDFFile buildGWTExternalPDFFile(ExternalPDFFile pdfFile, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(pdfFile.getProperties());
+//		GWTExternalPDFFile gwtPDFFile = new GWTExternalPDFFile(
+//				toDate(pdfFile.getCreationTime()), 
+//				pdfFile.getId(),
+//				gwtProperties,
+//				pdfFile.getName(),
+//				pdfFile.getOwner().getPortalLogin(),
+//				pdfFile.getDescription(),
+//				toDate(pdfFile.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(pdfFile.getLastAction().toString()),
+//				parent,
+//				pdfFile.getLength(),
+//				pdfFile.getMimeType(),
+//				pdfFile.getAuthor(),
+//				pdfFile.getNumberOfPages(),
+//				pdfFile.getProducer(),
+//				pdfFile.getTitle(),
+//				pdfFile.getVersion());
+//		
+//		return gwtPDFFile;
+//	}
+//	
+//	protected GWTExternalImage buildGWTExternalImage(ExternalImage image, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(image.getProperties());
+//		GWTExternalImage gwtImage = new GWTExternalImage(
+//				toDate(image.getCreationTime()), 
+//				image.getId(),
+//				gwtProperties,
+//				image.getName(),
+//				image.getOwner().getPortalLogin(),
+//				image.getDescription(),
+//				toDate(image.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(image.getLastAction().toString()),
+//				parent,
+//				buildImageUrl(image.getId()),
+//				buildThumbnailUrl(image.getId()),
+//				image.getWidth(),
+//				image.getHeight(),
+//				image.getLength(),
+//				image.getThumbnailWidth(),
+//				image.getThumbnailHeight(),
+//				image.getThumbnailLength(),
+//				image.getMimeType());
+//		
+//		return gwtImage;
+//	}
+//	
+//	protected GWTQuery buildGWTQuery(Query query, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(query.getProperties());
+//		GWTQuery gwtQuery = new GWTQuery(
+//				query.getId(), 
+//				query.getName(),
+//				query.getDescription(),
+//				query.getOwner().getPortalLogin(),
+//				toDate(query.getCreationTime()),
+//				gwtProperties,
+//				toDate(query.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(query.getLastAction().toString()),
+//				parent,
+//				query.getLength());
+//		
+//		return gwtQuery;
+//	}
+//	
+//	protected GWTAquaMapsItem buildGWTAquaMapsItem(AquaMapsItem aquamapsItem, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(aquamapsItem.getProperties());
+//		
+//		GWTAquaMapsItem gwtAquaMapsItem = new GWTAquaMapsItem(
+//				aquamapsItem.getId(), 
+//				aquamapsItem.getName(),
+//				aquamapsItem.getDescription(),
+//				aquamapsItem.getOwner().getPortalLogin(),
+//				toDate(aquamapsItem.getCreationTime()),
+//				gwtProperties,
+//				toDate(aquamapsItem.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(aquamapsItem.getLastAction().toString()),
+//				parent,
+//				aquamapsItem.getLength(),
+//				aquamapsItem.getMapName(),
+//				aquamapsItem.getMapType(),
+//				aquamapsItem.getAuthor(),
+//				aquamapsItem.getNumberOfSpecies(),
+//				aquamapsItem.getBoundingBox(),
+//				aquamapsItem.getPsoThreshold(),
+//				aquamapsItem.getNumberOfGeneratedImages()
+//		);
+//	
+//		return gwtAquaMapsItem;
+//	}
+//
+//	
+//	protected GWTTimeSeries buildGWTTimeSeries(TimeSeries timeseries, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(timeseries.getProperties());
+//		
+//		TimeSeriesInfo timeSeriesInfo = timeseries.getTimeSeriesInfo();
+//		
+//		GWTTimeSeries gwtTimeSeries = new GWTTimeSeries(
+//				timeseries.getId(), 
+//				timeseries.getName(),
+//				timeseries.getDescription(),
+//				timeseries.getOwner().getPortalLogin(),
+//				toDate(timeseries.getCreationTime()),
+//				gwtProperties,
+//				toDate(timeseries.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(timeseries.getLastAction().toString()),
+//				parent,
+//				timeseries.getLength(),
+//				timeSeriesInfo.getId(),
+//				timeSeriesInfo.getTitle(),
+//				timeSeriesInfo.getCreator(),
+//				timeSeriesInfo.getDescription(),
+//				timeSeriesInfo.getCreationDate(),
+//				timeSeriesInfo.getPublisher(),
+//				timeSeriesInfo.getSourceId(),
+//				timeSeriesInfo.getSourceName(),
+//				timeSeriesInfo.getRights(),
+//				timeSeriesInfo.getDimension(),
+//				new LinkedList<String>(timeseries.getHeaderLabels())
+//		);
+//		
+//		return gwtTimeSeries;
+//	}
+//	
+//	protected GWTReportTemplate buildGWTReportTemplate(ReportTemplate template, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(template.getProperties());
+//		GWTReportTemplate gwtTemplate = new GWTReportTemplate(
+//				template.getId(),
+//				template.getName(),
+//				template.getDescription(),
+//				template.getOwner().getPortalLogin(),
+//				toDate(template.getCreationTime()), 
+//				gwtProperties,
+//				toDate(template.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(template.getLastAction().toString()),
+//				parent,
+//				template.getLength(),
+//				toDate(template.getCreated()),
+//				toDate(template.getLastEdit()),
+//				template.getAuthor(),
+//				template.getLastEditBy(),
+//				template.getNumberOfSections(),
+//				template.getStatus());
+//		
+//		return gwtTemplate;
+//	}
+//	
+//	protected GWTReport buildGWTReport(Report template, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(template.getProperties());
+//		GWTReport gwtReport = new GWTReport(
+//				template.getId(),
+//				template.getName(),
+//				template.getDescription(),
+//				template.getOwner().getPortalLogin(),
+//				toDate(template.getCreationTime()),
+//				gwtProperties,
+//				toDate(template.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(template.getLastAction().toString()),
+//				parent,
+//				template.getLength(),
+//				toDate(template.getCreated()),
+//				toDate(template.getLastEdit()),
+//				template.getAuthor(),
+//				template.getLastEditBy(),
+//				template.getTemplateName(),
+//				template.getNumberOfSections(),
+//				template.getStatus()
+//		);
+//		return gwtReport;
+//	}
+//	
+//	protected GWTWorkflowReport buildGWTWorkflowReport(WorkflowReport workflowReport, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(workflowReport.getProperties());
+//		GWTWorkflowReport gwtWorkflowReport = new GWTWorkflowReport(
+//				workflowReport.getId(),
+//				workflowReport.getName(),
+//				workflowReport.getDescription(),
+//				workflowReport.getOwner().getPortalLogin(),
+//				toDate(workflowReport.getCreationTime()),
+//				gwtProperties,
+//				toDate(workflowReport.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(workflowReport.getLastAction().toString()),
+//				parent,
+//				workflowReport.getLength()
+//		);
+//		gwtWorkflowReport.setWorkflowStatus(workflowReport.getWorkflowStatus());
+//		return gwtWorkflowReport;
+//	}
+//	
+//	protected GWTWorkflowTemplate buildGWTWorkflowTemplate(WorkflowTemplate workflowTemplate, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(workflowTemplate.getProperties());
+//		GWTWorkflowTemplate gwtWorkflowReport = new GWTWorkflowTemplate(
+//				workflowTemplate.getId(),
+//				workflowTemplate.getName(),
+//				workflowTemplate.getDescription(),
+//				workflowTemplate.getOwner().getPortalLogin(),
+//				toDate(workflowTemplate.getCreationTime()),
+//				gwtProperties,
+//				toDate(workflowTemplate.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(workflowTemplate.getLastAction().toString()),
+//				parent,
+//				workflowTemplate.getLength()
+//		);
+//		gwtWorkflowReport.setWorkflowStatus(workflowTemplate.getWorkflowStatus());
+//		return gwtWorkflowReport;
+//	}
+//	
+//	protected GWTImageDocument buildGWTImageDocument(ImageDocument image, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(image.getProperties());
+//		
+//		Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(image.getMetadata(), image.getId());
+//		
+//		GWTImageDocument gwtImage = new GWTImageDocument(
+//				toDate(image.getCreationTime()), 
+//				image.getId(),
+//				gwtProperties,
+//				image.getName(),
+//				image.getOwner().getPortalLogin(),
+//				image.getDescription(),
+//				toDate(image.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(image.getLastAction().toString()),
+//				parent,
+//				buildImageUrl(image.getId()),
+//				buildThumbnailUrl(image.getId()),
+//				image.getWidth(),
+//				image.getHeight(),
+//				image.getThumbnailWidth(),
+//				image.getThumbnailHeight(),
+//				image.getThumbnailLength(),
+//				image.getLength(),
+//				image.getMimeType(),
+//				image.getURI(),
+//				gwtmetadatas,
+//				new LinkedHashMap<String, String>(),
+//				image.getCollectionName(),
+//				image.getAlternatives().size(),
+//				image.getParts().size()
+//				
+//				);
+//		
+//		return gwtImage;
+//		
+//	}
+//	
+//	protected GWTPDFDocument buildGWTPDFDocument(PDFDocument pdfDocument, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(pdfDocument.getProperties());
+//		
+//		Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(pdfDocument.getMetadata(), pdfDocument.getId());
+//		
+//		GWTPDFDocument gwtPDF = new GWTPDFDocument(
+//				toDate(pdfDocument.getCreationTime()), 
+//				pdfDocument.getId(),
+//				gwtProperties,
+//				pdfDocument.getName(),
+//				pdfDocument.getOwner().getPortalLogin(),
+//				pdfDocument.getDescription(),
+//				toDate(pdfDocument.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(pdfDocument.getLastAction().toString()),
+//				parent,
+//				pdfDocument.getLength(),
+//				pdfDocument.getURI(),
+//				pdfDocument.getMimeType(),
+//				gwtmetadatas,
+//				new LinkedHashMap<String, String>(),
+//				pdfDocument.getCollectionName(),
+//				pdfDocument.getAlternatives().size(),
+//				pdfDocument.getParts().size(),
+//				pdfDocument.getAuthor(),
+//				pdfDocument.getNumberOfPages(),
+//				pdfDocument.getProducer(),
+//				pdfDocument.getTitle(),
+//				pdfDocument.getVersion(),
+//				"DocumentService?id="+pdfDocument.getId()
+//				);
+//		
+//		return gwtPDF;
+//		
+//	}
+//	
+//	protected GWTDocument buildGWTDocument(Document document, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(document.getProperties());
+//		
+//		Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(document.getMetadata(), document.getId());
+//		
+//		GWTDocument gwtPDF = new GWTDocument(
+//				toDate(document.getCreationTime()), 
+//				document.getId(),
+//				gwtProperties,
+//				document.getName(),
+//				document.getOwner().getPortalLogin(),
+//				document.getDescription(),
+//				toDate(document.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()),
+//				parent,
+//				document.getLength(),
+//				document.getURI(),
+//				document.getMimeType(),
+//				gwtmetadatas,
+//				new LinkedHashMap<String, String>(),
+//				document.getCollectionName(),
+//				document.getAlternatives().size(),
+//				document.getParts().size()
+//				);
+//		
+//		return gwtPDF;
+//		
+//	}
+//	
+//	protected GWTMetadata buildGWTMetadata(Metadata metadata, GWTWorkspaceFolder parent) throws InternalErrorException
+//	{
+//		GWTProperties gwtProperties = buildGWTProperties(metadata.getProperties());
+//		
+//		GWTMetadata gwtMetadata = new GWTMetadata(
+//				metadata.getId(),
+//				metadata.getName(),
+//				metadata.getDescription(),
+//				metadata.getOwner().getPortalLogin(),
+//				toDate(metadata.getCreationTime()), 
+//				gwtProperties,
+//				toDate(metadata.getLastModificationTime()),
+//				GWTWorkspaceItemAction.valueOf(metadata.getLastAction().toString()),
+//				parent,
+//				metadata.getLength(),
+//				metadata.getURI(),
+//				metadata.getSchema(),
+//				metadata.getLanguage(),
+//				metadata.getCollectionName(),
+//				"MetadataService?id="+metadata.getId()+"&type="+MetadataFormat.HTML,
+//				"MetadataService?id="+metadata.getId()+"&type="+MetadataFormat.RAW_XML_AS_HTML
+//				);
+//		
+//		return gwtMetadata;
+//		
+//	}
 	
 	///////////////////////*********************USED
 	
 	//ADD FRANCESCO
+	@SuppressWarnings("unchecked")
 	protected GWTWorkspaceItem buildGWTWorkspaceImage(WorkspaceItem item, boolean isInteralImage, boolean fullDetails) throws InternalErrorException
 	{
 		
@@ -614,9 +593,12 @@ public class GWTWorkspaceBuilder {
 //		
 		if(isInteralImage){
 			
-			ImageDocument image = (ImageDocument) item; //Cast Image Document
-		
-			Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(image.getMetadata(), image.getId());
+			GCubeItem image = (GCubeItem) item; //Cast OLD Image Document
+			
+			List<DocumentAlternativeLink> links = (List<DocumentAlternativeLink>) new XStream().fromXML(image.getItemProperties().get(NodeProperty.ALTERNATIVES.toString()));
+			List<DocumentPartLink> parts = (List<DocumentPartLink>) new XStream().fromXML(image.getItemProperties().get(NodeProperty.PARTS.toString()));
+			Map<String, DocumentMetadata> metadatas = (Map<String, DocumentMetadata>) new XStream().fromXML(image.getItemProperties().get(NodeProperty.METADATA.toString()));
+			Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(metadatas, image.getId());
 			
 			gwtImage = (GWTImageDocument) new GWTImageDocument(
 					toDate(image.getCreationTime()), 
@@ -630,19 +612,19 @@ public class GWTWorkspaceBuilder {
 					null,
 					buildImageUrl(image.getId()),
 					buildThumbnailUrl(image.getId()),
-					image.getWidth(),
-					image.getHeight(),
-					image.getThumbnailWidth(),
-					image.getThumbnailHeight(),
-					image.getThumbnailLength(),
+					Integer.parseInt(image.getItemProperties().get(NodeProperty.IMAGE_WIDTH.toString())),
+					Integer.parseInt(image.getItemProperties().get(NodeProperty.IMAGE_HEIGHT.toString())),
+					Integer.parseInt(image.getItemProperties().get(NodeProperty.THUMBNAIL_WIDTH.toString())),
+					Integer.parseInt(image.getItemProperties().get(NodeProperty.THUMBNAIL_HEIGHT.toString())),
+					-1,
 					image.getLength(),
 					image.getMimeType(),
-					image.getURI(),
+					image.getItemProperties().get(NodeProperty.OID.toString()),
 					gwtmetadatas,
 					new LinkedHashMap<String, String>(),
-					image.getCollectionName(),
-					image.getAlternatives().size(),
-					image.getParts().size());
+					image.getItemProperties().get(NodeProperty.COLLECTION_NAME.toString()),
+					links.size(),
+					parts.size());
 		}
 		
 		else{
@@ -668,10 +650,9 @@ public class GWTWorkspaceBuilder {
 						image.getLength(),
 						image.getThumbnailWidth(),
 						image.getThumbnailHeight(),
-						image.getThumbnailLength(),
+						-1,
 						image.getMimeType());
-			}
-			else{
+			}else{
 				
 				gwtImage = new GWTExternalImage(
 						buildImageUrl(image.getId()),
@@ -681,12 +662,10 @@ public class GWTWorkspaceBuilder {
 						image.getLength(),
 						image.getThumbnailWidth(),
 						image.getThumbnailHeight(),
-						image.getThumbnailLength(),
+						-1,
 						image.getMimeType());
 			}
-		
 		}
-			
 		return gwtImage;
 	}
 	
@@ -712,6 +691,7 @@ public class GWTWorkspaceBuilder {
 	}
 	
 
+	@SuppressWarnings("unchecked")
 	protected GWTWorkspaceItem buildGWTWorspaceUrl(WorkspaceItem item, boolean isInternalUrl, boolean fullDetails) throws InternalErrorException
 	{
 		
@@ -723,9 +703,12 @@ public class GWTWorkspaceBuilder {
 		
 		if(isInternalUrl){
 			
-			UrlDocument document = (UrlDocument) item; //Cast
-			
-			Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(document.getMetadata(), document.getId());
+			GCubeItem document = (GCubeItem) item; //Cast OLD UrlDocument
+//			UrlDocument document = (UrlDocument) item; //Cast
+			List<DocumentAlternativeLink> links = (List<DocumentAlternativeLink>) new XStream().fromXML(document.getItemProperties().get(NodeProperty.ALTERNATIVES.toString()));
+			List<DocumentPartLink> parts = (List<DocumentPartLink>) new XStream().fromXML(document.getItemProperties().get(NodeProperty.PARTS.toString()));
+			Map<String, DocumentMetadata> metadatas = (Map<String, DocumentMetadata>) new XStream().fromXML(document.getItemProperties().get(NodeProperty.METADATA.toString()));
+			Map<String, GWTDocumentMetadata> gwtmetadatas = getMetadatas(metadatas, document.getId());
 			
 			gwtUrl = new GWTUrlDocument(
 				toDate(document.getCreationTime()), 
@@ -738,14 +721,14 @@ public class GWTWorkspaceBuilder {
 				GWTWorkspaceItemAction.valueOf(document.getLastAction().toString()),
 				null,
 				document.getLength(),
-				document.getURI(),
+				document.getItemProperties().get(NodeProperty.OID.toString()),
 				document.getMimeType(),
 				gwtmetadatas,
 				new LinkedHashMap<String, String>(),
-				document.getCollectionName(),
-				document.getAlternatives().size(),
-				document.getParts().size(),
-				document.getUrl());
+				document.getItemProperties().get(NodeProperty.COLLECTION_NAME.toString()),
+				links.size(),
+				parts.size(),
+				document.getItemProperties().get(NodeProperty.URL.toString()));
 		}
 		else{
 			
@@ -1317,14 +1300,26 @@ public class GWTWorkspaceBuilder {
 			case IMAGE_DOCUMENT: 
 				fileModel.setFolderItemType(GXTFolderItemTypeEnum.IMAGE_DOCUMENT);
 				fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_IMAGES);
-				ImageDocument imgDoc = (ImageDocument) worspaceFolderItem;
-				fileModel.setType(imgDoc.getMimeType());
+//				ImageDocument imgDoc = (ImageDocument) worspaceFolderItem;
+				GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem
+				try {
+					fileModel.setType(imgDoc.getMimeType());
+				} catch (InternalErrorException e) {
+					// TODO Auto-generated catch block
+					logger.error("IMAGE_DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier());
+				}
 				break;
 			case DOCUMENT: 
 				fileModel.setFolderItemType(GXTFolderItemTypeEnum.DOCUMENT);
 				fileModel.setShortcutCategory(GXTCategoryItemInterface.SMF_DOCUMENTS);
-				Document doc = (Document) worspaceFolderItem;
-				fileModel.setType(doc.getMimeType());
+//				Document doc = (Document) worspaceFolderItem;
+					GCubeItem doc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem
+				try {
+					fileModel.setType(doc.getMimeType());
+				} catch (InternalErrorException e) {
+					// TODO Auto-generated catch block
+					logger.error("DOCUMENT InternalErrorException when getting MimeType on "+fileModel.getIdentifier());
+				}
 				break;
 			case URL_DOCUMENT: 
 				fileModel.setFolderItemType(GXTFolderItemTypeEnum.URL_DOCUMENT);
@@ -1388,7 +1383,9 @@ public class GWTWorkspaceBuilder {
 				case PDF_DOCUMENT:
 					break;
 				case IMAGE_DOCUMENT: 
-					return ((ImageDocument) worspaceFolderItem).getPublicLink();
+					GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem
+					return imgDoc.getPublicLink(false);
+//					return ((ImageDocument) worspaceFolderItem).getPublicLink();
 				case DOCUMENT: 
 					break;
 				case URL_DOCUMENT: 

src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceServiceImpl.java

@@ -15,6 +15,8 @@ import javax.servlet.ServletContext;
 
 import org.apache.log4j.Logger;
 import org.gcube.application.framework.core.session.ASLSession;
+import org.gcube.common.homelibary.model.items.type.FolderItemType;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.Home;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
@@ -22,7 +24,6 @@ import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceSmartFolder;
 import org.gcube.common.homelibrary.home.workspace.accessmanager.ACLType;
@@ -33,9 +34,7 @@ import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundExcept
 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.FolderItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalUrl;
-import org.gcube.common.homelibrary.home.workspace.folder.items.ts.TimeSeries;
 import org.gcube.common.homelibrary.home.workspace.search.SearchItem;
 import org.gcube.common.homelibrary.home.workspace.sharing.WorkspaceMessage;
 import org.gcube.common.homelibrary.home.workspace.trash.WorkspaceTrashFolder;
@@ -1346,6 +1345,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	 * @see org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceService#getTimeSeriesById(java.lang.String)
 	 */
 	@Override
+	@Deprecated 
+	/**
+	 * this method return always null
+	 */
 	public GWTWorkspaceItem getTimeSeriesById(String identifier) throws Exception {
 		
 		if(identifier==null)
@@ -1363,8 +1366,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
-			return builder.buildGWTTimeSeries((TimeSeries)item, null);
-			
+//			return builder.buildGWTTimeSeries((TimeSeries)item, null);
+			return null;
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server get timeseries by id", e);
 			throw new Exception(e.getMessage());

src/main/java/org/gcube/portlets/user/workspace/server/ImageServlet.java

@@ -14,13 +14,13 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.FolderItemType;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 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.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
-import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.items.Image;
 import org.gcube.portlets.user.workspace.client.util.ImageRequestType;
 import org.gcube.portlets.user.workspace.server.util.WsUtil;
@@ -113,8 +113,15 @@ public class ImageServlet extends HttpServlet{
 
 		// Set content size
 		try {
+			/*
 			long size = (requestType==ImageRequestType.IMAGE)?image.getLength():image.getThumbnailLength();
 			resp.setContentLength((int)size);
+			*/
+			long size = (requestType==ImageRequestType.IMAGE)?image.getLength():0;
+			if(size == 0){
+				logger.warn("Image or Thumbnail size is 0, skipping set content lenght");
+			}else
+				resp.setContentLength((int)size);
 		} catch (InternalErrorException e) {
 			resp.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR,"Error in image lenght retrieving");
 			return;

src/main/java/org/gcube/portlets/user/workspace/server/LocalUploadServlet.java

@@ -20,11 +20,11 @@ import javax.servlet.http.HttpSession;
 import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 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;

src/main/java/org/gcube/portlets/user/workspace/server/UploadServlet.java

@@ -23,11 +23,11 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 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;

src/main/java/org/gcube/portlets/user/workspace/server/notifications/NotificationsUtil.java

@@ -9,9 +9,9 @@ import java.util.List;
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
 import org.gcube.portlets.user.workspace.client.model.InfoContactModel;
 import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder;

src/test/java/org/gcube/portlets/user/workspace/DephtVisitDonwloadFilesTester.java

@@ -11,14 +11,14 @@ import java.io.OutputStreamWriter;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.FolderItemType;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
-import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.impl.ScopeBean;

src/test/java/org/gcube/portlets/user/workspace/DonwloadServletTest.java

@@ -5,14 +5,14 @@ package org.gcube.portlets.user.workspace;
 
 import java.util.List;
 
+import org.gcube.common.homelibary.model.items.type.FolderItemType;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
-import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 
 /**

src/test/java/org/gcube/portlets/user/workspace/ItemRetrieving.java

@@ -107,7 +107,7 @@ public class ItemRetrieving {
 					
 					WorkspaceFolder folder = (WorkspaceFolder) workspaceItem;
 
-					System.out.println(++i+") "+folder.getId() +" folder name: "+folder.getName() + " owner "+folder.getOwner().getPortalLogin());
+					System.out.println(++i+") "+folder.getId() +" folder name: "+folder.getName() + " owner "+folder.getOwner());
 					foldersCounter++;
 					
 					break;
@@ -116,7 +116,7 @@ public class ItemRetrieving {
 					
 					WorkspaceSharedFolder shared = (WorkspaceSharedFolder) workspaceItem;
 
-					System.out.println(++i+")  "+shared.getId() +" shared folder name: "+shared.getName() + " owner "+shared.getOwner().getPortalLogin() +" isVRE "+shared.isVreFolder() +" ACLOwner: "+shared.getACLOwner()+" AclUser: "+shared.getACLUser());
+					System.out.println(++i+")  "+shared.getId() +" shared folder name: "+shared.getName() + " owner "+shared.getOwner()+" isVRE "+shared.isVreFolder() +" ACLOwner: "+shared.getACLOwner()+" AclUser: "+shared.getACLUser());
 					
 //					System.out.println(++i+") shared folder name: "+shared.getName() + " owner "+shared.getOwner().getPortalLogin());
 					sharedFoldersCounter++;
@@ -127,12 +127,12 @@ public class ItemRetrieving {
 					
 					FolderItem folderItem = (FolderItem) workspaceItem;
 					
-					System.out.println(++i+") folderItem id: "+folderItem.getId() +", name: "+folderItem.getName() + ", own: "+folderItem.getOwner().getPortalLogin());
+					System.out.println(++i+") folderItem id: "+folderItem.getId() +", name: "+folderItem.getName() + ", own: "+folderItem.getOwner());
 					folderItemCounter++;
 					
 					break;
 				default:
-					System.out.println(++i+") DEFAULT - item id: "+workspaceItem.getId() +", name: "+workspaceItem.getName() + ", own: "+workspaceItem.getOwner().getPortalLogin());
+					System.out.println(++i+") DEFAULT - item id: "+workspaceItem.getId() +", name: "+workspaceItem.getName() + ", own: "+workspaceItem.getOwner());
 					othersCounter++;
 					break;
 				}

src/test/java/org/gcube/portlets/user/workspace/PublicLinkTest.java

@@ -6,17 +6,17 @@ package org.gcube.portlets.user.workspace;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalPDFFile;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.ImageDocument;
+import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.impl.ScopeBean;
 
@@ -115,7 +115,8 @@ public class PublicLinkTest {
 				case PDF_DOCUMENT:
 					break;
 				case IMAGE_DOCUMENT: 
-					return ((ImageDocument) worspaceFolderItem).getPublicLink();
+					GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem
+					return imgDoc.getPublicLink(false);
 				case DOCUMENT: 
 					break;
 				case URL_DOCUMENT: 

src/test/java/org/gcube/portlets/user/workspace/SinglePublicLinkTest.java

@@ -4,16 +4,16 @@
 package org.gcube.portlets.user.workspace;
 
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 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.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalImage;
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalPDFFile;
-import org.gcube.common.homelibrary.home.workspace.folder.items.gcube.ImageDocument;
+import org.gcube.common.homelibrary.home.workspace.folder.items.GCubeItem;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.impl.ScopeBean;
 import org.gcube.portlets.user.workspace.server.GWTWorkspaceBuilder;
@@ -176,7 +176,8 @@ public class SinglePublicLinkTest {
 				case PDF_DOCUMENT:
 					break;
 				case IMAGE_DOCUMENT: 
-					return ((ImageDocument) worspaceFolderItem).getPublicLink();
+					GCubeItem imgDoc = (GCubeItem) worspaceFolderItem; //Cast GCubeItem
+					return imgDoc.getPublicLink(false);
 				case DOCUMENT: 
 					break;
 				case URL_DOCUMENT: 

src/test/java/org/gcube/portlets/user/workspace/SizeRetrieving.java

@@ -5,11 +5,11 @@ package org.gcube.portlets.user.workspace;
 
 import java.util.List;
 
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.impl.ScopeBean;

src/test/java/org/gcube/portlets/user/workspace/SmartFolderTest.java

@@ -7,9 +7,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.FolderItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
-import org.gcube.common.homelibrary.home.workspace.folder.FolderItemType;
 import org.gcube.common.homelibrary.home.workspace.search.SearchItem;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.scope.impl.ScopeBean;

src/test/java/org/gcube/portlets/user/workspace/UriResolverReaderRR.java

@@ -15,10 +15,10 @@ import java.util.List;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.log4j.Logger;
+import org.gcube.common.homelibary.model.items.type.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
-import org.gcube.common.homelibrary.home.workspace.WorkspaceItemType;
 import org.gcube.common.homelibrary.home.workspace.folder.FolderItem;
 import org.gcube.common.resources.gcore.ServiceEndpoint;
 import org.gcube.common.resources.gcore.ServiceEndpoint.AccessPoint;