From 7905e395ccd75cc222118044d6bafbbd597cc185 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 2 Oct 2013 17:36:45 +0000
Subject: [PATCH] Fix pom

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@82323 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                           |  2 +-
 .settings/org.eclipse.wst.common.component           |  3 +++
 pom.xml                                              | 12 ++++++++++--
 .../portlets/user/td/TabularDataPortlet.gwt.xml      |  7 +++++--
 src/main/webapp/WEB-INF/web.xml                      | 12 ++++++------
 5 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/.classpath b/.classpath
index 1f734fb..57086f8 100644
--- a/.classpath
+++ b/.classpath
@@ -14,12 +14,12 @@
 		</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"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 353a9b1..8ca157a 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -10,6 +10,9 @@
         <dependent-module archiveName="tabular-data-widget-td-source-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-td-source/tabular-data-widget-td-source">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-widget-2.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget/tabular-data-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="csv-import-wizard-gxt3-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/csv-import-wizard-gxt3/csv-import-wizard-gxt3">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/pom.xml b/pom.xml
index 325d62a..bf22d09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,12 +96,19 @@
 			<artifactId>aslcore</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>gcube-widgets</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
+		<!-- WORKSPACE -->
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-light-tree</artifactId>
 		</dependency>
-		<!-- WORKSPACE -->
+		
 		<dependency>
 			<groupId>org.gcube.portlets.user</groupId>
 			<artifactId>workspace-tree-widget</artifactId>
@@ -185,7 +192,8 @@
 			<artifactId>tabular-data-gxtservice</artifactId>
 			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
-
+		
+		<!--  TD Service Mock -->
 		<dependency>
 			<groupId>org.gcube.data.analysis.tabulardata</groupId>
 			<artifactId>service-client-mock</artifactId>
diff --git a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
index cde12d0..26a5e98 100644
--- a/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml
@@ -6,11 +6,14 @@
 	<!-- Other module inherits -->
 	<inherits name='com.sencha.gxt.ui.GXT' />
 	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
-<!--     <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' />  -->
+
 	<inherits name="org.gcube.portlets.user.tdw.TabularDataWidget" />
+	
+	<inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' />
+	
+	 <inherits name='org.gcube.portlets.user.td.gxtservice.GXTService' />	
     <inherits name='org.gcube.portlets.user.td.information.Information' />
 	<inherits name='org.gcube.portlets.user.td.open.TDOpen' />
-	<inherits name='org.gcube.portlets.user.td.ciw.csvimporterwidget' />
 	<inherits name='org.gcube.portlets.user.sdmximportwizardtd.SDMXImportWizardTD' />
 	<inherits name='org.gcube.portlets.user.sdmxexportwizardtd.SDMXExportWizardTD' />
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index b58aa30..1a8abbf 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -23,10 +23,10 @@
 		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
 	</servlet>
 
-	<!-- TD Information -->
+	<!-- TD GXTService -->
 	<servlet>
-		<servlet-name>TDInformationService</servlet-name>
-		<servlet-class>org.gcube.portlets.user.td.information.server.TDInformationServiceImpl</servlet-class>
+		<servlet-name>TDGXTService</servlet-name>
+		<servlet-class>org.gcube.portlets.user.td.gxtservice.server.TDGXTServiceImpl</servlet-class>
 	</servlet>
 	
 	<!-- TDOpen  -->
@@ -120,10 +120,10 @@
 		<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
 	</servlet-mapping>
 
-	<!-- TD Information -->	
+	<!-- TD GXTService -->	
 	<servlet-mapping>
-		<servlet-name>TDInformationService</servlet-name>
-		<url-pattern>/tabulardataportlet/TDInformationService</url-pattern>
+		<servlet-name>TDGXTService</servlet-name>
+		<url-pattern>/tabulardataportlet/TDGXTService</url-pattern>
 	</servlet-mapping>