From ad705663104c848c91a7192517f6a0281bba4171 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 7 Oct 2015 14:03:52 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@119482
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .classpath                                      |  4 ++--
 .settings/org.eclipse.wst.common.component      |  7 ++-----
 pom.xml                                         | 17 +++++++++++------
 .../portlets/user/newsfeed/NewsFeed.gwt.xml     |  5 ++---
 src/main/webapp/WEB-INF/web.xml                 | 12 +++++++-----
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/.classpath b/.classpath
index 87cdb86..85c1330 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/news-feed-1.10.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/news-feed-1.11.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -31,5 +31,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/news-feed-1.10.1-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/news-feed-1.11.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 630d3a4..8ae7790 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,16 +4,13 @@
     <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
     <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
-        <dependent-module archiveName="session-checker-0.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/session-checker/session-checker">
+        <dependent-module archiveName="session-checker-0.4.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/session-checker/session-checker">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="pickitem-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/pickitem-widget/pickitem-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="notifications-common-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/notifications-common-library/notifications-common-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="workspace-light-tree-2.14.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree/workspace-light-tree">
+        <dependent-module archiveName="wsmail-widget-1.9.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wsmail-widget/wsmail-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="gcube-widgets-1.9.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
diff --git a/pom.xml b/pom.xml
index ae68b2a..d8dbc8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>news-feed</artifactId>
 	<packaging>war</packaging>
-	<version>1.10.1-SNAPSHOT</version>
+	<version>1.11.0-SNAPSHOT</version>
 
 	<name>gCube News Feed Portlet</name>
 	<description>
@@ -93,6 +93,16 @@
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-networking-library</artifactId>
 			<scope>provided</scope>
+		</dependency>
+			<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>home-library</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.gcube.common</groupId>
+			<artifactId>home-library-jcr</artifactId>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
@@ -105,11 +115,6 @@
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>compile</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.portlets.widgets</groupId>
-			<artifactId>workspace-light-tree</artifactId>
-			<version>[2.14.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>wsmail-widget</artifactId>
diff --git a/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml b/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml
index 589f789..14296cb 100644
--- a/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/newsfeed/NewsFeed.gwt.xml
@@ -4,7 +4,7 @@
 	<inherits name='com.google.gwt.user.User' />
 
 	<!-- To Comment out -->
-<!-- 	<set-property name="user.agent" value="safari,gecko1_8" /> -->
+	<set-property name="user.agent" value="safari,gecko1_8" />
 
 	<!-- Other module inherits -->
 	<inherits name="net.eliasbalasis.tibcopagebus4gwt.tibcopagebus4gwt" />
@@ -18,8 +18,7 @@
 	<inherits name='org.gcube.portlets.widgets.userselection.UserSelection' />
 	<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />
 	<inherits name='org.gcube.portlets.widgets.pickitem.PickItem' />
-	<inherits
-		name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
+	<inherits name='org.gcube.portlets.widgets.wsexplorer.WorkspaceExplorer' />
 	<inherits name='org.gcube.portal.databook.GCubeSocialNetworking' />
 
 	<!-- Specify the app entry point class. -->
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 83f64e4..d01e911 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -36,13 +36,15 @@
 	</servlet-mapping>
 
 	<servlet>
-		<servlet-name>workspaceServiceImpl</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.lighttree.server.WorkspaceServiceImpl</servlet-class>
+		<servlet-name>workspaceExplorer</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
 	</servlet>
+
 	<servlet-mapping>
-		<servlet-name>workspaceServiceImpl</servlet-name>
-		<url-pattern>/newsfeed/WorkspaceLightService</url-pattern>
-	</servlet-mapping>	
+		<servlet-name>workspaceExplorer</servlet-name>
+		<url-pattern>/newsfeed/WorkspaceExplorerService</url-pattern>
+	</servlet-mapping>
+	
 	
 	<servlet>
 		<servlet-name>checkServlet</servlet-name>