From 7cedfb2df269ddfa997458ed4806ff84b90daf74 Mon Sep 17 00:00:00 2001
From: "massimiliano.assante" <massimiliano.assante@isti.cnr.it>
Date: Fri, 27 Sep 2013 12:52:15 +0000
Subject: [PATCH] removed gcore dep

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@82086 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  5 ++-
 .settings/com.google.gdt.eclipse.core.prefs   |  2 +-
 pom.xml                                       | 32 +++++++++----------
 .../server/NotificationsServiceImpl.java      | 10 +++---
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/.classpath b/.classpath
index b107a68..491b63f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/notifications-0.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/notifications-0.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -14,7 +14,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -31,5 +30,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/notifications-0.5.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/notifications-0.6.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 1762b1f..4169d85 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-0.5.0-SNAPSHOT
+lastWarOutDir=/Users/massi/Documents/workspace/notifications/target/notifications-0.6.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/pom.xml b/pom.xml
index 2aa5029..6d37331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,12 +13,12 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>notifications</artifactId>
 	<packaging>war</packaging>
-	<version>0.5.0-SNAPSHOT</version>
+	<version>0.6.0-SNAPSHOT</version>
 	<name>gCube Notifications Portlet</name>
 
 	<properties>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.4.0</gwtVersion>
+		<gwtVersion>2.5.1</gwtVersion>
 		<distroDirectory>distro</distroDirectory>
 		<!-- GWT needs at least java 1.6 -->
 		<maven.compiler.source>1.6</maven.compiler.source>
@@ -28,7 +28,17 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
-
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.gcube.distribution</groupId>
+				<artifactId>maven-portal-bom</artifactId>
+				<version>LATEST</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 	<dependencies>
 		<!-- This dependency is needed and is need on TOP to use GWT UI BInder 
 			without old Xerces version of gCore complaining -->
@@ -41,13 +51,11 @@
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
-			<version>${gwtVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
-			<version>${gwtVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -56,28 +64,19 @@
 			<version>1.3.3</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.gcube.core</groupId>
-			<artifactId>gcf</artifactId>
-			<version>[1.4.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>gcube-widgets</artifactId>
-			<version>[1.4.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>custom-portal-handler</artifactId>
-			<version>[1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
-			<version>[3.2.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -89,13 +88,12 @@
 		<dependency>
 			<groupId>javax.portlet</groupId>
 			<artifactId>portlet-api</artifactId>
-			<version>2.0</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.gcube.portal</groupId>
 			<artifactId>social-networking-library</artifactId>
-			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
+			<version>[1.3.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -129,7 +127,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>gwt-maven-plugin</artifactId>
-				<version>2.4.0</version>
+				<version>${gwtVersion}</version>
 				<executions>
 					<execution>
 						<goals>
diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
index 882f347..e4ab0a2 100644
--- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
+++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java
@@ -5,7 +5,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -17,7 +16,6 @@ import javax.servlet.ServletContext;
 
 import org.gcube.application.framework.core.session.ASLSession;
 import org.gcube.application.framework.core.session.SessionManager;
-import org.gcube.common.core.utils.logging.GCUBEClientLog;
 import org.gcube.portal.custom.communitymanager.OrganizationsUtil;
 import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portal.databook.server.DBCassandraAstyanaxImpl;
@@ -28,6 +26,8 @@ import org.gcube.portal.databook.shared.NotificationType;
 import org.gcube.portal.databook.shared.UserInfo;
 import org.gcube.portlets.user.notifications.client.NotificationsService;
 import org.gcube.portlets.user.notifications.shared.NotificationPreference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 import com.liferay.portal.kernel.util.WebKeys;
@@ -42,10 +42,8 @@ import edu.emory.mathcs.backport.java.util.Collections;
  */
 @SuppressWarnings("serial")
 public class NotificationsServiceImpl extends RemoteServiceServlet implements NotificationsService {
-	/**
-	 * 
-	 */
-	private static GCUBEClientLog _log = new GCUBEClientLog(NotificationsServiceImpl.class);
+
+	private static final Logger _log = LoggerFactory.getLogger(NotificationsServiceImpl.class);
 	private final static String TYPE_CATEGORIES_FILENAME = "categorybytype.properties"; 
 	private final static String TYPE_LABELS_FILENAME = "labelbytype.properties"; 
 	private final static String TYPE_DESCRIPTIONS_FILENAME = "descbytype.properties";