Integrated Tabular Data Widget

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@74922 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.component

@@ -5,6 +5,9 @@
     <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="/src/main/resources"/>
+        <dependent-module archiveName="tabular-data-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget/tabular-data-widget">
+            <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>

pom.xml

@@ -77,6 +77,13 @@
 			<version>2.2.5</version>
 		</dependency>
 
+		<!-- TABULAR DATA WIDGET -->
+		<dependency>
+			<groupId>org.gcube.portlets.user</groupId>
+			<artifactId>tabular-data-widget</artifactId>
+			<version>[1.1.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java

@@ -3,6 +3,10 @@ package org.gcube.portlets.user.td.client;
 import org.gcube.portlets.user.td.client.rpc.GreetingService;
 import org.gcube.portlets.user.td.client.rpc.GreetingServiceAsync;
 import org.gcube.portlets.user.td.client.toolbar.TabularDataTooBar;
+import org.gcube.portlets.user.tdw.client.TabularData;
+import org.gcube.portlets.user.tdw.client.TabularDataGridPanel;
+import org.gcube.portlets.user.tdw.client.event.FailureEvent;
+import org.gcube.portlets.user.tdw.client.event.FailureEventHandler;
 
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.EntryPoint;
@@ -110,9 +114,17 @@ public class TabularDataPortlet implements EntryPoint {
 	    
 	    mainPanelLayout.setWestWidget(workspaceTreePanel, workspaceTreeData);
 	    
+		final TabularData tabularData = new TabularData("SimpleJDBCDataSourceFactory");
+		tabularData.addFailureHandler(new FailureEventHandler() {
 
-	    ContentPanel grid = new ContentPanel();
+			@Override
-	    grid.setHeadingText("Grid panel");
+			public void onFailure(FailureEvent event) {
+				Info.display("Error: "+event.getMessage(), event.getCaught().getMessage());
+
+			}
+		});
+	    
+		final TabularDataGridPanel grid = tabularData.getGridPanel();	
 	    
 	    MarginData gridData = new MarginData();
 	    mainPanelLayout.setCenterWidget(grid, gridData);

src/main/resources/org/gcube/portlets/user/td/TabularDataPortlet.gwt.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module rename-to='tabulardataportlet'>
 
-  <inherits name='com.google.gwt.user.User' />
+	<inherits name='com.google.gwt.user.User' />
 
-  <!-- Other module inherits                                      -->
+	<!-- Other module inherits -->
-  <inherits name='com.sencha.gxt.ui.GXT' />
+	<inherits name='com.sencha.gxt.ui.GXT' />
-  <inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
+	<inherits name="com.allen_sauer.gwt.log.gwt-log-TRACE" />
- <!-- <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' /> -->
+	<!-- <inherits name='org.gcube.portlets.user.workspace.WorkspaceTree' /> -->
+	<inherits name="org.gcube.portlets.user.tdw.TabularDataWidget" />
 
-  <!-- Specify the app entry point class.                         -->
+	<!-- Specify the app entry point class. -->
-  <entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
+	<entry-point class='org.gcube.portlets.user.td.client.TabularDataPortlet' />
 
-  <set-property name="log_DivLogger" value="DISABLED" />
+	<set-property name="log_DivLogger" value="DISABLED" />
-  <set-property name="log_ConsoleLogger" value="ENABLED" />
+	<set-property name="log_ConsoleLogger" value="ENABLED" />
-  <set-property name="log_FirebugLogger" value="ENABLED" />
+	<set-property name="log_FirebugLogger" value="ENABLED" />
-  <set-property name="log_GWTLogger" value="ENABLED" />
+	<set-property name="log_GWTLogger" value="ENABLED" />
-  <set-property name="log_SystemLogger" value="ENABLED" />
+	<set-property name="log_SystemLogger" value="ENABLED" />
 
 
 
-  <!-- Specify the paths for translatable code                    -->
+	<!-- Specify the paths for translatable code -->
-  <source path='client' />
+	<source path='client' />
-  <source path='shared' />
+	<source path='shared' />
 
 </module>

src/main/webapp/WEB-INF/web.xml

@@ -27,6 +27,28 @@
 		<url-pattern>/tabulardataportlet/WorkspaceService</url-pattern>
 	</servlet-mapping>-->
 	
+		<!-- TDWidget -->
+
+	<servlet>
+		<servlet-name>tdwService</servlet-name>
+		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>tdwService</servlet-name>
+		<url-pattern>/tabulardataportlet/tdw</url-pattern>
+	</servlet-mapping>
+
+	<servlet>
+		<servlet-name>tdwServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>tdwServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/tdwdata</url-pattern>
+	</servlet-mapping>
+
 	<!-- Default page to serve -->
 	<welcome-file-list>
 		<welcome-file>TabularDataPortlet.html</welcome-file>