From e9dbe100fc6a15b5b558ae632a4b197a4f1aad05 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Thu, 27 Nov 2014 17:29:15 +0000
Subject: [PATCH] Updated to GWT 2.6.1

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@101743 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 pom.xml                                       | 21 ++++++++++++-------
 .../td/gwtservice/server/SessionUtil.java     |  7 ++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index decc5d5..c0149e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,12 @@
 		<configDirectory>config</configDirectory>
 
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.5.1</gwtVersion>
+		<!-- <gwtVersion>2.5.1</gwtVersion> <gwtLogVersion>3.2.1</gwtLogVersion> -->
+		
+		<!-- Next -->
+		<gwtVersion>2.6.1</gwtVersion>
+		<gwtLogVersion>3.3.2</gwtLogVersion>
+
 
 		<KEYS>${env.KEYS}</KEYS>
 
@@ -79,10 +84,12 @@
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-servlet</artifactId>
+			<version>${gwtVersion}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.gwt</groupId>
 			<artifactId>gwt-user</artifactId>
+			<version>${gwtVersion}</version>
 		</dependency>
 
 
@@ -159,7 +166,7 @@
 			<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		<!-- Tabular Data Commons -->
 		<dependency>
 			<groupId>org.gcube.data.analysis.tabulardata</groupId>
@@ -176,14 +183,14 @@
 			<groupId>org.gcube.contentmanagement</groupId>
 			<artifactId>storage-manager-wrapper</artifactId>
 		</dependency>
-		
+
 		<!-- Uri Resolver Manager -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>uri-resolver-manager</artifactId>
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 		</dependency>
-		
+
 
 		<!-- tabular-data-widget-common-event -->
 		<dependency>
@@ -192,14 +199,14 @@
 			<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
 		</dependency>
-		
-		
+
+
 
 		<!-- LOGGING -->
 		<dependency>
 			<groupId>com.allen-sauer.gwt.log</groupId>
 			<artifactId>gwt-log</artifactId>
-			<version>3.2.1</version>
+			<version>${gwtLogVersion}</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
index d41090d..5003842 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SessionUtil.java
@@ -17,6 +17,7 @@ import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper;
 import org.gcube.portlets.user.td.gwtservice.server.file.CSVFileUploadSession;
 import org.gcube.portlets.user.td.gwtservice.server.file.CodelistMappingFileUploadSession;
 import org.gcube.portlets.user.td.gwtservice.server.trservice.TRTasksManager;
+import org.gcube.portlets.user.td.gwtservice.shared.Constants;
 import org.gcube.portlets.user.td.gwtservice.shared.chart.ChartTopRatingSession;
 import org.gcube.portlets.user.td.gwtservice.shared.codelisthelper.CodelistMappingSession;
 import org.gcube.portlets.user.td.gwtservice.shared.csv.CSVExportSession;
@@ -83,10 +84,10 @@ public class SessionUtil {
 		ASLSession session;
 		if (username == null) {
 			logger.warn("no user found in session, using test one");
-			throw new TDGWTSessionExpiredException("Session Expired!");
+			/*throw new TDGWTSessionExpiredException("Session Expired!");*/
 
 			// Remove comment for Test
-			/*
+			
 			username = Constants.DEFAULT_USER;
 			String scope = Constants.DEFAULT_SCOPE;
 
@@ -94,7 +95,7 @@ public class SessionUtil {
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);
 			session.setScope(scope);
-			*/
+		
 		} else {
 			session = SessionManager.getInstance().getASLSession(
 					httpSession.getId(), username);