From 0c9b10a1c21f81c80fd0845e0ecd5f6159e63bd4 Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 16 May 2018 10:46:32 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/workspace-task-executor-library@167510
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .classpath                                     |  4 ++--
 .settings/org.eclipse.jdt.core.prefs           |  2 +-
 .../WorkspaceDataMinerTaskExecutor.java        |  5 +++--
 .../shared/dataminer/TaskConfiguration.java    |  2 ++
 .../TestDataMinerTaskExecutor.java             | 18 ++++++++++--------
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/.classpath b/.classpath
index 10ccb85..379bc98 100644
--- a/.classpath
+++ b/.classpath
@@ -28,9 +28,9 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 443e085..b257af7 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,6 +1,6 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java
index 79c9c45..b13c1d7 100644
--- a/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java
+++ b/src/main/java/org/gcube/common/workspacetaskexecutor/dataminer/WorkspaceDataMinerTaskExecutor.java
@@ -228,7 +228,8 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask<TaskConfig
 	 */
 	@Override
 	public Boolean removeTaskConfiguration(TaskConfiguration taskConfiguration) throws ItemNotExecutableException, Exception {
-		logger.debug("Remove task configuration "+taskConfiguration+ "starts...");
+
+		logger.info("Removing task configuration with key: "+taskConfiguration.getConfigurationKey() + " starts...");
 
 		ValidateTaskConfiguration(taskConfiguration);
 		checkOwner();
@@ -255,7 +256,7 @@ public class WorkspaceDataMinerTaskExecutor implements ExecutableTask<TaskConfig
 		if(found){
 			JSONArray newConfgs = jsonUtil.toJSONArray(newConfigurations);
 			WsUtil.setPropertyValue(item, WS_DM_TASK_TASK_CONF, newConfgs.toString());
-			logger.info("Removed task configuration "+taskConfiguration+ " from saved configurations");
+			logger.info("Removed correclty the task configuration "+taskConfiguration+ " from saved configurations");
 			return true;
 		}
 
diff --git a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java
index cab6385..3b59a50 100644
--- a/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java
+++ b/src/main/java/org/gcube/common/workspacetaskexecutor/shared/dataminer/TaskConfiguration.java
@@ -286,6 +286,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
 		builder.append(listParameters);
 		builder.append(", configurationKey=");
 		builder.append(configurationKey);
+		builder.append(", owner=");
+		builder.append(owner);
 		builder.append("]");
 		return builder.toString();
 	}
diff --git a/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java b/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java
index 0bda14a..8c0cfdc 100644
--- a/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java
+++ b/src/test/java/org/gcube/common/workspacetaskexecutor/TestDataMinerTaskExecutor.java
@@ -14,7 +14,6 @@ import org.gcube.common.homelibrary.home.exceptions.InternalErrorException;
 import org.gcube.common.homelibrary.home.workspace.WorkspaceItem;
 import org.gcube.common.homelibrary.home.workspace.exceptions.ItemNotFoundException;
 import org.gcube.common.homelibrary.home.workspace.exceptions.WorkspaceFolderNotFoundException;
-import org.gcube.common.scope.api.ScopeProvider;
 import org.gcube.common.workspacetaskexecutor.dataminer.WorkspaceDataMinerTaskExecutor;
 import org.gcube.common.workspacetaskexecutor.shared.TaskParameter;
 import org.gcube.common.workspacetaskexecutor.shared.TaskParameterType;
@@ -46,7 +45,8 @@ public class TestDataMinerTaskExecutor {
 	private static JsonUtil jUtil = new JsonUtil();
 
 	//CREATE DUMMY CONFIGURATIONS
-	private static List<TaskConfiguration> listDummyConf = gelDummyListOfConfigurations(3);
+	private static List<TaskConfiguration> listDummyConf;
+
 
 	/**
 	 *
@@ -93,13 +93,15 @@ public class TestDataMinerTaskExecutor {
 
 	public static void main(String[] args) {
 
-		ScopeProvider.instance.set(SCOPE);
-		WorkspaceDataMinerTaskExecutor exec =  WorkspaceDataMinerTaskExecutor.getInstance();
-		exec.withOwner(USERNAME);
-		//jsonCheck();
+//		ScopeProvider.instance.set(SCOPE);
+//		listDummyConf = gelDummyListOfConfigurations(3);
+//		WorkspaceDataMinerTaskExecutor exec =  WorkspaceDataMinerTaskExecutor.getInstance();
+//		exec.withOwner(USERNAME);
+//		//jsonCheck();
+//
+//		//ERASE ALL CONFIGURATIONS
+//		eraseAllTaskConfigurations(exec);
 
-		//ERASE ALL CONFIGURATIONS
-		eraseAllTaskConfigurations(exec);
 
 		//GET LIST CONFIGURATIONS
 		//getConfigurations(exec);