From 47ce169021d6f0a7ad84775aa945bdc6fbb018fc Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 23 Mar 2017 14:29:45 +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-gwt-service@146297 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../portlets/user/td/gwtservice/server/SDMXClient.java | 1 + .../server/opexecution/OpExecution4DataMinerOperation.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java index 7a31e2b..715de54 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/SDMXClient.java @@ -55,6 +55,7 @@ public class SDMXClient { SDMXRegistryDescriptorImpl descriptor = new SDMXRegistryDescriptorImpl(); descriptor.setUrl(SDMXRegistryInterfaceType.RESTV2_1, url); client = new FusionRegistryClient(descriptor); + } diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DataMinerOperation.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DataMinerOperation.java index 4325226..d2e82cb 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DataMinerOperation.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4DataMinerOperation.java @@ -27,7 +27,7 @@ public class OpExecution4DataMinerOperation extends OpExecutionBuilder { .getLogger(OpExecution4DataMinerOperation.class); private TabularDataService service; - private ServiceCredentials serviceCredentials; + //private ServiceCredentials serviceCredentials; private DataMinerOperationSession dataMinerOperationSession; @@ -35,7 +35,7 @@ public class OpExecution4DataMinerOperation extends OpExecutionBuilder { TabularDataService service,ServiceCredentials serviceCredentials, DataMinerOperationSession dataMinerOperationSession) { this.service = service; - this.serviceCredentials = serviceCredentials; + //this.serviceCredentials = serviceCredentials; this.dataMinerOperationSession = dataMinerOperationSession; } @@ -50,7 +50,7 @@ public class OpExecution4DataMinerOperation extends OpExecutionBuilder { operationDefinition = OperationDefinitionMap.map( OperationsId.StatisticalOperation.toString(), service); - map.put(Constants.PARAMETER_DATAMINER_GCUBETOKEN, serviceCredentials.getToken()); + //map.put(Constants.PARAMETER_DATAMINER_GCUBETOKEN, serviceCredentials.getToken()); map.put(Constants.PARAMETER_DATAMINER_OPERATOR, dataMinerOperationSession.getOperator()); invocation = new OperationExecution(