gCubeSystem
/
data-miner-manager
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 11721: DataMiner - Update to StorageHub 

https://support.d4science.org/issues/11721

Updated to new WorkspaceExplorer widget that support StorageHub

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/data-miner-manager@167890 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2018-06-06 12:29:54 +00:00
parent 318389a033
commit 40b10c8360
10 changed files with 46 additions and 51 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/data-miner-manager-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/data-miner-manager-1.8.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/data-miner-manager-1.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/data-miner-manager-1.8.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -34,5 +34,5 @@
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/data-miner-manager-1.7.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/data-miner-manager-1.8.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

14
distro/changelog.xml
View File

@ -1,10 +1,18 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-8-0"
date="2018-07-01">
<Change>Updated to new WorkspaceExplorer widget that support
StorageHUB[ticket #11721]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-7-0"
date="2018-06-01">
<Change>Integrated DataMiner CL for simplify integration with new
StorageHub[ticket #11720]</Change>
<Change>Added refresh button in operators panel[ticket #11741]</Change>
<Change>Added hyperlink for log that contains http reference[ticket #11529]</Change>
StorageHub[ticket #11720]
</Change>
<Change>Added refresh button in operators panel[ticket #11741]
</Change>
<Change>Added hyperlink for log that contains http reference[ticket
#11529]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.data-miner-manager.1-6-0"
date="2016-11-09">

4
pom.xml
View File

@ -12,7 +12,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>data-miner-manager</artifactId>
<version>1.7.0-SNAPSHOT</version>
<version>1.8.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>data-miner-manager</name>
@ -260,7 +260,7 @@
<dependency>
<groupId>org.gcube.portlets.widgets</groupId>
<artifactId>workspace-explorer</artifactId>
<version>[1.6.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
<version>[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)</version>
</dependency>
<!-- Workspace Uploader -->

16
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java
View File

@ -3,26 +3,22 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.FileParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEvent;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.FileParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.SelectVariableEvent;
import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.SelectVariableEvent.SelectVariableEventHandler;
import org.gcube.portlets.widgets.netcdfbasicwidgets.client.widgets.NetCDFPreviewDialog;
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.gcube.portlets.widgets.wsexplorer.shared.ItemType;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.shared.GWT;
@ -112,11 +108,11 @@ public class FileFld extends AbstractFld {
private void init() {
List<ItemType> selectableTypes = new ArrayList<ItemType>();
/*List<ItemType> selectableTypes = new ArrayList<ItemType>();
selectableTypes.add(ItemType.EXTERNAL_FILE);
List<ItemType> showableTypes = new ArrayList<ItemType>();
showableTypes.addAll(Arrays.asList(ItemType.values()));
*/
wselectDialog = new WorkspaceExplorerSelectDialog("Select File", false);
// filterCriteria, selectableTypes);

17
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java
View File

@ -1,22 +1,17 @@
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEvent;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.gcube.portlets.widgets.wsexplorer.shared.ItemType;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.user.client.Window;
@ -144,10 +139,10 @@ public class TabItem extends HBoxLayoutContainer {
private void initDialog() {
List<ItemType> selectableTypes = new ArrayList<ItemType>();
/*List<ItemType> selectableTypes = new ArrayList<ItemType>();
selectableTypes.add(ItemType.EXTERNAL_FILE);
List<ItemType> showableTypes = new ArrayList<ItemType>();
showableTypes.addAll(Arrays.asList(ItemType.values()));
showableTypes.addAll(Arrays.asList(ItemType.values()));*/
/*
* "application/zip", "application/x-zip",
@ -215,7 +210,7 @@ public class TabItem extends HBoxLayoutContainer {
itemDescriptionSelected = new ItemDescription(item.getId(), item.getName(), item.getOwner(), item.getPath(),
item.getType().name());
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, new AsyncCallback<TableItemSimple>() {
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(itemDescriptionSelected, new AsyncCallback<TableItemSimple>() {
@Override
public void onFailure(Throwable caught) {

17
src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java
View File

@ -3,10 +3,12 @@
*/
package org.gcube.portlets.user.dataminermanager.client.parametersfield;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminermanager.client.DataMinerManager;
import org.gcube.portlets.user.dataminermanager.client.common.EventBusProvider;
import org.gcube.portlets.user.dataminermanager.client.events.SessionExpiredEvent;
@ -15,15 +17,10 @@ import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEv
import org.gcube.portlets.user.dataminermanager.client.events.TabularFldChangeEvent.TabularFldChangeEventHandler;
import org.gcube.portlets.user.dataminermanager.client.rpc.DataMinerPortletServiceAsync;
import org.gcube.portlets.user.dataminermanager.client.util.UtilsGXT3;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.portlets.user.dataminermanager.shared.exception.SessionExpiredServiceException;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.TabularParameter;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.widgets.wsexplorer.client.notification.WorkspaceExplorerSelectNotification.WorskpaceExplorerSelectNotificationListener;
import org.gcube.portlets.widgets.wsexplorer.client.select.WorkspaceExplorerSelectDialog;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.gcube.portlets.widgets.wsexplorer.shared.ItemType;
import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.event.shared.GwtEvent;
@ -132,10 +129,10 @@ public class TabularFld extends AbstractFld implements HasTabularFldChangeEventH
private void init() throws Exception {
try {
List<ItemType> selectableTypes = new ArrayList<ItemType>();
/*List<ItemType> selectableTypes = new ArrayList<ItemType>();
selectableTypes.add(ItemType.EXTERNAL_FILE);
List<ItemType> showableTypes = new ArrayList<ItemType>();
showableTypes.addAll(Arrays.asList(ItemType.values()));
showableTypes.addAll(Arrays.asList(ItemType.values()));*/
try {
/*
@ -262,7 +259,7 @@ public class TabularFld extends AbstractFld implements HasTabularFldChangeEventH
itemDescriptionSelected = new ItemDescription(item.getId(), item.getName(), item.getOwner(), item.getPath(),
item.getType().name());
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(item, new AsyncCallback<TableItemSimple>() {
DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(itemDescriptionSelected, new AsyncCallback<TableItemSimple>() {
@Override
public void onFailure(Throwable caught) {

7
src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java
View File

@ -6,15 +6,14 @@ import org.gcube.data.analysis.dataminermanagercl.shared.data.OutputData;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationData;
import org.gcube.data.analysis.dataminermanagercl.shared.data.computations.ComputationId;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import com.google.gwt.user.client.rpc.RemoteService;
import com.google.gwt.user.client.rpc.RemoteServiceRelativePath;
@ -40,7 +39,7 @@ public interface DataMinerPortletService extends RemoteService {
public ComputationId resubmit(ItemDescription itemDescription) throws ServiceException;
public TableItemSimple retrieveTableInformation(Item item)
public TableItemSimple retrieveTableInformation(ItemDescription item)
throws ServiceException;
public DataMinerWorkArea getDataMinerWorkArea() throws ServiceException;

5
src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java
View File

@ -10,10 +10,9 @@ import org.gcube.data.analysis.dataminermanagercl.shared.parameters.Parameter;
import org.gcube.data.analysis.dataminermanagercl.shared.process.ComputationStatus;
import org.gcube.data.analysis.dataminermanagercl.shared.process.Operator;
import org.gcube.data.analysis.dataminermanagercl.shared.process.OperatorsClassification;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWorkArea;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.gcube.portlets.user.dataminermanager.shared.session.UserInfo;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.rpc.AsyncCallback;
@ -41,7 +40,7 @@ public interface DataMinerPortletServiceAsync {
void resubmit(ItemDescription itemDescription, AsyncCallback<ComputationId> callback);
void retrieveTableInformation(Item item, AsyncCallback<TableItemSimple> callback);
void retrieveTableInformation(ItemDescription item, AsyncCallback<TableItemSimple> callback);
void getDataMinerWorkArea(AsyncCallback<DataMinerWorkArea> asyncCallback);

4
src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java
View File

@ -26,7 +26,7 @@ import org.gcube.data.analysis.dataminermanagercl.shared.workspace.DataMinerWork
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
//import org.gcube.portlets.user.tdw.server.datasource.DataSourceFactoryRegistry;
//import org.gcube.portlets.widgets.file_dw_import_wizard.server.file.TargetRegistry;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
//import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -195,7 +195,7 @@ public class DataMinerManagerServiceImpl extends RemoteServiceServlet implements
}
@Override
public TableItemSimple retrieveTableInformation(Item item) throws ServiceException {
public TableItemSimple retrieveTableInformation(ItemDescription item) throws ServiceException {
try {
HttpServletRequest httpRequest = this.getThreadLocalRequest();
ServiceCredentials serviceCredentials = SessionUtil.getServiceCredentials(httpRequest);

7
src/main/java/org/gcube/portlets/user/dataminermanager/server/util/TableReader.java
View File

@ -13,6 +13,7 @@ import org.gcube.data.analysis.dataminermanagercl.server.util.ServiceCredentials
import org.gcube.portlets.user.dataminermanager.server.storage.StorageUtil;
import org.gcube.data.analysis.dataminermanagercl.shared.data.ColumnItem;
import org.gcube.data.analysis.dataminermanagercl.shared.data.TableItemSimple;
import org.gcube.data.analysis.dataminermanagercl.shared.workspace.ItemDescription;
import org.gcube.portlets.user.dataminermanager.shared.exception.ServiceException;
import org.gcube.portlets.widgets.wsexplorer.shared.Item;
import org.slf4j.Logger;
@ -28,9 +29,9 @@ public class TableReader {
private static Logger logger = LoggerFactory.getLogger(TableReader.class);
private ServiceCredentials serviceCredentials;
private Item item;
private ItemDescription item;
public TableReader(ServiceCredentials serviceCredentials, Item item) {
public TableReader(ServiceCredentials serviceCredentials, ItemDescription item) {
this.serviceCredentials = serviceCredentials;
this.item= item;
}
@ -46,7 +47,7 @@ public class TableReader {
String publicLink=StorageUtil.getPublicLink(serviceCredentials.getUserName(), item.getId());
TableItemSimple tableItemSimple=new TableItemSimple(publicLink,item.getName(), item.getType().name());
TableItemSimple tableItemSimple=new TableItemSimple(publicLink,item.getName(), item.getType());
ArrayList<ColumnItem> columnItemList=new ArrayList<ColumnItem>();
for(int i=0; i<columns.size(); i++){
ColumnItem columnItem=new ColumnItem(String.valueOf(i), columns.get(i));