From 597d5d06f1acfd2235f013eceeb907b38527b33d Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Thu, 24 Nov 2016 16:08:36 +0000
Subject: [PATCH] updated version (minor) and adapted to the Workspace Uploader
 with no ASL Session

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@134695 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                                | 6 +++---
 .settings/org.eclipse.wst.common.component                | 8 +++++++-
 pom.xml                                                   | 8 +++++++-
 .../client/view/panels/GxtBorderLayoutPanel.java          | 3 ++-
 .../portlets/user/workspace/WorkspacePortlet.gwt.xml      | 4 ++--
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.classpath b/.classpath
index 1e8c2b6..4275751 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/workspace-6.14.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/workspace-6.15.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/workspace-6.14.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/workspace-6.15.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -34,5 +34,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="output" path="target/workspace-6.14.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/workspace-6.15.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 96bccb2..f647ce1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -5,7 +5,13 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="ckan-metadata-publisher-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-metadata-publisher-widget/ckan-metadata-publisher-widget">
+        <dependent-module archiveName="client-context-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/client-context-library/client-context-library">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="workspace-tree-widget-6.14.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="workspace-uploader-1.6.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-uploader/workspace-uploader">
             <dependency-type>uses</dependency-type>
         </dependent-module>
 
diff --git a/pom.xml b/pom.xml
index d2b1e75..26a922c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>workspace</artifactId>
 	<packaging>war</packaging>
-	<version>6.14.0-SNAPSHOT</version>
+	<version>6.15.0-SNAPSHOT</version>
 	<name>gCube Workspace Portlet</name>
 	<description>
 		gCube Workspace Portlet is a web-gui to manage the gCube workspace a collaborative area where users can exchange and organize information objects (workspace items) according to their specific needs. 
@@ -73,6 +73,12 @@
 			<groupId>org.gcube.common</groupId>
 			<artifactId>common-authorization</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.gcube.portal</groupId>
+			<artifactId>client-context-library</artifactId>
+			<version>[1.0.0-SNAPSHOT,)</version>
+			<scope>compile</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.gcube.common.portal</groupId>
 			<artifactId>portal-manager</artifactId>
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java
index 822bf81..1b2b819 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/panels/GxtBorderLayoutPanel.java
@@ -1,5 +1,6 @@
 package org.gcube.portlets.user.workspace.client.view.panels;
 
+import org.gcube.portal.clientcontext.client.GCubeClientContext;
 import org.gcube.portlets.user.workspace.client.ConstantsPortlet;
 import org.gcube.portlets.user.workspace.client.view.ExplorerPanel;
 import org.gcube.portlets.user.workspace.client.view.toolbars.GxtBottomToolBarItem;
@@ -212,6 +213,6 @@ public class GxtBorderLayoutPanel extends ContentPanel {
 	 * @param parentId the parent id
 	 */
 	public void updateDnDParentId(String parentId){
-		dnd.setParameters(parentId, UPLOAD_TYPE.File);
+		dnd.setParameters(parentId, UPLOAD_TYPE.File, GCubeClientContext.getCurrentContextId());
 	}
 }
\ No newline at end of file
diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
index 0fa4581..c514d52 100644
--- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
@@ -5,7 +5,7 @@
 
 
 	<!-- To Comment out -->
-<!-- 	<set-property name="user.agent" value="safari" /> -->
+	<set-property name="user.agent" value="safari" />
 
 	<!-- <inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' /> -->
 
@@ -13,7 +13,7 @@
 	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
 	<!-- Moduel GXT -->
 	<inherits name='com.extjs.gxt.ui.GXT' />
-
+	<inherits name='org.gcube.portal.clientcontext.GCubeClientContext' />
 	<!-- Other module inherits -->
 	<inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />
 	<inherits name='org.gcube.portlets.user.gcubewidgets.WidgetFactory' />