You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/03/27 18:40:57 UTC
[airavata] branch develop updated: Updating the Helix module to use
Slf4j logging
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 865d7a4 Updating the Helix module to use Slf4j logging
865d7a4 is described below
commit 865d7a444bd3d5abe3c6e8e46dda7fb62b44c944
Author: dimuthu <di...@gmail.com>
AuthorDate: Tue Mar 27 14:40:50 2018 -0400
Updating the Helix module to use Slf4j logging
---
.../helix/agent/local/LocalAgentAdaptor.java | 2 -
.../agent/storage/StorageResourceAdaptorImpl.java | 6 +--
.../helix/impl/controller/HelixController.java | 6 +--
.../helix/impl/participant/GlobalParticipant.java | 6 +--
.../airavata/helix/impl/task/AiravataTask.java | 10 ++--
.../airavata/helix/impl/task/TaskContext.java | 5 +-
.../impl/task/cancel/CancelCompletingTask.java | 7 ++-
.../task/cancel/RemoteJobCancellationTask.java | 6 +--
.../impl/task/cancel/WorkflowCancellationTask.java | 6 +--
.../helix/impl/task/completing/CompletingTask.java | 6 +--
.../airavata/helix/impl/task/env/EnvSetupTask.java | 6 +--
.../helix/impl/task/staging/ArchiveTask.java | 6 +--
.../helix/impl/task/staging/DataStagingTask.java | 7 ++-
.../impl/task/staging/InputDataStagingTask.java | 6 +--
.../impl/task/staging/OutputDataStagingTask.java | 6 +--
.../task/submission/DefaultJobSubmissionTask.java | 6 +--
.../task/submission/ForkJobSubmissionTask.java | 6 +--
.../impl/task/submission/JobSubmissionTask.java | 6 +--
.../task/submission/LocalJobSubmissionTask.java | 6 +--
.../task/submission/config/GroovyMapBuilder.java | 6 +--
.../impl/task/submission/config/GroovyMapData.java | 7 ++-
.../helix/impl/task/submission/config/Script.java | 62 ----------------------
.../task/submission/config/SubmissionUtil.java | 29 ----------
.../helix/impl/workflow/PostWorkflowManager.java | 6 +--
.../helix/impl/workflow/PreWorkflowManager.java | 7 ++-
.../apache/airavata/helix/core/AbstractTask.java | 7 ++-
.../helix/core/participant/HelixParticipant.java | 8 ++-
.../airavata/helix/workflow/WorkflowManager.java | 6 +--
28 files changed, 75 insertions(+), 178 deletions(-)
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/local/LocalAgentAdaptor.java b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/local/LocalAgentAdaptor.java
index 99b467d..7a2e905 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/local/LocalAgentAdaptor.java
+++ b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/local/LocalAgentAdaptor.java
@@ -27,8 +27,6 @@ import java.util.List;
public class LocalAgentAdaptor implements AgentAdaptor {
-
-
public void init(Object agentPams) throws AgentException {
throw new AgentException("Operation not implemented");
}
diff --git a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/storage/StorageResourceAdaptorImpl.java b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/storage/StorageResourceAdaptorImpl.java
index c0f7ac0..4dc0cee 100644
--- a/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/storage/StorageResourceAdaptorImpl.java
+++ b/modules/airavata-helix/agent-impl/ssh-agent/src/main/java/org/apache/airavata/helix/agent/storage/StorageResourceAdaptorImpl.java
@@ -36,12 +36,12 @@ import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescr
import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory;
import org.apache.airavata.registry.cpi.AppCatalog;
import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class StorageResourceAdaptorImpl extends SshAgentAdaptor implements StorageResourceAdaptor {
- private static final Logger logger = LogManager.getLogger(SshAgentAdaptor.class);
+ private final static Logger logger = LoggerFactory.getLogger(StorageResourceAdaptorImpl.class);
private Session session = null;
private AppCatalog appCatalog;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
index e5de707..8deb75f 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/controller/HelixController.java
@@ -22,8 +22,8 @@ package org.apache.airavata.helix.impl.controller;
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.helix.controller.HelixControllerMain;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.concurrent.CountDownLatch;
@@ -35,7 +35,7 @@ import java.util.concurrent.CountDownLatch;
*/
public class HelixController implements Runnable {
- private static final Logger logger = LogManager.getLogger(HelixController.class);
+ private final static Logger logger = LoggerFactory.getLogger(HelixController.class);
private String clusterName;
private String controllerName;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
index 0a6c7a4..cf0dbd5 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java
@@ -25,15 +25,15 @@ import org.apache.airavata.helix.core.participant.HelixParticipant;
import org.apache.airavata.helix.core.support.TaskHelperImpl;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.helix.task.TaskFactory;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Map;
public class GlobalParticipant extends HelixParticipant {
- private static final Logger logger = LogManager.getLogger(GlobalParticipant.class);
+ private final static Logger logger = LoggerFactory.getLogger(GlobalParticipant.class);
private String[] taskClasses = {
"org.apache.airavata.helix.impl.task.env.EnvSetupTask",
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
index 01a7c15..15260a6 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/AiravataTask.java
@@ -22,9 +22,7 @@ package org.apache.airavata.helix.impl.task;
import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.helix.core.AbstractTask;
-import org.apache.airavata.helix.core.OutPort;
import org.apache.airavata.helix.task.api.TaskHelper;
-import org.apache.airavata.helix.task.api.annotation.TaskOutPort;
import org.apache.airavata.helix.task.api.annotation.TaskParam;
import org.apache.airavata.messaging.core.MessageContext;
import org.apache.airavata.messaging.core.MessagingFactory;
@@ -43,9 +41,9 @@ import org.apache.airavata.registry.core.experiment.catalog.impl.RegistryFactory
import org.apache.airavata.registry.cpi.*;
import org.apache.helix.HelixManager;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.apache.log4j.MDC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -53,7 +51,7 @@ import java.util.List;
public abstract class AiravataTask extends AbstractTask {
- private static final Logger logger = LogManager.getLogger(AiravataTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(AiravataTask.class);
private AppCatalog appCatalog;
private ExperimentCatalog experimentCatalog;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
index 23c48ef..004ca7d 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/TaskContext.java
@@ -47,7 +47,6 @@ import org.apache.airavata.registry.cpi.AppCatalog;
import org.apache.airavata.registry.cpi.AppCatalogException;
import org.apache.airavata.registry.cpi.ExperimentCatalog;
import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
-import org.apache.curator.framework.CuratorFramework;
import org.apache.thrift.TException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -57,7 +56,7 @@ import java.util.*;
public class TaskContext {
- private static final Logger log = LoggerFactory.getLogger(TaskContext.class);
+ private final static Logger logger = LoggerFactory.getLogger(TaskContext.class);
// process model
private ExperimentCatalog experimentCatalog;
private AppCatalog appCatalog;
@@ -391,7 +390,7 @@ public class TaskContext {
public void setProcessStatus(ProcessStatus status) {
if (status != null) {
- log.info("expId: {}, processId: {} :- Process status changed {} -> {}", getExperimentId(), processId,
+ logger.info("expId: {}, processId: {} :- Process status changed {} -> {}", getExperimentId(), processId,
getProcessState().name(), status.getState().name());
List<ProcessStatus> processStatuses = new ArrayList<>();
processStatuses.add(status);
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
index f5b9f1e..308cc0e 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/CancelCompletingTask.java
@@ -2,17 +2,16 @@ package org.apache.airavata.helix.impl.task.cancel;
import org.apache.airavata.helix.impl.task.AiravataTask;
import org.apache.airavata.helix.impl.task.TaskContext;
-import org.apache.airavata.helix.impl.task.completing.CompletingTask;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.status.ProcessState;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@TaskDef(name = "Cancel Completing Task")
public class CancelCompletingTask extends AiravataTask {
- private static final Logger logger = LogManager.getLogger(CancelCompletingTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(CancelCompletingTask.class);
@Override
public TaskResult onRun(TaskHelper helper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
index e1495cd..20813b0 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/RemoteJobCancellationTask.java
@@ -17,15 +17,15 @@ import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.helix.HelixManager;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.List;
@TaskDef(name = "Remote Job Cancellation Task")
public class RemoteJobCancellationTask extends AiravataTask {
- private static final Logger logger = LogManager.getLogger(RemoteJobCancellationTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(RemoteJobCancellationTask.class);
private CuratorFramework curatorClient = null;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java
index 2abca2c..0513327 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/cancel/WorkflowCancellationTask.java
@@ -11,13 +11,13 @@ import org.apache.helix.InstanceType;
import org.apache.helix.task.TaskDriver;
import org.apache.helix.task.TaskResult;
import org.apache.helix.task.TaskState;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@TaskDef(name = "Workflow Cancellation Task")
public class WorkflowCancellationTask extends AbstractTask {
- private static final Logger logger = LogManager.getLogger(WorkflowCancellationTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(WorkflowCancellationTask.class);
private TaskDriver taskDriver;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
index 04640f9..6e5c941 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/completing/CompletingTask.java
@@ -25,13 +25,13 @@ import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.status.ProcessState;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@TaskDef(name = "Completing Task")
public class CompletingTask extends AiravataTask {
- private static final Logger logger = LogManager.getLogger(CompletingTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(CompletingTask.class);
@Override
public TaskResult onRun(TaskHelper helper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java
index 2cc45ec..9d1165c 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/env/EnvSetupTask.java
@@ -26,13 +26,13 @@ import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.status.ProcessState;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@TaskDef(name = "Environment Setup Task")
public class EnvSetupTask extends AiravataTask {
- private static final Logger logger = LogManager.getLogger(EnvSetupTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(EnvSetupTask.class);
@Override
public TaskResult onRun(TaskHelper taskHelper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java
index 187919c..ddea270 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/ArchiveTask.java
@@ -30,8 +30,8 @@ import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.model.task.DataStagingTaskModel;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URI;
@@ -40,7 +40,7 @@ import java.net.URISyntaxException;
@TaskDef(name = "Archival Task")
public class ArchiveTask extends DataStagingTask {
- private static final Logger logger = LogManager.getLogger(ArchiveTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(ArchiveTask.class);
@Override
public TaskResult onRun(TaskHelper taskHelper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
index 6cd7487..ff8d6a1 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/DataStagingTask.java
@@ -30,17 +30,16 @@ import org.apache.airavata.model.appcatalog.storageresource.StorageResourceDescr
import org.apache.airavata.model.task.DataStagingTaskModel;
import org.apache.airavata.registry.cpi.AppCatalogException;
import org.apache.commons.io.FileUtils;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
-import java.net.URI;
@SuppressWarnings("WeakerAccess")
public abstract class DataStagingTask extends AiravataTask {
- private static final Logger logger = LogManager.getLogger(DataStagingTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(DataStagingTask.class);
@SuppressWarnings("WeakerAccess")
protected DataStagingTaskModel getDataStagingTaskModel() throws TaskOnFailException {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/InputDataStagingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/InputDataStagingTask.java
index bf99ba4..04da216 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/InputDataStagingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/InputDataStagingTask.java
@@ -30,8 +30,8 @@ import org.apache.airavata.model.application.io.InputDataObjectType;
import org.apache.airavata.model.status.ProcessState;
import org.apache.airavata.model.task.DataStagingTaskModel;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URI;
@@ -40,7 +40,7 @@ import java.net.URISyntaxException;
@TaskDef(name = "Input Data Staging Task")
public class InputDataStagingTask extends DataStagingTask {
- private static final Logger logger = LogManager.getLogger(InputDataStagingTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(InputDataStagingTask.class);
@Override
public TaskResult onRun(TaskHelper taskHelper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
index a7ef81b..b865886 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/staging/OutputDataStagingTask.java
@@ -33,8 +33,8 @@ import org.apache.airavata.model.task.DataStagingTaskModel;
import org.apache.airavata.registry.cpi.ExpCatChildDataType;
import org.apache.airavata.registry.cpi.RegistryException;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URI;
@@ -45,7 +45,7 @@ import java.util.List;
@TaskDef(name = "Output Data Staging Task")
public class OutputDataStagingTask extends DataStagingTask {
- private static final Logger logger = LogManager.getLogger(OutputDataStagingTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(OutputDataStagingTask.class);
@Override
public TaskResult onRun(TaskHelper taskHelper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
index 30318c8..a9e2915 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/DefaultJobSubmissionTask.java
@@ -34,8 +34,8 @@ import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.status.*;
import org.apache.airavata.registry.cpi.ExperimentCatalogModelType;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
@@ -44,7 +44,7 @@ import java.util.List;
@TaskDef(name = "Default Job Submission")
public class DefaultJobSubmissionTask extends JobSubmissionTask {
- private static final Logger logger = LogManager.getLogger(DefaultJobSubmissionTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(DefaultJobSubmissionTask.class);
private static final String DEFAULT_JOB_ID = "DEFAULT_JOB_ID";
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java
index 8c5d218..97dee2f 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/ForkJobSubmissionTask.java
@@ -31,8 +31,8 @@ import org.apache.airavata.model.job.JobModel;
import org.apache.airavata.model.status.JobState;
import org.apache.airavata.model.status.JobStatus;
import org.apache.helix.task.TaskResult;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collections;
@@ -40,7 +40,7 @@ import java.util.Collections;
@SuppressWarnings("unused")
public class ForkJobSubmissionTask extends JobSubmissionTask {
- private static final Logger logger = LogManager.getLogger(ForkJobSubmissionTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(ForkJobSubmissionTask.class);
@Override
public TaskResult onRun(TaskHelper taskHelper, TaskContext taskContext) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
index 274be53..16869bb 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/JobSubmissionTask.java
@@ -43,9 +43,9 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.apache.helix.HelixManager;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.apache.zookeeper.CreateMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.security.SecureRandom;
@@ -53,7 +53,7 @@ import java.util.*;
public abstract class JobSubmissionTask extends AiravataTask {
- private static final Logger logger = LogManager.getLogger(JobSubmissionTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(JobSubmissionTask.class);
private CuratorFramework curatorClient = null;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java
index 3ae8274..cc03c50 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/LocalJobSubmissionTask.java
@@ -25,7 +25,6 @@ import org.apache.airavata.common.utils.AiravataUtils;
import org.apache.airavata.helix.impl.task.TaskContext;
import org.apache.airavata.helix.impl.task.submission.config.GroovyMapBuilder;
import org.apache.airavata.helix.impl.task.submission.config.GroovyMapData;
-import org.apache.airavata.helix.impl.task.submission.config.SubmissionUtil;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskDef;
import org.apache.airavata.model.job.JobModel;
@@ -55,7 +54,8 @@ public class LocalJobSubmissionTask extends JobSubmissionTask {
jobModel.setTaskId(getTaskId());
jobModel.setJobId(jobId);
- File jobFile = SubmissionUtil.createJobFile(groovyMapData);
+ // TODO fix this
+ /*File jobFile = SubmissionUtil.createJobFile(groovyMapData);
if (jobFile != null && jobFile.exists()) {
jobModel.setJobDescription(FileUtils.readFileToString(jobFile));
@@ -91,7 +91,7 @@ public class LocalJobSubmissionTask extends JobSubmissionTask {
saveAndPublishJobStatus(jobModel);
return null;
- }
+ }*/
return null;
} catch (Exception e) {
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
index a3374c5..144e521 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapBuilder.java
@@ -36,9 +36,9 @@ import org.apache.airavata.model.process.ProcessModel;
import org.apache.airavata.model.scheduling.ComputationalResourceSchedulingModel;
import org.apache.airavata.model.task.JobSubmissionTaskModel;
import org.apache.airavata.registry.cpi.AppCatalogException;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
public class GroovyMapBuilder {
- private static final Logger logger = LogManager.getLogger(GroovyMapBuilder.class);
+ private final static Logger logger = LoggerFactory.getLogger(GroovyMapBuilder.class);
public static final String MULTIPLE_INPUTS_SPLITTER = ",";
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java
index 51448ac..03e72fe 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/GroovyMapData.java
@@ -23,10 +23,9 @@ import groovy.lang.Writable;
import groovy.text.GStringTemplateEngine;
import groovy.text.TemplateEngine;
import org.apache.airavata.common.utils.ApplicationSettings;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import java.io.File;
import java.lang.reflect.Field;
import java.net.URL;
import java.util.HashMap;
@@ -35,7 +34,7 @@ import java.util.Map;
public class GroovyMapData {
- private static final Logger logger = LogManager.getLogger(GroovyMapData.class);
+ private final static Logger logger = LoggerFactory.getLogger(GroovyMapData.class);
@ScriptTag(name = "inputDir")
private String inputDir;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/Script.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/Script.java
deleted file mode 100644
index 730d8ce..0000000
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/Script.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.airavata.helix.impl.task.submission.config;
-
-public enum Script {
-
- SHELL_NAME("shellName"),
- QUEUE_NAME("queueName"),
- NODES("nodes"),
- CPU_COUNT("cpuCount"),
- MAIL_ADDRESS("mailAddress"),
- ACCOUNT_STRING("accountString"),
- MAX_WALL_TIME("maxWallTime"),
- JOB_NAME("jobName"),
- STANDARD_OUT_FILE("standardOutFile"),
- STANDARD_ERROR_FILE("standardErrorFile"),
- QUALITY_OF_SERVICE("qualityOfService"),
- RESERVATION("reservation"),
- EXPORTS("exports"),
- MODULE_COMMANDS("moduleCommands"),
- SCRATCH_LOCATION("scratchLocation"),
- WORKING_DIR("workingDirectory"),
- PRE_JOB_COMMANDS("preJobCommands"),
- JOB_SUBMITTER_COMMAND("jobSubmitterCommand"),
- EXECUTABLE_PATH("executablePath"),
- INPUTS("inputs"),
- INPUTS_ALL("inputsAll"),
- POST_JOB_COMMANDS("postJobCommands"),
- USED_MEM("usedMem"),
- PROCESS_PER_NODE("processPerNode"),
- CHASSIS_NAME("chassisName"),
- INPUT_DIR("inputDir"),
- OUTPUT_DIR("outputDir"),
- USER_NAME("userName"),
- GATEWAY_ID("gatewayId"),
- GATEWAY_USER_NAME("gatewayUserName"),
- APPLICATION_NAME("applicationName"),
- QUEUE_SPECIFIC_MACROS("queueSpecificMacros")
- ;
-
- String name;
- Script(String name) {
- this.name = name;
- }
-}
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/SubmissionUtil.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/SubmissionUtil.java
deleted file mode 100644
index 14e89dd..0000000
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/task/submission/config/SubmissionUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.airavata.helix.impl.task.submission.config;
-
-import java.io.File;
-
-public class SubmissionUtil {
-
- public static File createJobFile(GroovyMapData mapData) {
- return null;
- }
-}
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
index 0b796a6..e68b526 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PostWorkflowManager.java
@@ -59,16 +59,16 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.common.serialization.StringDeserializer;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
public class PostWorkflowManager {
- private static final Logger logger = LogManager.getLogger(PostWorkflowManager.class);
+ private final static Logger logger = LoggerFactory.getLogger(PostWorkflowManager.class);
private CuratorFramework curatorClient = null;
private Publisher statusPublisher;
diff --git a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
index 808b05e..53f1512 100644
--- a/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
+++ b/modules/airavata-helix/helix-spectator/src/main/java/org/apache/airavata/helix/impl/workflow/PreWorkflowManager.java
@@ -48,21 +48,20 @@ import org.apache.curator.RetryPolicy;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
import org.apache.thrift.TBase;
import org.apache.thrift.TException;
import org.apache.zookeeper.CreateMode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
-import java.util.stream.Collectors;
public class PreWorkflowManager {
- private static final Logger logger = LogManager.getLogger(PreWorkflowManager.class);
+ private final static Logger logger = LoggerFactory.getLogger(PreWorkflowManager.class);
private Subscriber subscriber;
private CuratorFramework curatorClient = null;
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/AbstractTask.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
index 2c4b5a8..b7304d7 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/AbstractTask.java
@@ -23,14 +23,13 @@ import org.apache.airavata.helix.core.util.TaskUtil;
import org.apache.airavata.helix.task.api.TaskHelper;
import org.apache.airavata.helix.task.api.annotation.TaskOutPort;
import org.apache.airavata.helix.task.api.annotation.TaskParam;
-import org.apache.airavata.model.status.TaskState;
import org.apache.helix.HelixManager;
import org.apache.helix.task.Task;
import org.apache.helix.task.TaskCallbackContext;
import org.apache.helix.task.TaskResult;
import org.apache.helix.task.UserContentStore;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* TODO: Class level comments please
@@ -40,7 +39,7 @@ import org.apache.log4j.Logger;
*/
public abstract class AbstractTask extends UserContentStore implements Task {
- private static final Logger logger = LogManager.getLogger(AbstractTask.class);
+ private final static Logger logger = LoggerFactory.getLogger(AbstractTask.class);
private static final String NEXT_JOB = "next-job";
private static final String WORKFLOW_STARTED = "workflow-started";
diff --git a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
index a208539..b1d71a9 100644
--- a/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
+++ b/modules/airavata-helix/task-core/src/main/java/org/apache/airavata/helix/core/participant/HelixParticipant.java
@@ -38,11 +38,9 @@ import org.apache.helix.task.Task;
import org.apache.helix.task.TaskCallbackContext;
import org.apache.helix.task.TaskFactory;
import org.apache.helix.task.TaskStateModelFactory;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,7 +53,7 @@ import java.util.Map;
*/
public class HelixParticipant <T extends AbstractTask> implements Runnable {
- private static final Logger logger = LogManager.getLogger(HelixParticipant.class);
+ private final static Logger logger = LoggerFactory.getLogger(HelixParticipant.class);
private String zkAddress;
private String clusterName;
diff --git a/modules/airavata-helix/workflow-impl/src/main/java/org/apache/airavata/helix/workflow/WorkflowManager.java b/modules/airavata-helix/workflow-impl/src/main/java/org/apache/airavata/helix/workflow/WorkflowManager.java
index bbced49..df558f2 100644
--- a/modules/airavata-helix/workflow-impl/src/main/java/org/apache/airavata/helix/workflow/WorkflowManager.java
+++ b/modules/airavata-helix/workflow-impl/src/main/java/org/apache/airavata/helix/workflow/WorkflowManager.java
@@ -27,8 +27,8 @@ import org.apache.helix.HelixManager;
import org.apache.helix.HelixManagerFactory;
import org.apache.helix.InstanceType;
import org.apache.helix.task.*;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
@@ -42,7 +42,7 @@ import java.util.Map;
*/
public class WorkflowManager {
- private static final Logger logger = LogManager.getLogger(WorkflowManager.class);
+ private final static Logger logger = LoggerFactory.getLogger(WorkflowManager.class);
private static final String WORKFLOW_PREFIX = "Workflow_of_process_";
private TaskDriver taskDriver;
--
To stop receiving notification emails like this one, please contact
dimuthuupe@apache.org.