diff --git a/.classpath b/.classpath index 914dc7f..c73cdaa 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -34,5 +34,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 550dc8a..b851537 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,10 +1,18 @@ + + Updated to new WorkspaceExplorer widget that support + StorageHUB[ticket #11721] + Integrated DataMiner CL for simplify integration with new - StorageHub[ticket #11720] - Added refresh button in operators panel[ticket #11741] - Added hyperlink for log that contains http reference[ticket #11529] + StorageHub[ticket #11720] + + Added refresh button in operators panel[ticket #11741] + + Added hyperlink for log that contains http reference[ticket + #11529] diff --git a/pom.xml b/pom.xml index 8ee9a8b..fd50f0d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.gcube.portlets.user data-miner-manager - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT war data-miner-manager @@ -260,7 +260,7 @@ org.gcube.portlets.widgets workspace-explorer - [1.6.0-SNAPSHOT,2.0.0-SNAPSHOT) + [2.0.0-SNAPSHOT,3.0.0-SNAPSHOT) diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java index dd7114a..93e5630 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/FileFld.java @@ -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 selectableTypes = new ArrayList(); + /*List selectableTypes = new ArrayList(); selectableTypes.add(ItemType.EXTERNAL_FILE); List showableTypes = new ArrayList(); showableTypes.addAll(Arrays.asList(ItemType.values())); - + */ wselectDialog = new WorkspaceExplorerSelectDialog("Select File", false); // filterCriteria, selectableTypes); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java index 3303472..2ee7ff9 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabItem.java @@ -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 selectableTypes = new ArrayList(); + /*List selectableTypes = new ArrayList(); selectableTypes.add(ItemType.EXTERNAL_FILE); List showableTypes = new ArrayList(); - 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() { + DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(itemDescriptionSelected, new AsyncCallback() { @Override public void onFailure(Throwable caught) { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java index 9b79362..2e071f1 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/parametersfield/TabularFld.java @@ -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 selectableTypes = new ArrayList(); + /*List selectableTypes = new ArrayList(); selectableTypes.add(ItemType.EXTERNAL_FILE); List showableTypes = new ArrayList(); - 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() { + DataMinerPortletServiceAsync.INSTANCE.retrieveTableInformation(itemDescriptionSelected, new AsyncCallback() { @Override public void onFailure(Throwable caught) { diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java index 999017e..b4602ef 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletService.java @@ -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; diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java index 362fce8..87520b8 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/client/rpc/DataMinerPortletServiceAsync.java @@ -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 callback); - void retrieveTableInformation(Item item, AsyncCallback callback); + void retrieveTableInformation(ItemDescription item, AsyncCallback callback); void getDataMinerWorkArea(AsyncCallback asyncCallback); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java index 580b22d..81d0a1c 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/DataMinerManagerServiceImpl.java @@ -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); diff --git a/src/main/java/org/gcube/portlets/user/dataminermanager/server/util/TableReader.java b/src/main/java/org/gcube/portlets/user/dataminermanager/server/util/TableReader.java index 8c71cb1..0153683 100644 --- a/src/main/java/org/gcube/portlets/user/dataminermanager/server/util/TableReader.java +++ b/src/main/java/org/gcube/portlets/user/dataminermanager/server/util/TableReader.java @@ -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 columnItemList=new ArrayList(); for(int i=0; i