From ffff4654a14370dafad53d6906bec3ce2dbed23e Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Wed, 15 Mar 2017 16:16:25 +0000
Subject: [PATCH] ref 6078:TDM - Create a new widget to support operations's
 invocation on DataMiner https://support.d4science.org/issues/6078

Updated to support DataMiner

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@144970 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .classpath                                    |  6 +--
 distro/changelog.xml                          |  4 ++
 pom.xml                                       |  2 +-
 .../user/td/client/TabularDataController.java |  4 +-
 src/main/webapp/WEB-INF/web.xml               | 47 +++++++++++++------
 5 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/.classpath b/.classpath
index 9b372a2..bd3fe88 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/tabular-data-manager-2.14.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/tabular-data-manager-2.15.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.14.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
+	<classpathentry excluding="**" kind="src" output="target/tabular-data-manager-2.15.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -45,5 +45,5 @@
 	</classpathentry>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA.jar" sourcepath="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
 	<classpathentry kind="lib" path="/home/giancarlo/gwt/gwt-2.6.1/validation-api-1.0.0.GA-sources.jar"/>
-	<classpathentry kind="output" path="target/tabular-data-manager-2.14.0-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/tabular-data-manager-2.15.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 9c1addd..8cdf6fd 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>
+	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-15-0"
+		date="2017-04-01">
+		<Change>Updated to DataMiner [ticket #6078]</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portlets-user.tabular-data-portlet.2-14-0"
 		date="2017-02-15">
 		<Change>Updated to PortalContext [ticket #6548]</Change>
diff --git a/pom.xml b/pom.xml
index 052e31f..5e98df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>tabular-data-manager</artifactId>
-	<version>2.14.0-SNAPSHOT</version>
+	<version>2.15.0-SNAPSHOT</version>
 	<packaging>war</packaging>
 
 
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 a39842c..c83cf3c 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
@@ -43,7 +43,7 @@ import org.gcube.portlets.user.td.rulewidget.client.multicolumn.RuleOnTableNewWi
 import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
 import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD;
 import org.gcube.portlets.user.td.sharewidget.client.TRShare;
-import org.gcube.portlets.user.td.statisticalwidget.client.StatisticalWidget;
+import org.gcube.portlets.user.td.statisticalwidget.client.DataMinerWidget;
 import org.gcube.portlets.user.td.tablewidget.client.CloneTabularResource;
 import org.gcube.portlets.user.td.tablewidget.client.history.HistoryDiscard;
 import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows;
@@ -2128,7 +2128,7 @@ public class TabularDataController {
 		GWT.runAsync(new RunAsyncCallback() {
 			public void onSuccess() {
 				@SuppressWarnings("unused")
-				StatisticalWidget statisticalWidget = new StatisticalWidget(
+				DataMinerWidget statisticalWidget = new DataMinerWidget(
 						trId, eventBus);
 			}
 
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ec6ef89..f58ebeb 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -131,8 +131,14 @@
 		<servlet-name>workspaceExplorer</servlet-name>
 		<servlet-class>org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl</servlet-class>
 	</servlet>
-
-
+	<servlet>
+		<servlet-name>workspaceUploaderService</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderServiceImpl</servlet-class>
+	</servlet>
+	<servlet>
+		<servlet-name>workspaceUploadServletStream</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploadServletStream</servlet-class>
+	</servlet>
 
 	<!-- CSV Import Wizard Workspace -->
 	<!-- <servlet> <servlet-name>CSVImportServiceWorkspace</servlet-name> <servlet-class>org.gcube.portlets.user.csvimportwizardgxt3.ws.server.ImportWizardWSServiceImpl</servlet-class> 
@@ -152,23 +158,23 @@
 	</servlet>
 
 
-	<!-- STATISTICAL -->
+	<!-- DataMiner -->
 	<servlet>
-		<servlet-name>StatisticalManagerAlgorithmsWidgetServlet</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.StatisticalManagerWidgetServiceImpl</servlet-class>
+		<servlet-name>DataMinerManagerServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.dataminermanagerwidget.server.DataMinerManagerServiceImpl</servlet-class>
 	</servlet>
 
 	<servlet>
-		<servlet-name>DownloadService</servlet-name>
-		<servlet-class>org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.DownloadServlet</servlet-class>
+		<servlet-name>DownloadFolderServlet</servlet-name>
+		<servlet-class>org.gcube.portlets.widgets.dataminermanagerwidget.server.DownloadFolderServlet</servlet-class>
 	</servlet>
 
+	<!-- TabularData Widget -->
 	<servlet>
 		<servlet-name>tdwService</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServiceImpl</servlet-class>
 	</servlet>
 
-
 	<servlet>
 		<servlet-name>tdwServlet</servlet-name>
 		<servlet-class>org.gcube.portlets.user.tdw.server.TabularDataServlet</servlet-class>
@@ -303,6 +309,16 @@
 		<url-pattern>/tabulardataportlet/WorkspaceExplorerService</url-pattern>
 	</servlet-mapping>
 
+	<servlet-mapping>
+		<servlet-name>workspaceUploaderService</servlet-name>
+		<url-pattern>/tabulardataportlet/workspaceUploaderService</url-pattern>
+	</servlet-mapping>
+	<servlet-mapping>
+		<servlet-name>workspaceUploadServletStream</servlet-name>
+		<url-pattern>/tabulardataportlet/workspaceUploadServletStream</url-pattern>
+	</servlet-mapping>
+
+
 	<!-- CSV Import Wizard Workspace -->
 	<!-- <servlet-mapping> <servlet-name>CSVImportServiceWorkspace</servlet-name> 
 		<url-pattern>/tabulardataportlet/CSVImportServiceWorkspace</url-pattern> 
@@ -320,17 +336,18 @@
 		<url-pattern>/tabulardataportlet/checksession</url-pattern>
 	</servlet-mapping>
 
-	<!-- STATISTICAL -->
+	<!-- DataMiner -->
 	<servlet-mapping>
-		<servlet-name>StatisticalManagerAlgorithmsWidgetServlet</servlet-name>
-		<url-pattern>/tabulardataportlet/statman</url-pattern>
+		<servlet-name>DataMinerManagerServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/dataminermanagerwidget</url-pattern>
 	</servlet-mapping>
-
+	
 	<servlet-mapping>
-		<servlet-name>DownloadService</servlet-name>
-		<url-pattern>/tabulardataportlet/DownloadService</url-pattern>
+		<servlet-name>DownloadFolderServlet</servlet-name>
+		<url-pattern>/tabulardataportlet/DownloadFolderServlet</url-pattern>
 	</servlet-mapping>
-
+	
+	<!-- TabularData Widget -->
 	<servlet-mapping>
 		<servlet-name>tdwService</servlet-name>
 		<url-pattern>/tabulardataportlet/tdw</url-pattern>