Repository: airavata Updated Branches: refs/heads/moduleRefactor 7b8097476 -> 19afc7e0d
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 @@ </parent> <name>Airavata Gfac Service</name> - <artifactId>airavata-gfac-service</artifactId> + <artifactId>gfac-service</artifactId> <packaging>jar</packaging> <url>http://airavata.apache.org/</url> @@ -57,7 +57,12 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-core</artifactId> + <artifactId>gfac-core</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>gfac-impl</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -72,7 +77,7 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-stubs</artifactId> + <artifactId>gfac-client</artifactId> <version>${project.version}</version> </dependency> <dependency> 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. --> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-core</artifactId> + <artifactId>gfac-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-stubs</artifactId> + <artifactId>gfac-client</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-hpc-monitor</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> <artifactId>airavata-data-models</artifactId> <version>${project.version}</version> </dependency> @@ -71,18 +65,6 @@ the License. --> <version>${project.version}</version> </dependency> <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-local</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-gsissh</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> <version>${derby.version}</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 @@ </dependency> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-stubs</artifactId> + <artifactId>gfac-client</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -259,7 +259,7 @@ <!-- TODO need clean up --> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-core</artifactId> + <artifactId>gfac-core</artifactId> <version>${project.version}</version> </dependency> <!-- <dependency> http://git-wip-us.apache.org/repos/asf/airavata/blob/19afc7e0/modules/xbaya-gui/pom.xml ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml index 8919f1d..520b076 100644 --- a/modules/xbaya-gui/pom.xml +++ b/modules/xbaya-gui/pom.xml @@ -229,14 +229,9 @@ <!-- TODO need clean up --> <dependency> <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-core</artifactId> + <artifactId>gfac-core</artifactId> <version>${project.version}</version> </dependency> -<!-- <dependency> - <groupId>org.apache.airavata</groupId> - <artifactId>airavata-gfac-ec2</artifactId> - <version>${project.version}</version> - </dependency>--> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId>
