updated project to support fws

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

pom.xml

@@ -67,17 +67,39 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<!-- PORTAL MANAGER -->
+		<dependency>
+			<groupId>org.gcube.common.portal</groupId>
+			<artifactId>portal-manager</artifactId>
+			<version>[0.1.0-SNAPSHOT, 1.0.0-SNAPSHOT)</version>
+		</dependency>
+
+		<!-- FWS -->
+		<dependency>
+			<groupId>org.gcube.resources.discovery</groupId>
+			<artifactId>ic-client</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.core</groupId>
+			<artifactId>common-scope-maps</artifactId>
+			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<!-- UNCOMMENT THIS FOR RELEASE -->
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<!-- END FWS -->
+
 		<dependency>
 			<groupId>org.gcube.core</groupId>
 			<artifactId>common-encryption</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
-		<dependency>
+		<!-- <dependency> -->
-			<groupId>org.gcube.core</groupId>
+		<!-- <groupId>org.gcube.core</groupId> -->
-			<artifactId>gcf</artifactId>
+		<!-- <artifactId>gcf</artifactId> -->
-			<scope>provided</scope>
+		<!-- <scope>provided</scope> -->
-		</dependency>
+		<!-- </dependency> -->
 
 		<dependency>
 			<groupId>org.gcube.dvos</groupId>

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

