Repository: airavata Updated Branches: refs/heads/lahiru/AIRAVATA-2065 c558ba57b -> c94365cf4
Fix the correct import for MDC Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c94365cf Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c94365cf Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c94365cf Branch: refs/heads/lahiru/AIRAVATA-2065 Commit: c94365cf45e0fa8bb4af3c374b1a709da4dd8f46 Parents: c558ba5 Author: Lahiru Ginnaliya Gamathige <[email protected]> Authored: Mon Sep 26 22:50:00 2016 -0700 Committer: Lahiru Ginnaliya Gamathige <[email protected]> Committed: Mon Sep 26 22:50:00 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/airavata/gfac/server/GfacServerHandler.java | 2 +- .../airavata/orchestrator/server/OrchestratorServerHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c94365cf/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java index db571d7..7394e62 100644 --- a/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java +++ b/modules/gfac/gfac-service/src/main/java/org/apache/airavata/gfac/server/GfacServerHandler.java @@ -55,7 +55,6 @@ import org.apache.airavata.registry.cpi.ExperimentCatalogModelType; import org.apache.airavata.registry.cpi.RegistryException; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.utils.ZKPaths; -import org.apache.log4j.MDC; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.zookeeper.CreateMode; @@ -63,6 +62,7 @@ import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.MDC; import java.util.ArrayList; import java.util.Calendar; http://git-wip-us.apache.org/repos/asf/airavata/blob/c94365cf/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index 2d4718e..a1a31bf 100644 --- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@ -64,12 +64,12 @@ import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; import org.apache.curator.utils.ZKPaths; -import org.apache.log4j.MDC; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.zookeeper.data.Stat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.slf4j.MDC; import java.util.*;
