gCubeSystem
/
tabular-data-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Giancarlo Panichi 2017-03-15 16:16:25 +00:00
parent 2136c495a3
commit ffff4654a1
5 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -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>

4
distro/changelog.xml
View File

@ -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>

2
pom.xml
View File

@ -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>

4
src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
View File

@ -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);
}

47
src/main/webapp/WEB-INF/web.xml
View File

@ -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>