@@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.gcube.common.core.utils.logging.GCUBELog;
+import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
@@ -33,7 +33,7 @@ public class DownloadPublicLinkServlet extends HttpServlet{
 
 	private static final long serialVersionUID = -8423345575690165644L;
 
-	protected static GCUBELog logger = new GCUBELog(DownloadPublicLinkServlet.class);
+	protected static Logger logger =  Logger.getLogger(DownloadPublicLinkServlet.class);
 
 	/**
 	 * {@inheritDoc}

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

@@ -19,7 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
-import org.gcube.common.core.utils.logging.GCUBELog;
+import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
@@ -56,7 +56,7 @@ public class DownloadServlet extends HttpServlet{
 
 	private static final long serialVersionUID = -8423345575690165644L;
 
-	protected static GCUBELog logger = new GCUBELog(DownloadServlet.class);
+	protected static Logger logger = Logger.getLogger(DownloadServlet.class);
 
 	/**
 	 * {@inheritDoc}

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

@@ -13,7 +13,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
 
-import org.gcube.common.core.utils.logging.GCUBEClientLog;
+import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.User;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Properties;
@@ -102,7 +102,7 @@ import org.gcube.vomanagement.usermanagement.model.UserModel;
 public class GWTWorkspaceBuilder {
 
 	protected static final String IMAGE_SERVICE_URL = "ImageService";
-	protected GCUBEClientLog logger;
+	protected static Logger logger = Logger.getLogger(GWTWorkspaceBuilder.class);
 	private InfoContactModel userLogged;
 	protected static HashMap<String, InfoContactModel> hashTestUser = null;
 //	private final String UNKNOWN = "unknown";
@@ -114,7 +114,6 @@ public class GWTWorkspaceBuilder {
 	 * @param logger
 	 */
 	public GWTWorkspaceBuilder() {
-		logger = new GCUBEClientLog(GWTWorkspaceBuilder.class);
 	}
 	
 	

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

@@ -9,8 +9,6 @@ import java.util.concurrent.TimeUnit;
 
 import org.apache.log4j.Logger;
 import org.gcube.application.framework.core.session.ASLSession;
-import org.gcube.common.core.scope.GCUBEScope;
-import org.gcube.common.core.utils.logging.GCUBEClientLog;
 import org.gcube.common.homelibrary.home.Home;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
@@ -66,7 +64,6 @@ import org.gcube.vomanagement.usermanagement.GroupManager;
 import org.gcube.vomanagement.usermanagement.UserManager;
 import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayGroupManager;
 import org.gcube.vomanagement.usermanagement.impl.liferay.LiferayUserManager;
-import org.gcube.vomanagement.usermanagement.model.UserModel;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
@@ -78,6 +75,10 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWTWorkspaceService{
 
 
+	/**
+	 * 
+	 */
+	protected static final String IDENTIFIER_IS_NULL = "Identifier is null";
 	protected static final String RETRIEVING_ITEM_EITHER_ITEM_DOESN_T_EXIST = " retrieving item. Either the item doesn't exist anymore or you do not have the permission to access it";
 	private static final long serialVersionUID = 2828885661214875589L;
 
@@ -131,23 +132,18 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			workspaceLogger.trace("getting workspace");
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-
-			logger.info("getRoot");
 
 			WorkspaceFolder root = workspace.getRoot();
 
 			if (root == null) {
-				logger.error("The root is null");
+				workspaceLogger.error("The root is null");
 				throw new Exception("The root is null");
 			}
 
-			logger.trace("Root loaded, gxt conversion");
 			workspaceLogger.trace("Root loaded, gxt conversion");
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			FolderModel gwtroot =builder.buildWorkspaceFileModelRoot(root);
 
-			logger.trace("Root converted, returnig...");
 			workspaceLogger.trace("Root converted, returnig...");
 			return gwtroot;
 		} catch (Exception e) {
@@ -168,33 +164,24 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 
 			Workspace workspace = getWorkspace();
-			
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("getRoot for scope " + scopeId);
-			
 			workspaceLogger.trace("on server getRoot for scope: " + scopeId);
 			
-			GCUBEScope gcubeScope = null;
+//			GCUBEScope gcubeScope = null;
-			
+//			
-			if(scopeId.compareTo(ScopeUtilFilter.IDALLSCOPE)!=0){
+//			if(scopeId.compareTo(ScopeUtilFilter.IDALLSCOPE)!=0){
-				gcubeScope = GCUBEScope.getScope(scopeId);
+//				gcubeScope = GCUBEScope.getScope(scopeId);
-			}
+//			}
-			
 			
 			WorkspaceFolder root =  workspace.getRoot();
-//			WorkspaceFolder root = workspace.getRoot();
-			
-//			WorkspaceFolder root = workspace.getRoot(scopeId);
 
 			if (root == null) {
-				logger.error("The root is null");
+				workspaceLogger.error("The root is null");
 				throw new Exception("The root is null");
 			}
 
-			logger.trace("Root loaded, gxt conversion");
 			workspaceLogger.trace("Root loaded, gxt conversion");
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
-			logger.trace("Root converted, returnig...");
 			workspaceLogger.trace("Root converted, returnig...");
 			return builder.buildWorkspaceFileModelRoot(root);
 
@@ -216,18 +203,16 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 
 			Workspace workspace = getWorkspace();
-			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
 
 			List<SearchItem> listSearchItems = workspace.searchByName(text);
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			List<FileGridModel> listFileGridModels = new ArrayList<FileGridModel>();
 			
-			logger.trace("Call search HL..");
+			workspaceLogger.trace("Call search HL..");
 			
 			listFileGridModels = builder.buildGXTListFileGridModelItemForSearch(listSearchItems, null);
-			logger.trace("Search converted, completed...");
+			workspaceLogger.trace("Search converted, completed...");
 			
 			return listFileGridModels;
 		} catch (Exception e) {
@@ -243,19 +228,20 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	public List<FileModel> getFolderChildren(FolderModel folder) throws Exception, SessionExpiredException{
 		
 		Workspace workspace;
-		
+
 		if(isSessionExpired())
 			throw new SessionExpiredException();
 		
 		try {
+			
+			if(folder == null)
+				throw new Exception("Folder is null");	
 
+			workspaceLogger.trace("get folder children for: "+folder.getIdentifier());
 			workspace = getWorkspace();
 			
 			List<FileModel> listFileModels = new ArrayList<FileModel>();
-		
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("get children");
-	
 			WorkspaceItem wsItem = workspace.getItem(folder.getIdentifier());
 			
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -275,22 +261,21 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 	@Override
 	public List<FileGridModel> getFolderChildrenForFileGrid(FileModel folder) throws Exception, SessionExpiredException {
-		Workspace workspace;
 		
 		if(isSessionExpired())
 			throw new SessionExpiredException();
 		
 		try {
 			
-			workspace = getWorkspace();
+			if(folder == null)
+				throw new Exception("Folder is null");	
+			
+			workspaceLogger.trace("get children for Grid for folder: "+folder.getIdentifier());
+			
+			Workspace workspace = getWorkspace();
 			
 			List<FileGridModel> listFileGridModels = new ArrayList<FileGridModel>();
-		
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.trace("get children for Grid");
-			
-			workspaceLogger.trace("get children for Grid");
-	
 			WorkspaceFolder wsFolder = (WorkspaceFolder) workspace.getItem(folder.getIdentifier());
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -302,7 +287,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Long endTime = System.currentTimeMillis() - startTime;
 			String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime));
-			logger.trace("##HL FILLING: grid getChildren() returning "+listItems.size()+" elements in " + time);
+			workspaceLogger.debug("##HL FILLING: grid getChildren() returning "+listItems.size()+" elements in " + time);
 
 			listFileGridModels = builder.buildGXTListFileGridModelItem(listItems, folder);
 			
@@ -322,22 +307,23 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public List<FileGridModel> getFolderChildrenForFileGridById(String folderId) throws Exception, SessionExpiredException {
 		
-		Workspace workspace;
+
-		
 		if(isSessionExpired())
 			throw new SessionExpiredException();
 		
 		try {
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+
+			if(folderId == null)
+				throw new Exception("Folder id is null");	
 			
-			workspace = getWorkspace();
+			Workspace workspace = getWorkspace();
 			
-			logger.trace("get children for Grid by id: "+folderId);
+			workspaceLogger.trace("get children for Grid by id: "+folderId);
 			List<FileGridModel> listFileGridModels = new ArrayList<FileGridModel>();
 			
 			
 			if(folderId==null || folderId.isEmpty()){
-				logger.trace("id is null or empty, return");
+				workspaceLogger.trace("id is null or empty, return");
 				return listFileGridModels;
 			}
 		
@@ -378,7 +364,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Long endTime = System.currentTimeMillis() - startTime;
 			String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime));
-			logger.trace("grid getChildren() returning "+listItems.size()+" elements in " + time);
+			workspaceLogger.debug("grid getChildren() returning "+listItems.size()+" elements in " + time);
 			
 			
 			listFileGridModels = builder.buildGXTListFileGridModelItem(listItems, wsParent);
@@ -399,17 +385,16 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	
 	@Override
 	public FileGridModel getItemForFileGrid(String itemId) throws Exception {
-		Workspace workspace;
+
-		
 		try {
 			
-			workspace = getWorkspace();
+			if(itemId == null)
+				throw new Exception(IDENTIFIER_IS_NULL);	
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			Workspace workspace = getWorkspace();
-			logger.trace("get child for Grid by id: "+itemId);
+			
+			workspaceLogger.trace("get child for Grid by id: "+itemId);
 			
-			workspaceLogger.trace("get children for Grid");
-	
 			WorkspaceItem wsItem =  workspace.getItem(itemId);
 			
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -418,7 +403,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 			Long endTime = System.currentTimeMillis() - startTime;
 			String time = String.format("%d msc %d sec", endTime, TimeUnit.MILLISECONDS.toSeconds(endTime));
-			logger.trace("get child for Grid by id returning element in " + time);
+			workspaceLogger.debug("get child for Grid by id returning element in " + time);
 
 			
 			//BUILD PARENT
@@ -443,8 +428,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 		try {
 			Workspace workspace = getWorkspace();
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+		
-			logger.trace("moveItem item: "+itemId+" destination: "+destinationId);
+			if(itemId == null)
+				throw new Exception(IDENTIFIER_IS_NULL);	
+			
+			workspaceLogger.trace("moveItem item: "+itemId+" destination: "+destinationId);
 
 			WorkspaceItem sourceItem = workspace.getItem(itemId);  //GET SOURCE ITEM BEFORE OF MOVE
 			
@@ -615,14 +603,16 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 	@Override
 	public Boolean removeItem(String itemId) throws Exception {
-		workspaceLogger.trace("removeItem itemId: "+itemId);
-
-		try {
-			Workspace workspace = getWorkspace();
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.trace("removeItem item: "+itemId);
-
 		
+		try {
+			
+			if(itemId == null)
+				throw new Exception(IDENTIFIER_IS_NULL);	
+			
+			Workspace workspace = getWorkspace();
+
+			workspaceLogger.trace("removeItem item for id: "+itemId);
+
 			//NOTIFICATION
 			WorkspaceItem wsItem = workspace.getItem(itemId);
 			
@@ -630,8 +620,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			boolean sourceItemIsShared = wsItem.isShared();
 			String itemName = wsItem.getName();
 			String sourceFolderSharedId = null;
-			
+
-			
 			if(sourceItemIsShared){
 				sourceFolderSharedId = wsItem.getIdSharedFolder();
 			}
@@ -665,15 +654,15 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 	@Override
 	public Boolean renameItem(String itemId, String newName, String previousName) throws Exception {
-
+		
-		workspaceLogger.trace("renameItem itemId: "+itemId+" newName: "+newName);
-
 		try {
+			
+			if(itemId == null)
+				throw new Exception(IDENTIFIER_IS_NULL);	
+			
 			Workspace workspace = getWorkspace();
 			
-
+			workspaceLogger.trace("rename item itemId: "+itemId+" old name "+ previousName +", new name: "+newName);
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.trace("rename item itemId: "+itemId+" old name "+ previousName +", new name: "+newName);
 
 			workspace.renameItem(itemId, newName);
 
@@ -718,17 +707,17 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public FolderModel createFolder(String nameFolder, String description, FileModel parent) throws Exception {
 		
-		workspaceLogger.trace("create folder");
+		workspaceLogger.trace("create folder: "+nameFolder +" parent is null"+parent==null);
 
 		try {
-			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			if(nameFolder == null)
-			logger.trace("create folder: " + nameFolder);
+				throw new Exception("Folder name is null");	
+			
+			Workspace workspace = getWorkspace();
 
 			WorkspaceFolder wsFolder = workspace.createFolder(nameFolder, description, parent.getIdentifier());
 
-			
 			WorkspaceItem folderDestinationItem = workspace.getItem(parent.getIdentifier());
 			
 			checkNotifyAddItemToShare(wsFolder, null, folderDestinationItem);
@@ -739,8 +728,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server create folder", e);
-//			workspaceLogger.trace("Error in server create folder " + e);
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 		
@@ -749,13 +736,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public FileDetailsModel getDetailsFile(FileModel folder) throws Exception {
 		
-		workspaceLogger.trace("load file details");
-
 		try {
-			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			if(folder == null)
-			logger.trace("load file details: " + folder.getName());
+				throw new Exception("Folder is null");	
+			
+			workspaceLogger.trace("load file details: " + folder.getName());
+			
+			Workspace workspace = getWorkspace();
 
 			WorkspaceItem wsItem = workspace.getItem(folder.getIdentifier());
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -764,8 +752,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 
 		} catch (Exception e) {
 			workspaceLogger.error("Error in load server file details", e);
-//			workspaceLogger.trace("Error in server load file details" + e);
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 	}
@@ -778,10 +764,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 		try {
 			
+			if(itemIdentifier == null)
+				throw new Exception(IDENTIFIER_IS_NULL);	
+			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("search itemId: "+itemIdentifier);
-			logger.trace("search itemId: "+itemIdentifier);
 			
 			WorkspaceItem item = workspace.getItem(itemIdentifier); //get item from workspace	
 			getListsChildrenByParents(listSubTree, item);
@@ -789,8 +777,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server find Item", e);
-//			workspaceLogger.trace("Error in server find Item " + e);
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 		
@@ -804,16 +790,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get smart folder by category: "+category);
-			logger.trace("get smart folder by category: "+category);
-
-//			listWorkspaceItems = workspace.getWorkspaceTree(workspace.getRoot()); //get item from workspace	
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
-//			List<FileGridModel> listFileGridModel = new ArrayList<FileGridModel>();
-//			ArrayList<FolderItemType> listFolderItemType = builder.getListWorkspaceType(category);
-			
 			List<SearchItem> listWorkspaceItems = new ArrayList<SearchItem>();
 			
 			//Category IMAGES
@@ -862,13 +842,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			return builder.filterListFileGridModelItemByCategory(listWorkspaceItems, category);
 
-//			workspaceLogger.trace("listFileGridModel " + listFileGridModel.size());	
-//			return builder.filterListByCategory(listFileGridModel, category);
 		
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server get smart folder by category", e);
-//			workspaceLogger.trace("Error in server get smart folder by category " + e);
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 		
@@ -898,22 +874,11 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 			
 			Workspace workspace = getWorkspace();
-			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.trace("create smart folder by name: "+name);
-			
-			workspaceLogger.trace("name " + name);
-			workspaceLogger.trace("query " + query);
-			
-			/*WorkspaceFolder wsFolder  = workspace.createSmartFolder(name, query); //create Smart Folder from workspace	
-			
-			workspaceLogger.trace("create : " +wsFolder.getName()  + " id "+ wsFolder.getId());
 
-			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
+			workspaceLogger.trace("create smart folder by name: "+name);	
-			
+			workspaceLogger.trace("description " + description);
-			return builder.buildGXTSmartFolderModel(wsFolder,query);*/
+			workspaceLogger.trace("query " + query);
-			
+
-			
 			WorkspaceSmartFolder wsSmartFolder  = workspace.createSmartFolder(name, description, query); //create Smart Folder from workspace	
 			
 			workspaceLogger.trace("create : " +wsSmartFolder.getName()  + " id "+ wsSmartFolder.getId());
@@ -934,12 +899,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public Boolean removeSmartFolder(String itemId, String name) throws Exception {
 		
+		if(itemId==null)
+			return null;
+		
 		try {
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("remove smart folder by id: "+itemId);
-			logger.trace("remove smart folder by id: "+itemId);
 			
 			workspace.removeItem(itemId); //remove Smart Folder from workspace	
 			
@@ -947,8 +914,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 		} catch (Exception e) {
 			workspaceLogger.error("Error in remove smart folder by id: ", e);
-//			workspaceLogger.trace("Error in get smart folder by id " + e);
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 	}
@@ -960,18 +925,13 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get all smart folder");
-			logger.trace("get all smart folder");
-//			workspaceLogger.trace("get all smart folder");
-			
-//			List<WorkspaceFolder> listWorkspaceFolder = new ArrayList<WorkspaceFolder>();
-//			listWorkspaceFolder = workspace.getAllSmartFolders(); //create Smart Folder from workspace	
 			
 			List<WorkspaceSmartFolder> listWorkspaceFolder = new ArrayList<WorkspaceSmartFolder>();
 			
 			listWorkspaceFolder = workspace.getAllSmartFolders(); //create Smart Folder from workspace	
 			
-			workspaceLogger.trace("listWorkspaceFolder size" + listWorkspaceFolder.size());
+			workspaceLogger.trace("list smart folders size" + listWorkspaceFolder.size());
 			
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 		
@@ -979,8 +939,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server get all smart folder: ", e);
-//			workspaceLogger.trace("Error in server get all smart folder:" + e.getMessage());
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 	}
@@ -988,14 +946,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public List<FileGridModel> getSmartFolderResultsById(String folderId) throws Exception {
 
+		if(folderId == null)
+			return null;
+		
 		try {
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get smart folder by id: "+folderId);
-			logger.trace("get smart folder by id: "+folderId);
-			
-//			WorkspaceFolder wsFolder  = workspace.getSmartFolder(folderId); //get Smart Folder from workspace	
 			
 			WorkspaceSmartFolder wsSmartFolder  = workspace.getSmartFolder(folderId); //get Smart Folder from workspace	
 			
@@ -1009,8 +967,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 		} catch (Exception e) {
 			workspaceLogger.error("Error in get server smart folder by id", e);
-//			workspaceLogger.trace("Error in server get smart folder by id " + e);
-			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
 	}
@@ -1018,12 +974,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public GWTWorkspaceItem getImageById(String identifier, boolean isInteralImage, boolean fullDetails) throws Exception {
 		
+		if(identifier==null)
+			return null;
+		
 		try {
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get image by id: "+identifier);
-			logger.trace("get image by id: "+identifier);
 			
 			WorkspaceItem item = workspace.getItem(identifier); //get item from workspace	
 			
@@ -1035,14 +993,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
 			return builder.buildGWTWorkspaceImage(item, isInteralImage, fullDetails);
-			
+
-//			workspaceLogger.trace(" children "+wsFolder.getChildren().size());
-//			return builder.buildGWTWorkspaceItemsForGrid(wsFolder.getChildren(), null);
-		
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server get image by id", e);
-//			workspaceLogger.trace("Error in server get image by id " + e);
-			
 			throw new Exception(e.getMessage());
 		}
 	}
@@ -1050,12 +1003,14 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public GWTWorkspaceItem getTimeSeriesById(String identifier) throws Exception {
 		
+		if(identifier==null)
+			return null;
+		
 		try {
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get timeseries by id: "+identifier);
-			logger.trace("get timeseries by id: "+identifier);
 			
 			WorkspaceItem item = workspace.getItem(identifier); //get item from workspace	
 			
@@ -1076,10 +1031,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 		try {
 			
+			if(identifier==null)
+				throw new Exception(IDENTIFIER_IS_NULL);
+			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get url by id: "+identifier);
-			logger.trace("get url by id: "+identifier);
 			
 			WorkspaceItem item = workspace.getItem(identifier); //get item from workspace	
 			
@@ -1105,8 +1062,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	try {
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			if(parentFileModel==null)
-			logger.trace("create url in parent id: "+parentFileModel.getIdentifier());
+				throw new Exception("Parent item is null");
+			
+			workspaceLogger.trace("create url in parent id: "+parentFileModel.getIdentifier());
 			
 			//DEBUG
 //			workspaceLogger.trace("Name " + name);
@@ -1118,10 +1077,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			ExternalUrl ext = workspace.createExternalUrl(name, description, url, parentFileModel.getIdentifier());
 
-			
 			WorkspaceItem parent = workspace.getItem(parentFileModel.getIdentifier()); //get item from workspace	
 			workspaceLogger.trace("parent name " + parent.getName());
-			
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
@@ -1143,6 +1100,9 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		ApplicationReaderFromGenericResource app = new ApplicationReaderFromGenericResource();
 		
 		try{
+			
+			if(oid==null)
+				throw new Exception(IDENTIFIER_IS_NULL);
 
 			ASLSession session = WsUtil.getAslSession(this.getThreadLocalRequest().getSession());
 			
@@ -1190,7 +1150,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			ASLSession session = WsUtil.getAslSession(this.getThreadLocalRequest().getSession());
 			session.setAttribute(name, value);
 			workspaceLogger.trace("set value in session with name: "+name+", value: "+value);
-			workspaceLogger.debug("WS Session Id = " + session.getExternalSessionID());
+//			workspaceLogger.debug("WS Session Id = " + session.getExternalSessionID());
 //			System.out.println("set value in session with name: "+name+", value: "+value);
 			
 
@@ -1207,8 +1167,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get all scope");
-			logger.trace("get all scope");
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 
@@ -1311,13 +1270,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 			
 			Workspace workspace = getWorkspace();
-			
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("send To");
-			
-//			WorkspaceItem parent = workspace.getItem(parentFileModel.getIdentifier()); //get item from workspace	
-//			 workspace.getAllScope();
-//			
 			workspaceLogger.trace("######### SEND TO: ");
 			workspaceLogger.trace("subject " + subject);
 			workspaceLogger.trace("body " + body);
@@ -1325,18 +1278,15 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			for(String contactId : listContactsId)
 			workspaceLogger.trace("contactId " + contactId);
 			
-			
 			for(String id : listAttachmentsId)
 				workspaceLogger.trace("attachId " + id);
 
 			workspace.getWorkspaceMessageManager().sendMessageToPortalLogins(subject, body, listAttachmentsId, listContactsId);
 			
-			
 			return true; 
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server sendTo ", e);
-//			workspaceLogger.trace("Error in server get sendTo " + e.getMessage());
 			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
@@ -1349,8 +1299,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("getAllMessagesSent");
 			workspaceLogger.trace("get All Messages Sent ");
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -1372,9 +1320,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 			
 			Workspace workspace = getWorkspace();
-			
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("getAllMessagesReceived");
 			workspaceLogger.trace("get All Messages Received ");
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -1397,16 +1343,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("get Message by Id: "+messageIdentifier);
-			logger.info("get Message by Id");
-			
-//			WorkspaceItem parent = workspace.getItem(parentFileModel.getIdentifier()); //get item from workspace	
-//			 workspace.getAllScope();
 			
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
-//			return builder.buildGXTListMessageModel(); 
-			
 			WorkspaceMessage message = null;
 			if(messageType.equals(GXTCategoryItemInterface.MS_RECEIVED))
 				 message = workspace.getWorkspaceMessageManager().getReceivedMessage(messageIdentifier);
@@ -1421,7 +1361,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server get Message by Id ", e);
-//			workspaceLogger.trace("Error in server get Message by Id " + e.getMessage());
 			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
@@ -1453,8 +1392,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 				Workspace workspace = getWorkspace();
 				
-				GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-				
 				List<FolderBulkCreator> listFBC = workspace.getFolderBulkCreatorManager().getActiveFolderBulkCreators();
 				
 				GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
@@ -1479,13 +1416,10 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 	@Override
 	public boolean saveAttachments(String messageIdentifier, String messageType) throws Exception {
 
-	try {
+		try {
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("save attachments by messageIdentifier");
-			
 			workspaceLogger.trace(" save attachments by messageIdentifier " + messageIdentifier);
 			if(messageType.equals(GXTCategoryItemInterface.MS_SENT))
 				workspace.getWorkspaceMessageManager().getSentMessage(messageIdentifier).saveAttachments(workspace.getRoot().getId());
@@ -1497,7 +1431,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server save attachments by messageIdentifier ", e);
-//			workspaceLogger.trace("Error in server save attachments by messageIdentifier " + e.getMessage());
 			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
@@ -1515,10 +1448,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 
 			Workspace workspace = getWorkspace();
-			
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-//			logger.info("markMessageAsRead");
-			
 			workspaceLogger.trace(" markMessageAsRead by messageIdentifier " + messageIdentifier + " boolMark " + boolMark + " messageType " +messageType);
 			
 			if(messageType.equals(GXTCategoryItemInterface.MS_RECEIVED)){
@@ -1557,7 +1487,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server markMessageAsRead by messageIdentifier ", e);
-//			workspaceLogger.trace("Error in server markMessageAsRead by messageIdentifier " + e.getMessage());
 			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
@@ -1570,9 +1499,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-//			logger.info("deleteMessage by messageIdentifier");
-			
 			workspaceLogger.trace("deleteMessage by messageIdentifier " + messageIdentifier);
 			
 			if(messageType.equals(GXTCategoryItemInterface.MS_RECEIVED))
@@ -1585,7 +1511,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server deleteMessage by messageIdentifier ", e);
-//			workspaceLogger.trace("Error in server deleteMessage by messageIdentifier " + e.getMessage());
 			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
@@ -1597,11 +1522,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 			
 			Workspace workspace = getWorkspace();
-			
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			
-//			workspaceLogger.trace("in server getNewMessagesReceived ");
-			
 			int count = workspace.getWorkspaceMessageManager().getMessagesNotOpened();
 			
 			List<MessageModel> listMessageModels = new ArrayList<MessageModel>();
@@ -1614,7 +1535,6 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 		} catch (Exception e) {
 			workspaceLogger.error("Error in server getNewMessagesReceived by messageIdentifier ", e);
-//			workspaceLogger.trace("Error in server getNewMessagesReceived by messageIdentifier " + e.getMessage());
 			//GWT can't serialize all exceptions
 			throw new Exception(e.getMessage());
 		}
@@ -1628,10 +1548,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("searchInSentMessagesByText "+text);
-			logger.info("searchInSentMessagesByText");
+			
-//			workspaceLogger.trace("searchInSentMessagesByText ");
-
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
 			List<WorkspaceMessage> listMessages = workspace.getWorkspaceMessageManager().searchOutMessages(text);
@@ -1652,9 +1570,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("searchInSentMessagesByText: "+text);
-			logger.info("searchInSentMessagesByText");
-//			workspaceLogger.trace("searchInSentMessagesByText ");
 
 			GWTWorkspaceBuilder builder = getGWTWorkspaceBuilder();
 			
@@ -1681,8 +1597,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 			WorkspaceItem sourceItem = workspace.getItem(itemId); //GET SOURCE ITEM BEFORE COPY
 			String sourceSharedId = sourceItem.getIdSharedFolder();
 	
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("copyItem by id: " + itemId);
-			logger.info("copyItem by id: " + itemId);
 
 			WorkspaceItem item = workspace.copy(itemId, destinationFolderId);  //copy item
 			
@@ -1714,11 +1629,8 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		try {
 			Workspace workspace = getWorkspace();
 			
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
+			workspaceLogger.trace("delete bulk " + bulkId);
-			logger.info("delete bulk " + bulkId);
+
-			
-//			workspaceLogger.trace("delete bulk " + bulkId);
-			
 			workspace.getFolderBulkCreatorManager().getActiveFolderBulkCreator(bulkId).remove();
 			
 			return true;
@@ -1736,10 +1648,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		
 		try {
 			Workspace workspace = getWorkspace();
-			
+
-			GCUBEClientLog logger = new GCUBEClientLog(GWTWorkspaceServiceImpl.class);
-			logger.info("getWebDavUrl " + itemId);
-			
 			workspaceLogger.trace("getWebDavUrl" + itemId);
 
 			return workspace.getUrlWebDav();
@@ -2344,7 +2253,7 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
 		String userUsername = WsUtil.getAslSession(this.getThreadLocalRequest().getSession()).getUsername();
 		boolean isTestUser = userUsername.compareTo(WsUtil.TEST_USER)==0;
 		
-//		//TODO COMMENT THIS FOR RELEASE
+//		//TODO COMMENT THIS FOR DEVELOPMENT
 //		workspaceLogger.trace("is "+WsUtil.TEST_USER+" user: "+isTestUser + " is test mode: "+isTestMode());
 //		
 //		if(isTestUser && !isTestMode()){

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

@@ -13,7 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.IOUtils;
-import org.gcube.common.core.utils.logging.GCUBELog;
+import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
@@ -32,7 +32,9 @@ import org.gcube.portlets.user.workspace.server.util.WsUtil;
 public class ImageServlet extends HttpServlet{
 
 	private static final long serialVersionUID = -8423345575690165644L;
-	protected GCUBELog logger = new GCUBELog(ImageServlet.class);
+
+	protected static Logger logger = Logger.getLogger(ImageServlet.class);
+	
 
 	/**
 	 * {@inheritDoc}
@@ -40,7 +42,8 @@ public class ImageServlet extends HttpServlet{
 	@Override
 	public void init() throws ServletException {
 		super.init();
-		System.out.println("Workspace ImageServlet ready.");
+
+		logger.trace("Workspace ImageServlet ready.");
 	}
 
 

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

@@ -22,7 +22,7 @@ import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.commons.io.FilenameUtils;
-import org.gcube.common.core.utils.logging.GCUBELog;
+import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
@@ -62,7 +62,7 @@ public class UploadServlet extends HttpServlet {
 	
 	public static final String FILE = "File";
 
-	protected GCUBELog logger = new GCUBELog(UploadServlet.class);
+	protected static Logger logger = Logger.getLogger(UploadServlet.class);
 	
 	public static final String D4ST = Extensions.REPORT_TEMPLATE.getName(); //extension of Report Template type
 	public static final String D4SR = Extensions.REPORT.getName(); //extension of Report type

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

@@ -1,143 +0,0 @@
-/**
- * 
- */
-package org.gcube.portlets.user.workspace.server.notifications;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.apache.log4j.Logger;
-import org.gcube.common.core.contexts.GHNContext;
-import org.gcube.common.core.informationsystem.client.AtomicCondition;
-import org.gcube.common.core.informationsystem.client.ISClient;
-import org.gcube.common.core.informationsystem.client.queries.GCUBERIQuery;
-import org.gcube.common.core.scope.GCUBEScope;
-
-import com.liferay.portal.model.Organization;
-import com.liferay.portal.service.OrganizationLocalServiceUtil;
-
-/**
- * @author "Federico De Faveri defaveri@isti.cnr.it"
- *
- */
-public class FeedScheduler {
-
-	protected Timer scheduler;
-	protected Map<GCUBEScope, NotificationsProducer> scheduledScopes;
-	protected Logger logger = Logger.getLogger(FeedScheduler.class);
-
-	public FeedScheduler(long refreshTime)
-	{
-		scheduledScopes = new HashMap<GCUBEScope, NotificationsProducer>();
-		scheduler = new Timer(true);
-		scheduler.schedule(new TimerTask() {
-			@Override
-			public void run() {
-				checkScopes();
-			}
-		}, 0, refreshTime);
-	}
-
-	public void schedule() throws Exception
-	{
-		List<GCUBEScope> scopes = getAvailableScopes();
-		for (GCUBEScope scope:scopes) {
-			logger.trace("checking scope: "+scope);
-			if (isServicePresentInScope(scope)) {
-				logger.trace("service present");
-				schedule(scope);
-			} else logger.trace("service not present");
-		}
-		
-		checkScopes();
-	}
-
-	protected void schedule(GCUBEScope scope)
-	{
-//		if (!scheduledScopes.containsKey(scope)) {
-//			NotificationsProducer feeder = new NotificationsProducer(scope);
-//			scheduledScopes.put(scope, feeder);
-//		}
-	}
-
-	protected void checkScopes()
-	{
-		for (NotificationsProducer feeder:scheduledScopes.values()) {
-			try {
-//				feeder.checkOperatorsForFeed();
-			} catch (Exception e) {
-			}
-		}
-	}
-	
-	protected boolean isServicePresentInScope(GCUBEScope scope) throws Exception
-	{
-		ISClient isClient = GHNContext.getImplementation(ISClient.class);
-		GCUBERIQuery query = isClient.getQuery(GCUBERIQuery.class);
-		query.addAtomicConditions(new AtomicCondition("/Profile/ServiceName", "statistical-manager-gcubews"));
-		query.addAtomicConditions(new AtomicCondition("/Profile/ServiceClass", "DataAnalysis"));
-		
-		return isClient.execute(query, scope).size()>0;
-	}
-	
-	protected static List<GCUBEScope> getAvailableScopes() throws Exception
-	{
-		//FIXME for test only
-		//return Arrays.asList(GCUBEScope.getScope("/gcube/devsec/devVRE"));
-		
-		GHNContext ctx = GHNContext.getContext();
-		String rootScopeName = (String) ctx.getProperty(GHNContext.INFRASTRUCTURE_NAME, true);
-		GCUBEScope rootScope = GCUBEScope.getScope("/"+rootScopeName);
-		List<GCUBEScope> scopes = findAvailableScopes(rootScope);
-		return scopes;
-	}
-
-	protected static List<GCUBEScope> findAvailableScopes(GCUBEScope infrastructure) throws Exception {
-
-		List<GCUBEScope> scopes = new ArrayList<GCUBEScope>();
-
-		//************* PORTAL MODE, Checking organizations
-		scopes.add(infrastructure);
-
-		///************* GET ROOT ORGANIZATION
-		List<Organization> organizations = OrganizationLocalServiceUtil.getOrganizations(0, OrganizationLocalServiceUtil.getOrganizationsCount());
-		Organization rootOrganization = null;				
-		for (Organization organization : organizations) {
-			if (organization.getName().equals(infrastructure.getName()) ) {
-				rootOrganization = organization;
-				break;
-			}
-		}
-		if(rootOrganization==null) throw new Exception("Unable to find infrastructure scope "+infrastructure.getName()+" among organizations");
-		//************** GET VO
-		for (Organization vOrg : rootOrganization.getSuborganizations()){
-			String VOScopeString="/"+vOrg.getParentOrganization().getName()+"/"+vOrg.getName();
-			try{
-				scopes.add(GCUBEScope.getScope(VOScopeString));
-				for (Organization vre : vOrg.getSuborganizations()){
-					String VREScopeString=VOScopeString+"/"+vre.getName();
-					try{
-						scopes.add(GCUBEScope.getScope(VREScopeString));
-					}catch(Exception e){
-					}
-				}
-			}catch(Exception e){
-			}
-			//************* GET VRE
-		}
-
-		return scopes;
-	}
-	
-	public static void main(String[] args) throws Exception
-	{
-		
-		FeedScheduler scheduler = new FeedScheduler(1000);
-		scheduler.schedule();
-	}
-
-}

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

@@ -6,15 +6,15 @@ package org.gcube.portlets.user.workspace.server.notifications;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.log4j.Logger;
 import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.application.framework.core.session.SessionManager;
 import org.gcube.applicationsupportlayer.social.NotificationsManager;
-import org.gcube.common.core.scope.GCUBEScope;
-import org.gcube.common.core.utils.logging.GCUBEClientLog;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceFolder;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceSharedFolder;
+import org.gcube.common.scope.impl.ScopeBean;
 import org.gcube.portlets.user.workspace.client.model.InfoContactModel;
 import org.gcube.portlets.user.workspace.server.util.DiffereceBeetweenInfoContactModel;
 import org.gcube.portlets.user.workspace.server.util.UserUtil;
@@ -27,8 +27,9 @@ import org.gcube.portlets.user.workspace.server.util.WsUtil;
  */
 public class NotificationsProducer {
 
-	protected GCUBEClientLog gcubeLogger = new GCUBEClientLog(NotificationsProducer.class);
+	protected ScopeBean scope;
-	protected GCUBEScope scope;
+	
+	protected static Logger logger = Logger.getLogger(NotificationsProducer.class);
 	
 	protected NotificationsManager notificationsMng;
 	protected ASLSession aslSession;
@@ -69,14 +70,14 @@ public class NotificationsProducer {
 			@Override
 			public void run() {
 				
-				gcubeLogger.trace("Send notifies folder sharing is running...");
+				logger.trace("Send notifies folder sharing is running...");
 				  
 				for (InfoContactModel infoContactModel : listContacts) {
 					try{
 						//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 						if(infoContactModel.getLogin().compareTo(userId)!=0){ 
 							
-							gcubeLogger.trace("Sending notification new share folder "+sharedFolder.getName()+" for user "+infoContactModel.getLogin());
+							logger.trace("Sending notification new share folder "+sharedFolder.getName()+" for user "+infoContactModel.getLogin());
 							
 							//DEBUG
 							System.out.println("Sending notification new share folder "+sharedFolder.getName()+" for user "+infoContactModel.getLogin());
@@ -85,15 +86,15 @@ public class NotificationsProducer {
 							
 							
 							if(!notify)
-								gcubeLogger.error("An error occured when notify user: "+infoContactModel.getLogin());
+								logger.error("An error occured when notify user: "+infoContactModel.getLogin());
 						}
 					}catch (Exception e) {
-						gcubeLogger.error("An error occured in notifyFolderSharing ", e);
+						logger.error("An error occured in notifyFolderSharing ", e);
 						e.printStackTrace();
 					}
 				}
 				
-				gcubeLogger.trace("notifies share folder is completed");
+				logger.trace("notifies share folder is completed");
 			}
 		}.start();
 		
@@ -114,17 +115,17 @@ public class NotificationsProducer {
 			@Override
 			public void run() {
 				
-				gcubeLogger.trace("Send notifies shared folder was renamed is running...");
+				logger.trace("Send notifies shared folder was renamed is running...");
 				
 				try {
 					  
 					if(NotificationsUtil.checkIsRootFolderShared(folderItem.getId(), idsharedFolder)){
-						gcubeLogger.trace("Notification isn't sent because the event is on root shared folder");
+						logger.trace("Notification isn't sent because the event is on root shared folder");
 						return;
 					}
 						
 				} catch (InternalErrorException e1) {
-					gcubeLogger.error("An error occurred in checkIsRootFolderShared ", e1);
+					logger.error("An error occurred in checkIsRootFolderShared ", e1);
 					return;
 				}
 				
@@ -133,7 +134,7 @@ public class NotificationsProducer {
 						//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 						if(infoContactModel.getLogin().compareTo(userId)!=0){ 
 							
-							gcubeLogger.trace("Sending notification share folder "+itemOldName+" was renamed as " + itemNewName+ "for user "+infoContactModel.getLogin());
+							logger.trace("Sending notification share folder "+itemOldName+" was renamed as " + itemNewName+ "for user "+infoContactModel.getLogin());
 							
 							//DEBUG
 							System.out.println("Sending notification share folder "+itemOldName+" was renamed as " + itemNewName+ "for user "+infoContactModel.getLogin());
@@ -142,15 +143,15 @@ public class NotificationsProducer {
 							
 							
 							if(!notify)
-								gcubeLogger.error("An error occured when notify user: "+infoContactModel.getLogin());
+								logger.error("An error occured when notify user: "+infoContactModel.getLogin());
 						}
 					}catch (Exception e) {
-						gcubeLogger.error("An error occured in notifyFolderRenamed ", e);
+						logger.error("An error occured in notifyFolderRenamed ", e);
 						e.printStackTrace();
 					}
 				}
 				
-				gcubeLogger.trace("notifies share folder was renamed is completed");
+				logger.trace("notifies share folder was renamed is completed");
 			}
 		}.start();
 		
@@ -169,14 +170,14 @@ public class NotificationsProducer {
 			@Override
 			public void run() {
 				
-				gcubeLogger.trace("Send notifies shared item was updated is running...");
+				logger.trace("Send notifies shared item was updated is running...");
 				  
 				for (InfoContactModel infoContactModel : listSharedContact) {
 					try{
 						//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 						if(infoContactModel.getLogin().compareTo(userId)!=0){ 
 							
-							gcubeLogger.trace("Sending notification to user "+infoContactModel.getLogin() + " updated item "+item.getName());
+							logger.trace("Sending notification to user "+infoContactModel.getLogin() + " updated item "+item.getName());
 							
 							//DEBUG
 							System.out.println("Sending notification to user "+infoContactModel.getLogin() + " updated item "+item.getName());
@@ -186,15 +187,15 @@ public class NotificationsProducer {
 							boolean notify = notificationsMng.notifyItemRenaming(infoContactModel.getLogin(), previousName, item);
 
 							if(!notify)
-								gcubeLogger.error("An error occured when notify user: "+infoContactModel.getLogin());
+								logger.error("An error occured when notify user: "+infoContactModel.getLogin());
 						}
 					}catch (Exception e) {
-						gcubeLogger.error("An error occured in notifyItemUpdated ", e);
+						logger.error("An error occured in notifyItemUpdated ", e);
 						e.printStackTrace();
 					}
 				}
 				
-				gcubeLogger.trace("notifies shared item was updated is completed");
+				logger.trace("notifies shared item was updated is completed");
 			}
 		}.start();
 		
@@ -232,7 +233,7 @@ public class NotificationsProducer {
 									
 									try{
 	
-										gcubeLogger.trace("Sending notification to user "+contact.getLogin()+", added user "+ infoContactModel.getLogin() +" to share folder "+sharedFolder.getName());
+										logger.trace("Sending notification to user "+contact.getLogin()+", added user "+ infoContactModel.getLogin() +" to share folder "+sharedFolder.getName());
 										
 										//DEBUG
 	//									System.out.println("Sending notification added user "+ infoContactModel.getLogin() +" to share folder "+sharedFolder.getName() + " for user "+contact.getLogin());
@@ -240,10 +241,10 @@ public class NotificationsProducer {
 										boolean notify = notificationsMng.notifyFolderAddedUser(contact.getLogin(), sharedFolder, infoContactModel.getLogin());
 										
 										if(!notify)
-											gcubeLogger.error("An error occured when notifies user: "+contact.getLogin());
+											logger.error("An error occured when notifies user: "+contact.getLogin());
 									
 									}catch (Exception e) {
-										gcubeLogger.error("An error occured in notifyFolderAddedUser ", e);
+										logger.error("An error occured in notifyFolderAddedUser ", e);
 										e.printStackTrace();
 									}
 							}
@@ -260,7 +261,7 @@ public class NotificationsProducer {
 									
 									try{
 	
-										gcubeLogger.trace("Sending notification to user "+contact.getLogin()+", added "+listLogins.size()+" users to share folder "+sharedFolder.getName());
+										logger.trace("Sending notification to user "+contact.getLogin()+", added "+listLogins.size()+" users to share folder "+sharedFolder.getName());
 										
 										//DEBUG
 	//									System.out.println("Sending notification added user "+ infoContactModel.getLogin() +" to share folder "+sharedFolder.getName() + " for user "+contact.getLogin());
@@ -268,10 +269,10 @@ public class NotificationsProducer {
 										boolean notify = notificationsMng.notifyFolderAddedUsers(contact.getLogin(), sharedFolder, listLogins);
 										
 										if(!notify)
-											gcubeLogger.error("An error occured when notifies user: "+contact.getLogin());
+											logger.error("An error occured when notifies user: "+contact.getLogin());
 									
 									}catch (Exception e) {
-										gcubeLogger.error("An error occured in notifyFolderAddedUser ", e);
+										logger.error("An error occured in notifyFolderAddedUser ", e);
 										e.printStackTrace();
 									}
 							}
@@ -284,7 +285,7 @@ public class NotificationsProducer {
 					  }
 					
 					}catch (Exception e) {
-						gcubeLogger.error("An error occured in notifyAddedUserToSharing ", e);
+						logger.error("An error occured in notifyAddedUserToSharing ", e);
 						e.printStackTrace();
 					}
 				}
@@ -307,7 +308,7 @@ public class NotificationsProducer {
 			  public void run() {
 				  
 //				  printContacts(listContacts);
-				  gcubeLogger.trace("Send notifies folder un share is running...");
+				  logger.trace("Send notifies folder un share is running...");
 				  
 				  for (InfoContactModel infoContactModel : listContacts) {
 						try{
@@ -315,7 +316,7 @@ public class NotificationsProducer {
 							//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 							if(infoContactModel.getLogin().compareTo(userId)!=0){
 							
-								gcubeLogger.trace("Sending notification to user "+infoContactModel.getLogin() +" un shared folder "+unSharedFolder.getName());
+								logger.trace("Sending notification to user "+infoContactModel.getLogin() +" un shared folder "+unSharedFolder.getName());
 				
 								//DEBUG
 								System.out.println("Sending notification to user "+infoContactModel.getLogin() +" un shared folder "+unSharedFolder.getName());
@@ -323,15 +324,15 @@ public class NotificationsProducer {
 								boolean notify = notificationsMng.notifyFolderRemovedUser(infoContactModel.getLogin(), unSharedFolder);
 								
 								if(!notify)
-									gcubeLogger.error("An error occured when notifies user: "+infoContactModel.getLogin());
+									logger.error("An error occured when notifies user: "+infoContactModel.getLogin());
 							}
 						}catch (Exception e) {
-							gcubeLogger.error("An error occured in notifyFolderUnSharing ", e);
+							logger.error("An error occured in notifyFolderUnSharing ", e);
 							e.printStackTrace();
 						}
 					}
 				  
-				  gcubeLogger.trace("notifies of un share notifications is completed");
+				  logger.trace("notifies of un share notifications is completed");
 			  }
 
 		}.start();
@@ -352,7 +353,7 @@ public class NotificationsProducer {
 			  public void run() {
 				  
 //				  printContacts(listContacts);
-				  gcubeLogger.trace("Send notifies added item in sharedfolder is running...");
+				  logger.trace("Send notifies added item in sharedfolder is running...");
 				  
 				  //DEBUG
 				  System.out.println("Send notifies added item in sharedfolder is running...");
@@ -363,7 +364,7 @@ public class NotificationsProducer {
 							//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 							if(infoContactModel.getLogin().compareTo(userId)!=0){ 
 							
-								gcubeLogger.trace("Sending notification to user "+infoContactModel.getLogin() +" added item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
+								logger.trace("Sending notification to user "+infoContactModel.getLogin() +" added item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
 				
 								//DEBUG
 								System.out.println("Sending notification to user "+infoContactModel.getLogin() +" added item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
@@ -374,18 +375,18 @@ public class NotificationsProducer {
 								boolean notify = notificationsMng.notifyAddedItem(infoContactModel.getLogin(), workspaceItem, sharedFolder);
 
 								if(!notify){
-									gcubeLogger.error("An error occured when notify user: "+infoContactModel.getLogin());
+									logger.error("An error occured when notify user: "+infoContactModel.getLogin());
 									//DEBUG
 									System.out.println("An error occured when notify user: "+infoContactModel.getLogin());
 								}
 							}
 						}catch (Exception e) {
-							gcubeLogger.error("An error occured in notifyAddedItemToSharing ", e);
+							logger.error("An error occured in notifyAddedItemToSharing ", e);
 							e.printStackTrace();
 						}
 					}
 				  
-				  gcubeLogger.trace("notifies of added item in shared folder is completed");
+				  logger.trace("notifies of added item in shared folder is completed");
 				  
 				  //DEBUG
 				  System.out.println("notifies of added item in shared folder is completed");
@@ -407,7 +408,7 @@ public class NotificationsProducer {
 			  public void run() {
 				  
 //				  printContacts(listContacts);
-				  gcubeLogger.trace("Send notifies updated item in shared folder is running...");
+				  logger.trace("Send notifies updated item in shared folder is running...");
 				  
 				  //DEBUG
 				  System.out.println("Send notifies updated item in shared folder is running...");
@@ -418,7 +419,7 @@ public class NotificationsProducer {
 							//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 							if(infoContactModel.getLogin().compareTo(userId)!=0){ 
 							
-								gcubeLogger.trace("Sending notification to user "+infoContactModel.getLogin() +" updated item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
+								logger.trace("Sending notification to user "+infoContactModel.getLogin() +" updated item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
 				
 								//DEBUG
 								System.out.println("Sending notification to user "+infoContactModel.getLogin() +" updated item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
@@ -429,18 +430,18 @@ public class NotificationsProducer {
 								boolean notify = notificationsMng.notifyUpdatedItem(infoContactModel.getLogin(), workspaceItem, sharedFolder);
 
 								if(!notify){
-									gcubeLogger.error("An error updated when notify user: "+infoContactModel.getLogin());
+									logger.error("An error updated when notify user: "+infoContactModel.getLogin());
 									//DEBUG
 									System.out.println("An error updated when notify user: "+infoContactModel.getLogin());
 								}
 							}
 						}catch (Exception e) {
-							gcubeLogger.error("An error updated in notifyAddedItemToSharing ", e);
+							logger.error("An error updated in notifyAddedItemToSharing ", e);
 							e.printStackTrace();
 						}
 					}
 				  
-				  gcubeLogger.trace("notifies of updated item in shared folder is completed");
+				  logger.trace("notifies of updated item in shared folder is completed");
 				  
 				  //DEBUG
 				  System.out.println("notifies of updated item in shared folder is completed");
@@ -465,22 +466,22 @@ public class NotificationsProducer {
 			  @Override
 			  public void run() {
 				  
-				  gcubeLogger.trace("Sending notification remove item in shared folder is running...");
+				  logger.trace("Sending notification remove item in shared folder is running...");
 //				  printContacts(listContacts);
 				  
 				  try {
 					  
 						if(NotificationsUtil.checkIsRootFolderShared(workspaceItem.getId(), sharedFolder.getId())){
-							gcubeLogger.trace("Notification isn't sent because the event is on root shared folder");
+							logger.trace("Notification isn't sent because the event is on root shared folder");
 							return;
 						}
 					
 				  } catch (InternalErrorException e1) {
-						gcubeLogger.error("An error occurred in checkIsRootFolderShared ", e1);
+						logger.error("An error occurred in checkIsRootFolderShared ", e1);
 						return;
 				  }
 				  
-				  gcubeLogger.trace("Sending notification moved item in shared folder is running...");
+				  logger.trace("Sending notification moved item in shared folder is running...");
 				  
 				  System.out.println("Sending notification moved item in shared folder is running...");
 				  
@@ -490,7 +491,7 @@ public class NotificationsProducer {
 							//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 							if(infoContactModel.getLogin().compareTo(userId)!=0){
 							
-								gcubeLogger.trace("Sending notification  to user "+infoContactModel.getLogin() +" moved item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
+								logger.trace("Sending notification  to user "+infoContactModel.getLogin() +" moved item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
 								
 								//DEBUG
 								System.out.println("Sending notification  to user "+infoContactModel.getLogin() +" moved item "+workspaceItem.getName()+" in shared folder "+sharedFolder.getName());
@@ -498,19 +499,19 @@ public class NotificationsProducer {
 								boolean notify = notificationsMng.notifyMovedItem(infoContactModel.getLogin(), workspaceItem, sharedFolder);
 
 								if(!notify){
-									gcubeLogger.error("An error occured when notify user: "+infoContactModel.getLogin());
+									logger.error("An error occured when notify user: "+infoContactModel.getLogin());
 									
 									//DEBUG
 									System.out.println("An error occured when notify user: "+infoContactModel.getLogin());
 								}
 							}
 						}catch (Exception e) {
-							gcubeLogger.error("An error occurred in notifyMovedItemToSharing ", e);
+							logger.error("An error occurred in notifyMovedItemToSharing ", e);
 							e.printStackTrace();
 						}
 					}
 				  
-				  gcubeLogger.trace("notifies of moved item in shared folder is completed");
+				  logger.trace("notifies of moved item in shared folder is completed");
 				  
 				  //DEBUG
 				  System.out.println("notifies of moved item in shared folder is completed");
@@ -535,19 +536,19 @@ public class NotificationsProducer {
 			  @Override
 			  public void run() {
 				  
-				  gcubeLogger.trace("Sending notification remove item in shared folder is running...");
+				  logger.trace("Sending notification remove item in shared folder is running...");
 //				  printContacts(listContacts);
 				  
 				  if(itemName==null || itemName.isEmpty()){
-					  gcubeLogger.trace("Notification isn't sent - itemName is null or empty");
+					  logger.trace("Notification isn't sent - itemName is null or empty");
 					  return;
 				  }
 				  
 				  if(sharedFolder==null){
-					  gcubeLogger.trace("Notification isn't sent - sharedFolder is null");
+					  logger.trace("Notification isn't sent - sharedFolder is null");
 				  }
 				  
-				  gcubeLogger.trace("Sending notification removed item in shared folder is running...");
+				  logger.trace("Sending notification removed item in shared folder is running...");
 				  
 				  System.out.println("Sending notification removed item in shared folder is running...");
 				  
@@ -557,7 +558,7 @@ public class NotificationsProducer {
 							//NOTIFIES ONLY THE USERS THAT ARE DIFFERENT FROM CURRENT USER
 							if(infoContactModel.getLogin().compareTo(userId)!=0){
 							
-								gcubeLogger.trace("Sending notification  to user "+infoContactModel.getLogin() +" removed item "+itemName+" in shared folder "+sharedFolder.getName());
+								logger.trace("Sending notification  to user "+infoContactModel.getLogin() +" removed item "+itemName+" in shared folder "+sharedFolder.getName());
 								
 								//DEBUG
 								System.out.println("Sending notification  to user "+infoContactModel.getLogin() +" removed item "+itemName+" in shared folder "+sharedFolder.getName());
@@ -568,19 +569,19 @@ public class NotificationsProducer {
 
 								
 								if(!notify){
-									gcubeLogger.error("An error occured when notify user: "+infoContactModel.getLogin());
+									logger.error("An error occured when notify user: "+infoContactModel.getLogin());
 									
 									//DEBUG
 									System.out.println("An error occured when notify user: "+infoContactModel.getLogin());
 								}
 							}
 						}catch (Exception e) {
-							gcubeLogger.error("An error occurred in notifyRemovedItemToSharing ", e);
+							logger.error("An error occurred in notifyRemovedItemToSharing ", e);
 							e.printStackTrace();
 						}
 					}
 				  
-				  gcubeLogger.trace("notifies of moved item in shared folder is completed");
+				  logger.trace("notifies of moved item in shared folder is completed");
 				  
 				  //DEBUG
 				  System.out.println("notifies of moved item in shared folder is completed");
@@ -610,11 +611,11 @@ public class NotificationsProducer {
 		String scopeString = "/gcube/devsec/devVRE";
 		String fullName = "Francesco Mangiacrapa";
 		
-		GCUBEScope scope;
+		ScopeBean scope;
 		ASLSession session;
 		
 		session = SessionManager.getInstance().getASLSession(sessionID, user);
-		scope = GCUBEScope.getScope(scopeString);
+		scope = new ScopeBean(scopeString);
 		session.setScope(scope.toString());
 		session.setUserAvatarId(user + "Avatar");
 		session.setUserFullName(fullName);

src/main/java/org/gcube/portlets/user/workspace/server/util/MetadataConverter.java

@@ -23,10 +23,10 @@ import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
 import org.gcube.application.framework.core.genericresources.model.ISGenericResource;
 import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.application.framework.core.util.GenericResource;
-import org.gcube.common.core.utils.logging.GCUBELog;
 
 
 /**
@@ -35,7 +35,7 @@ import org.gcube.common.core.utils.logging.GCUBELog;
  */
 public class MetadataConverter {
 
-	protected GCUBELog logger;
+	protected Logger logger;
 
 	/**
 	 * FIXME public as generic resource  
@@ -57,7 +57,7 @@ public class MetadataConverter {
 	/**
 	 * Create a new MetadataConverter.
 	 */
-	public MetadataConverter(GCUBELog logger)
+	public MetadataConverter(Logger logger)
 	{
 		this.logger = logger;
 	}

src/main/java/org/gcube/portlets/user/workspace/server/util/WorkspaceEventCollector.java

@@ -6,7 +6,7 @@ package org.gcube.portlets.user.workspace.server.util;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import org.gcube.common.core.utils.logging.GCUBELog;
+import org.apache.log4j.Logger;
 import org.gcube.common.homelibrary.home.workspace.events.WorkspaceEvent;
 import org.gcube.common.homelibrary.home.workspace.events.WorkspaceListener;
 
@@ -16,14 +16,14 @@ import org.gcube.common.homelibrary.home.workspace.events.WorkspaceListener;
  */
 public class WorkspaceEventCollector implements WorkspaceListener {
 	
-	protected GCUBELog logger;
+	protected Logger logger;
 	
 	protected BlockingQueue<WorkspaceEvent> eventsQueue = new LinkedBlockingQueue<WorkspaceEvent>();
 
 	/**
 	 * @param logger
 	 */
-	public WorkspaceEventCollector(GCUBELog logger) {
+	public WorkspaceEventCollector(Logger logger) {
 		this.logger = logger;
 	}
 

src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java

@@ -11,8 +11,6 @@ import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.application.framework.core.session.SessionManager;
 import org.gcube.applicationsupportlayer.social.ApplicationNotificationsManager;
 import org.gcube.applicationsupportlayer.social.NotificationsManager;
-import org.gcube.common.core.utils.logging.GCUBEClientLog;
-import org.gcube.common.core.utils.logging.GCUBELog;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
@@ -62,8 +60,6 @@ public class WsUtil {
 	public static final String TEST_USER_FULL_NAME = "Test User";
 	
 	
-	public static GCUBEClientLog defaultLogger = new GCUBEClientLog(WsUtil.class);
-	
 	protected static Logger logger = Logger.getLogger(WsUtil.class);
 
 	public static boolean withoutPortal = false;
@@ -83,11 +79,11 @@ public class WsUtil {
 			//UNCOMMENT THIS IN DEVELOP ENVIROMENT
 //			user = "francesco.mangiacrapa";
 			
-			defaultLogger.warn("WORKSPACE PORTLET STARTING IN TEST MODE - NO USER FOUND - PORTLETS STARTING WITH FOLLOWING SETTINGS:");
+			logger.warn("WORKSPACE PORTLET STARTING IN TEST MODE - NO USER FOUND - PORTLETS STARTING WITH FOLLOWING SETTINGS:");
-			defaultLogger.warn("session id: "+sessionID);
+			logger.warn("session id: "+sessionID);
-			defaultLogger.warn("TEST_USER: "+user);
+			logger.warn("TEST_USER: "+user);
-			defaultLogger.warn("TEST_SCOPE: "+TEST_SCOPE);
+			logger.warn("TEST_SCOPE: "+TEST_SCOPE);
-			defaultLogger.warn("USERNAME_ATTRIBUTE: "+USERNAME_ATTRIBUTE);
+			logger.warn("USERNAME_ATTRIBUTE: "+USERNAME_ATTRIBUTE);
 			session = SessionManager.getInstance().getASLSession(sessionID, user);
 			session.setScope(TEST_SCOPE);
 			
@@ -128,8 +124,6 @@ public class WsUtil {
 		logger.trace("Scope provider instancied");
 		
 		Workspace workspace = HomeLibrary.getUserWorkspace(session.getUsername());
-		
-		final GCUBELog logger = getLogger(workspace);
 
 		if (session.getAttribute(METADATACONVERTER_ATTRIBUTE) == null){
 
@@ -178,21 +172,8 @@ public class WsUtil {
 
 	}
 
-	public static GCUBELog getLogger(Workspace workspace)
-	{
-		/* TODO if (workspace instanceof PersistentFSWorkspace){
-			PersistentFSWorkspace persistentFSWorkspace = (PersistentFSWorkspace) workspace;
-			try {
-				return persistentFSWorkspace.getWorkspacePortletLogger();
-			} catch (InternalErrorException e) {
-				e.printStackTrace();
-			}
-		}*/
 
-		return defaultLogger;
+	public static MetadataConverter getMetadataConverter(Logger logger, HttpSession httpSession)
-	}
-
-	public static MetadataConverter getMetadataConverter(GCUBELog logger, HttpSession httpSession)
 	{
 		MetadataConverter mc = (MetadataConverter) httpSession.getAttribute(METADATACONVERTER_ATTRIBUTE);
 
@@ -228,7 +209,7 @@ public class WsUtil {
 		NotificationsManager notifMng = (NotificationsManager) session.getAttribute(NOTIFICATION_MANAGER);
 		
 		if (notifMng == null) {
-			defaultLogger.trace("Create new NotificationsManager for user: "+session.getUsername());
+			logger.trace("Create new NotificationsManager for user: "+session.getUsername());
 			notifMng = new ApplicationNotificationsManager(session, NOTIFICATION_PORTLET_CLASS_ID);
 			session.setAttribute(NOTIFICATION_MANAGER, notifMng);
 		}
@@ -242,7 +223,7 @@ public class WsUtil {
 		NotificationsProducer notifProducer = (NotificationsProducer) session.getAttribute(NOTIFICATION_PRODUCER);
 		
 		if (notifProducer == null) {
-			defaultLogger.trace("Create new Notification Producer for user: "+session.getUsername());
+			logger.trace("Create new Notification Producer for user: "+session.getUsername());
 			notifProducer = new NotificationsProducer(session);
 			session.setAttribute(NOTIFICATION_PRODUCER, notifProducer);
 		}
@@ -264,11 +245,11 @@ public class WsUtil {
 		int slashCount = StringUtils.countMatches(currentScope, "/");
 		
 		if(slashCount < 3){
-			defaultLogger.trace("currentScope is not VRE");
+			logger.trace("currentScope is not VRE");
 			return false;
 		}
 		
-		defaultLogger.trace("currentScope is VRE");
+		logger.trace("currentScope is VRE");
 		return true;
 		
 	}
@@ -285,7 +266,7 @@ public class WsUtil {
 				
 			}
 		}catch (Exception e) {
-			defaultLogger.error("an error occurred in getscope filter "+e);
+			logger.error("an error occurred in getscope filter "+e);
 		}
 		
 		return scopeUtil;
@@ -309,7 +290,7 @@ public class WsUtil {
 			}
 			
 		}catch (Exception e) {
-			defaultLogger.error("an error occurred in instancing url shortener ",e);
+			logger.error("an error occurred in instancing url shortener ",e);
 		}
 
 		return shortener;
@@ -334,7 +315,7 @@ public class WsUtil {
 			}
 			
 		}catch (Exception e) {
-			defaultLogger.error("an error occurred in instancing uri resolver ",e);
+			logger.error("an error occurred in instancing uri resolver ",e);
 		}
 
 		return uriResolver;

src/main/java/org/gcube/portlets/user/workspace/server/util/scope/ScopeUtilFilter.java

@@ -6,14 +6,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.gcube.common.core.utils.logging.GCUBEClientLog;
+import org.apache.log4j.Logger;
 
 
 public class ScopeUtilFilter {
 	
 	private static final String SCOPE_SEPARATOR = "/";
 	private String scopeRoot = null;
-	public static GCUBEClientLog logger = new GCUBEClientLog(ScopeUtilFilter.class);
+	public static Logger logger = Logger.getLogger(ScopeUtilFilter.class);
 	public Map<String, String> hashScopesFiltered = new HashMap<String, String>();
 	
 	public static final String ALLSCOPE = "All spaces";

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

@@ -6,7 +6,6 @@ package org.gcube.portlets.user.workspace;
 import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.gcube.common.core.scope.GCUBEScope;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.Workspace;
@@ -19,6 +18,7 @@ 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.scope.api.ScopeProvider;
+import org.gcube.common.scope.impl.ScopeBean;
 
 /**
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
@@ -34,7 +34,7 @@ public class PublicLinkTest {
 
 		try {
 
-			GCUBEScope scope = GCUBEScope.getScope("/gcube/devsec");
+			ScopeBean scope = new ScopeBean("/gcube/devsec");
 			ScopeProvider.instance.set(scope.toString());
 			
 			Workspace ws = HomeLibrary

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

@@ -11,7 +11,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.gcube.common.core.scope.GCUBEScope.MalformedScopeExpressionException;
 import org.gcube.common.homelibrary.home.HomeLibrary;
 import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException;
 import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
@@ -25,72 +24,78 @@ import org.gcube.common.homelibrary.home.workspace.exceptions.WrongDestinationEx
 import org.gcube.common.homelibrary.home.workspace.folder.items.ExternalFile;
 import org.gcube.common.homelibrary.util.MimeTypeUtil;
 import org.gcube.common.homelibrary.util.WorkspaceUtil;
+import org.gcube.common.scope.api.ScopeProvider;
+import org.gcube.common.scope.impl.ScopeBean;
 
 /**
  * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
  * @Jun 20, 2013
- *
+ * 
  */
 public class UploadServletTest {
-	
+
-public static void main(String[] args) throws InternalErrorException, MalformedScopeExpressionException, WorkspaceFolderNotFoundException, HomeNotFoundException, UserNotFoundException, InsufficientPrivilegesException, ItemAlreadyExistException, WrongDestinationException, IOException {
+	public static void main(String[] args) throws InternalErrorException,
-		
+			WorkspaceFolderNotFoundException, HomeNotFoundException,
-//		HomeManagerFactory factory = HomeLibrary.getHomeManagerFactory();
+			UserNotFoundException, InsufficientPrivilegesException,
-//		Workspace workspace = factory.getHomeManager().getHome("francesco.mangiacrapa",GCUBEScope.getScope("/gcube/devsec")).getWorkspace();
+			ItemAlreadyExistException, WrongDestinationException, IOException {
-		
+
-		Workspace workspace = HomeLibrary
+		ScopeBean scope = new ScopeBean("/gcube/devsec");
-				.getHomeManagerFactory()
+		ScopeProvider.instance.set(scope.toString());
-				.getHomeManager()
+
-				.getHome("francesco.mangiacrapa")
+		Workspace workspace = HomeLibrary.getHomeManagerFactory()
+				.getHomeManager().getHome("francesco.mangiacrapa")
 				.getWorkspace();
-		
+
 		String filePath = "/home/francesco-mangiacrapa/Desktop/icongeoexplorer";
-		
+
 		String fileName = "testupload.txt";
-		
+
-		String fullPath = filePath+"/"+fileName;
+		String fullPath = filePath + "/" + fileName;
-		
+
-//		String newFilePath = "/home/francesco-mangiacrapa/Desktop/icongeoexplorer/testupload.txt";
+		// String newFilePath =
-		
+		// "/home/francesco-mangiacrapa/Desktop/icongeoexplorer/testupload.txt";
-//		String name = "TestReplaceContentImage";
+
-		
+		// String name = "TestReplaceContentImage";
-//		ExternalPDFFile file = workspace.createExternalPDFFile(name, "", null, new FileInputStream(new File(filePath)),
+
-//				workspace.getRoot().getId());
+		// ExternalPDFFile file = workspace.createExternalPDFFile(name, "",
+		// null, new FileInputStream(new File(filePath)),
+		// workspace.getRoot().getId());
 
 		WorkspaceFolder root = workspace.getRoot();
-//		ExternalImage file = (ExternalImage) root.find(name);
+		// ExternalImage file = (ExternalImage) root.find(name);
-		
+
+		// UPLOAD FILE
+		String contentType = MimeTypeUtil.getMimeType(new BufferedInputStream(
+				new FileInputStream(new File(fullPath))));
 
-		//UPLOAD FILE 
-		String contentType = MimeTypeUtil.getMimeType(new BufferedInputStream(new FileInputStream(new File(fullPath))));
-		
 		String itemName = WorkspaceUtil.getUniqueName(fileName, root);
 		System.out.println("Storing data....");
-		System.out.println("content type "+contentType);
+		System.out.println("content type " + contentType);
-		System.out.println("itemName "+itemName);
+		System.out.println("itemName " + itemName);
-		
-		ExternalFile file = (ExternalFile) WorkspaceUtil.createExternalFile(root, itemName, "", contentType, new FileInputStream(new File(fullPath)));
-		
-		System.out.println("Storing data - OK" + "File [id: "+file.getId() + ", name: "+file.getName()+"]");
-//		
-//		System.out.println("File mimeType" + file.getMimeType());
-//		System.out.println("File size" + file.getLength());
-//		
 
-//		
+		ExternalFile file = (ExternalFile) WorkspaceUtil.createExternalFile(
-//		file.setData(new FileInputStream(new File(newFilePath)));
+				root, itemName, "", contentType, new FileInputStream(new File(
-//		System.out.println("New File mimeType" + file.getMimeType());
+						fullPath)));
-//		System.out.println("New File size" + file.getLength());
+
+		System.out.println("Storing data - OK" + "File [id: " + file.getId()
+				+ ", name: " + file.getName() + "]");
+		//
+		// System.out.println("File mimeType" + file.getMimeType());
+		// System.out.println("File size" + file.getLength());
+		//
+
+		//
+		// file.setData(new FileInputStream(new File(newFilePath)));
+		// System.out.println("New File mimeType" + file.getMimeType());
+		// System.out.println("New File size" + file.getLength());
+
+		//
 
-//		
-		
-		
-		
-		
 		System.out.println("Recovering data");
 		InputStream inputStream = file.getData();
 		// write the inputStream to a FileOutputStream
-		OutputStream out = new FileOutputStream(new File("/home/francesco-mangiacrapa/Desktop/result"));
+		OutputStream out = new FileOutputStream(new File(
+				"/home/francesco-mangiacrapa/Desktop/result"));
 
 		int read = 0;
 		byte[] bytes = new byte[1024];
@@ -102,11 +107,11 @@ public static void main(String[] args) throws InternalErrorException, MalformedS
 		inputStream.close();
 		out.flush();
 		out.close();
-		
+
 		System.out.println("Recovering data - OK");
-		
+
-//		File file = new File("/home/gioia/Desktop/test");
+		// File file = new File("/home/gioia/Desktop/test");
-//		InputStream is = new FileInputStream(file);
+		// InputStream is = new FileInputStream(file);
 
 	}