diff --git a/.classpath b/.classpath
index 9b372a2..bd3fe88 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -45,5 +45,5 @@
-
+
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 @@
+
+ Updated to DataMiner [ticket #6078]
+
Updated to PortalContext [ticket #6548]
diff --git a/pom.xml b/pom.xml
index 052e31f..5e98df3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-manager
- 2.14.0-SNAPSHOT
+ 2.15.0-SNAPSHOT
war
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 @@
workspaceExplorer
org.gcube.portlets.widgets.wsexplorer.server.WorkspaceExplorerServiceImpl
-
-
+
+ workspaceUploaderService
+ org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploaderServiceImpl
+
+
+ workspaceUploadServletStream
+ org.gcube.portlets.widgets.workspaceuploader.server.WorkspaceUploadServletStream
+
+
- StatisticalManagerAlgorithmsWidgetServlet
- org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.StatisticalManagerWidgetServiceImpl
+ DataMinerManagerServlet
+ org.gcube.portlets.widgets.dataminermanagerwidget.server.DataMinerManagerServiceImpl
- DownloadService
- org.gcube.portlets.widgets.StatisticalManagerAlgorithmsWidget.server.DownloadServlet
+ DownloadFolderServlet
+ org.gcube.portlets.widgets.dataminermanagerwidget.server.DownloadFolderServlet
+
tdwService
org.gcube.portlets.user.tdw.server.TabularDataServiceImpl
-
tdwServlet
org.gcube.portlets.user.tdw.server.TabularDataServlet
@@ -303,6 +309,16 @@
/tabulardataportlet/WorkspaceExplorerService
+
+ workspaceUploaderService
+ /tabulardataportlet/workspaceUploaderService
+
+
+ workspaceUploadServletStream
+ /tabulardataportlet/workspaceUploadServletStream
+
+
+
+
- StatisticalManagerAlgorithmsWidgetServlet
- /tabulardataportlet/statman
+ DataMinerManagerServlet
+ /tabulardataportlet/dataminermanagerwidget
-
+
- DownloadService
- /tabulardataportlet/DownloadService
+ DownloadFolderServlet
+ /tabulardataportlet/DownloadFolderServlet
-
+
+
tdwService
/tabulardataportlet/tdw