From d0f98f57604878f3e41983851392fd61e2156708 Mon Sep 17 00:00:00 2001
From: Costantino Perciante <costantino.perciante@isti.cnr.it>
Date: Tue, 21 Jun 2016 15:25:54 +0000
Subject: [PATCH] embedded new image-preview widget, added servlet reference

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/news-feed@129221 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component       | 12 ------------
 .../user/newsfeed/server/NewsServiceImpl.java    |  8 ++++----
 src/main/webapp/WEB-INF/web.xml                  | 16 +++++++++++++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 073c9e0..7d33a49 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,18 +4,6 @@
     <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="social-util-library-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/social-util-library/social-util-library">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
-        <dependent-module archiveName="session-checker-1.0.1-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="gcube-widgets-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/gcube-widgets/gcube-widgets">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="news-feed"/>
   </wb-module>
diff --git a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
index a86d57f..1585a1d 100644
--- a/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/newsfeed/server/NewsServiceImpl.java
@@ -88,7 +88,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	private static final String SESSION_ADMIN_ATTR = "SESSION_ADMIN_ATTR";
 	private static final String USER_SETTINGS_ATTR = "USER_SETTINGS_ATTR";
 
-	public static final String TEST_SCOPE = "/gcube/devsec/OpenAireDevVRE";
+	public static final String TEST_SCOPE = "/gcube/devsec/devVRE";
 
 	private String APP_ID;
 
@@ -143,7 +143,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	 */
 	public String getDevelopmentUser() {
 		String user = NewsConstants.TEST_USER;
-//		user = "costantino.perciante";
+		//		user = "costantino.perciante";
 		return user;
 	}
 	/**
@@ -759,7 +759,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 			//send the notification to the mentioned users, if any
 			if (mentionedUsers != null && mentionedUsers.size() > 0) {
 				ArrayList<GenericItemBean> toPass = new ArrayList<GenericItemBean>();
-				
+
 
 				// among the mentionedUsers there could be groups of people
 				Map<String, ItemBean> uniqueUsersToNotify = new HashMap<>();
@@ -1009,7 +1009,7 @@ public class NewsServiceImpl extends RemoteServiceServlet implements NewsService
 	private boolean isUsers(Feed tocheck, String username) {
 		return (tocheck.getEntityId().equals(username));
 	}
-	
+
 	/**
 	 * 
 	 * @return true if the user is a portal administrator or not
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 4f93f03..07e84d6 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -14,7 +14,7 @@
 		<servlet-name>newsServlet</servlet-name>
 		<url-pattern>/newsfeed/newsServlet</url-pattern>
 	</servlet-mapping>
-	
+
 	<servlet>
 		<servlet-name>scopeService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.gcubewidgets.server.ScopeServiceImpl</servlet-class>
@@ -24,17 +24,27 @@
 		<servlet-name>scopeService</servlet-name>
 		<url-pattern>/newsfeed/scopeService</url-pattern>
 	</servlet-mapping>
-	
+
 	<servlet>
 		<servlet-name>checkServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.sessionchecker.server.SessionCheckerServiceImpl</servlet-class>
 	</servlet>
- 
+
 	<servlet-mapping>
 		<servlet-name>checkServlet</servlet-name>
 		<url-pattern>/newsfeed/checksession</url-pattern>
 	</servlet-mapping>
 
+	<servlet>
+		<servlet-name>imageservices</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.imagepreviewerwidget.server.ImageOrientationServicesImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>imageservices</servlet-name>
+		<url-pattern>/newsfeed/imageservices</url-pattern>
+	</servlet-mapping>
+
 	<!-- Default page to serve -->
 	<welcome-file-list>
 		<welcome-file>NewsFeed.html</welcome-file>