From 8df81bf0116afd6422ea0f5af0c99749a88d36b0 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 1 Oct 2013 17:02:16 +0000
Subject: [PATCH] Update to GWT 2.5.1

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@82258 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component          |  3 +++
 pom.xml                                             | 13 +++++--------
 .../user/td/client/TabularDataController.java       |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index c84c06a..353a9b1 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -22,6 +22,9 @@
         <dependent-module archiveName="TDOpen-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-open/tabular-data-open">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-gxtservice-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gxtservice/tabular-data-gxtservice">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
     <property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
         <property name="context-root" value="tabular-data-portlet"/>
   </wb-module>
diff --git a/pom.xml b/pom.xml
index d4ceb4f..325d62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
 		<webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
 		<!-- Convenience property to set the GWT version -->
-		<gwtVersion>2.4.0</gwtVersion>
+		<gwtVersion>2.5.1</gwtVersion>
 		<!-- To make this work on gwt-run you need to set up global env vars. on 
 			MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore" 
 			on Linux? -->
@@ -94,15 +94,12 @@
 		<dependency>
 			<groupId>org.gcube.applicationsupportlayer</groupId>
 			<artifactId>aslcore</artifactId>
-			<version>[3.2.1-SNAPSHOT,4.0.0-SNAPSHOT)</version>
 			<scope>provided</scope>
-
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-light-tree</artifactId>
-			<version>2.10.0-SNAPSHOT</version>
 		</dependency>
 		<!-- WORKSPACE -->
 		<dependency>
@@ -182,10 +179,10 @@
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
-		<!-- TABULAR DATA INFORMATION -->
+		<!-- TD GXTService -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
-			<artifactId>tabular-data-information</artifactId>
+			<artifactId>tabular-data-gxtservice</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 
@@ -208,7 +205,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>gwt-maven-plugin</artifactId>
-				<version>2.4.0</version>
+				<version>${gwtVersion}</version>
 				<executions>
 					<execution>
 						<goals>
@@ -239,7 +236,7 @@
 			<dependency>
 				<groupId>org.gcube.distribution</groupId>
 				<artifactId>maven-portal-bom</artifactId>
-				<version>1.2.0-SNAPSHOT</version>
+				<version>LATEST</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 7832324..5cd4b3e 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -17,9 +17,9 @@ import org.gcube.portlets.user.td.client.event.OpenFunctionalityEvent;
 import org.gcube.portlets.user.td.client.event.OpenFunctionalityType;
 import org.gcube.portlets.user.td.client.event.OpenTabularResourceEvent;
 import org.gcube.portlets.user.td.client.event.OpenTabularResourceType;
+import org.gcube.portlets.user.td.gxtservice.shared.TRId;
 import org.gcube.portlets.user.td.importer.client.TabularDataImporterListener;
 import org.gcube.portlets.user.td.information.client.TabularResourceProperties;
-import org.gcube.portlets.user.td.information.shared.TRId;
 import org.gcube.portlets.user.td.open.client.TDOpen;
 import org.gcube.portlets.user.tdw.client.TabularData;
 import org.gcube.portlets.user.tdw.shared.model.TableId;
@@ -27,7 +27,6 @@ import org.gcube.portlets.user.tdw.shared.model.TableId;
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.RunAsyncCallback;
-import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Widget;
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.SimpleEventBus;