Enhancement on Task #10070

Added owner


git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/Common/workspace-task-executor-library@167377 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2018-05-09 10:22:57 +00:00
parent 3d34c1931e
commit 9c0a40bdf1
7 changed files with 41 additions and 17 deletions

View File

@ -28,9 +28,9 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/> <attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="owner.project.facets" value="java"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="output" path="target/classes"/> <classpathentry kind="output" path="target/classes"/>

View File

@ -16,12 +16,12 @@
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>

View File

@ -1,8 +1,8 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8 org.eclipse.jdt.core.compiler.source=1.7

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<installed facet="java" version="1.8"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>
<installed facet="java" version="1.7"/>
</faceted-project> </faceted-project>

View File

@ -0,0 +1,2 @@
disabled=06target
eclipse.preferences.version=1

View File

@ -55,11 +55,11 @@ public interface BaseTaskConfiguration {
/** /**
* Sets the access key to save this configuration in the workspace gcube properties. * Gets the owner.
* *
* @param accessKey the access key * @return the owner
*/ */
void setConfigurationKey(String accessKey); String getOwner();
} }

View File

@ -42,6 +42,7 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
@JsonIgnoreProperties @JsonIgnoreProperties
private List<TaskParameter> listParameters; // optional private List<TaskParameter> listParameters; // optional
private String configurationKey; private String configurationKey;
private String owner;
/** /**
* Instantiates a new task configuration. * Instantiates a new task configuration.
@ -56,19 +57,21 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
* @param configurationKey the configuration key * @param configurationKey the configuration key
* @param taskId the task id * @param taskId the task id
* @param taskDescription the task description * @param taskDescription the task description
* @param owner the owner
* @param scope the scope * @param scope the scope
* @param maskedToken the token * @param maskedToken the token
* @param workspaceItemId the workspace item id * @param workspaceItemId the workspace item id
* @param listParameters the map parameters * @param listParameters the map parameters
*/ */
public TaskConfiguration( public TaskConfiguration(
String configurationKey, String taskId, String taskDescription, String scope, String configurationKey, String taskId, String taskDescription, String owner, String scope,
String maskedToken, String workspaceItemId, String maskedToken, String workspaceItemId,
List<TaskParameter> listParameters) { List<TaskParameter> listParameters) {
setConfigurationKey(configurationKey); setConfigurationKey(configurationKey);
this.taskId = taskId; this.taskId = taskId;
this.taskDescription = taskDescription; this.taskDescription = taskDescription;
this.owner = owner;
this.scope = scope; this.scope = scope;
this.maskedToken = maskedToken; this.maskedToken = maskedToken;
this.workspaceItemId = workspaceItemId; this.workspaceItemId = workspaceItemId;
@ -77,6 +80,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
/** /**
* Gets the scope.
*
* @return the scope * @return the scope
*/ */
public String getScope() { public String getScope() {
@ -86,6 +91,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
/** /**
* Sets the scope.
*
* @param scope the scope to set * @param scope the scope to set
*/ */
public void setScope(String scope) { public void setScope(String scope) {
@ -106,17 +113,24 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
return configurationKey; return configurationKey;
} }
/* /**
* (non-Javadoc) * Sets the configuration key.
* @see org.gcube.common.workspacetaskexecutor.shared.BaseTaskConfiguration# *
* setAccessKey(java.lang.String) * @param configurationKey the new configuration key
*/ */
@Override
public void setConfigurationKey(String configurationKey) { public void setConfigurationKey(String configurationKey) {
this.configurationKey = configurationKey; this.configurationKey = configurationKey;
} }
/* (non-Javadoc)
* @see org.gcube.common.workspacetaskexecutor.shared.BaseTaskConfiguration#getOwner()
*/
@Override
public String getOwner() {
return owner;
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* @see org.gcube.common.workspacetaskexecutor.TaskConfiguration#getTaskId() * @see org.gcube.common.workspacetaskexecutor.TaskConfiguration#getTaskId()
@ -149,6 +163,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
/** /**
* Gets the list parameters.
*
* @return the listParameters * @return the listParameters
*/ */
public List<TaskParameter> getListParameters() { public List<TaskParameter> getListParameters() {
@ -158,6 +174,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
/** /**
* Sets the list parameters.
*
* @param listParameters the listParameters to set * @param listParameters the listParameters to set
*/ */
public void setListParameters(List<TaskParameter> listParameters) { public void setListParameters(List<TaskParameter> listParameters) {
@ -218,6 +236,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
/** /**
* Gets the masked token.
*
* @return the maskedToken * @return the maskedToken
*/ */
public String getMaskedToken() { public String getMaskedToken() {
@ -227,6 +247,8 @@ public class TaskConfiguration implements BaseTaskConfiguration, Serializable {
/** /**
* Sets the masked token.
*
* @param maskedToken the maskedToken to set * @param maskedToken the maskedToken to set
*/ */
public void setMaskedToken(String maskedToken) { public void setMaskedToken(String maskedToken) {