Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6705189C8 for ; Thu, 4 Jun 2015 20:15:16 +0000 (UTC) Received: (qmail 53895 invoked by uid 500); 4 Jun 2015 20:15:16 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 53825 invoked by uid 500); 4 Jun 2015 20:15:16 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 53408 invoked by uid 99); 4 Jun 2015 20:15:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jun 2015 20:15:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5200EE10AB; Thu, 4 Jun 2015 20:15:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shameera@apache.org To: commits@airavata.apache.org Date: Thu, 04 Jun 2015 20:15:53 -0000 Message-Id: <581e490ad8f9466c84513dfd8c12ae5e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [40/81] [abbrv] airavata git commit: Resolve compilation issues in gfac module after module refactoring http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java index 72c032b..31550fd 100644 --- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java +++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java @@ -8,7 +8,7 @@ import java.util.List; import org.apache.airavata.gfac.core.context.JobExecutionContext; import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.GFacUtils; -import org.apache.airavata.gfac.ssh.api.Cluster; +import org.apache.airavata.gfac.core.cluster.Cluster; import org.apache.airavata.model.appcatalog.appinterface.DataType; import org.apache.airavata.model.appcatalog.appinterface.OutputDataObjectType; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java index 61a7437..79f29e4 100644 --- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java +++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java @@ -21,6 +21,7 @@ package org.apache.airavata.gfac.ssh.impl; +import org.apache.airavata.gfac.core.cluster.RawCommandInfo; import org.apache.airavata.gfac.ssh.api.*; import org.apache.airavata.gfac.ssh.config.ConfigReader; import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPublicKeyAuthentication; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/gfac/gfac-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml index 224537f..b911385 100644 --- a/modules/gfac/gfac-service/pom.xml +++ b/modules/gfac/gfac-service/pom.xml @@ -20,7 +20,7 @@ Airavata Gfac Service - airavata-gfac-service + gfac-service jar http://airavata.apache.org/ @@ -57,7 +57,12 @@ org.apache.airavata - airavata-gfac-core + gfac-core + ${project.version} + + + org.apache.airavata + gfac-impl ${project.version} @@ -72,7 +77,7 @@ org.apache.airavata - airavata-gfac-stubs + gfac-client ${project.version} http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/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 77a89cc..64c06e4 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 @@ -35,16 +35,16 @@ import org.apache.airavata.common.utils.ThriftUtils; import org.apache.airavata.common.utils.listener.AbstractActivityListener; import org.apache.airavata.gfac.GFacConfiguration; import org.apache.airavata.gfac.GFacException; -import org.apache.airavata.gfac.core.cpi.BetterGfacImpl; import org.apache.airavata.gfac.core.GFac; import org.apache.airavata.gfac.core.handler.GFacHandlerConfig; import org.apache.airavata.gfac.core.handler.GFacHandlerException; import org.apache.airavata.gfac.core.handler.ThreadedHandler; import org.apache.airavata.gfac.core.GFacThreadPoolExecutor; import org.apache.airavata.gfac.core.GFacUtils; -import org.apache.airavata.gfac.core.utils.InputHandlerWorker; import org.apache.airavata.gfac.cpi.GfacService; import org.apache.airavata.gfac.cpi.gfac_cpi_serviceConstants; +import org.apache.airavata.gfac.impl.BetterGfacImpl; +import org.apache.airavata.gfac.impl.InputHandlerWorker; import org.apache.airavata.messaging.core.MessageContext; import org.apache.airavata.messaging.core.MessageHandler; import org.apache.airavata.messaging.core.MessagingConstants; http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/orchestrator/orchestrator-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml index 80543df..3a9a48a 100644 --- a/modules/orchestrator/orchestrator-core/pom.xml +++ b/modules/orchestrator/orchestrator-core/pom.xml @@ -46,22 +46,16 @@ the License. --> org.apache.airavata - airavata-gfac-core + gfac-core ${project.version} org.apache.airavata - airavata-gfac-stubs + gfac-client ${project.version} org.apache.airavata - airavata-gfac-hpc-monitor - ${project.version} - test - - - org.apache.airavata airavata-data-models ${project.version} @@ -71,18 +65,6 @@ the License. --> ${project.version} - org.apache.airavata - airavata-gfac-local - ${project.version} - test - - - org.apache.airavata - airavata-gfac-gsissh - ${project.version} - test - - org.apache.derby derby ${derby.version} http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/workflow-model/workflow-engine/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow-model/workflow-engine/pom.xml b/modules/workflow-model/workflow-engine/pom.xml index 1c22c06..2928014 100644 --- a/modules/workflow-model/workflow-engine/pom.xml +++ b/modules/workflow-model/workflow-engine/pom.xml @@ -237,7 +237,7 @@ org.apache.airavata - airavata-gfac-stubs + gfac-client ${project.version} @@ -259,7 +259,7 @@ org.apache.airavata - airavata-gfac-core + gfac-core ${project.version} org.apache.airavata - airavata-gfac-core + gfac-core ${project.version} - org.slf4j slf4j-api