You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sh...@apache.org on 2015/06/04 21:45:09 UTC
airavata git commit: Fixed test failures and artifact names.
Repository: airavata
Updated Branches:
refs/heads/moduleRefactor 6eaaff4fe -> 08e3a8723
Fixed test failures and artifact names.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/08e3a872
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/08e3a872
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/08e3a872
Branch: refs/heads/moduleRefactor
Commit: 08e3a872330845b2391e413c0851558db2e246cd
Parents: 6eaaff4
Author: Shameera Rathanyaka <sh...@gmail.com>
Authored: Thu Jun 4 15:45:02 2015 -0400
Committer: Shameera Rathanyaka <sh...@gmail.com>
Committed: Thu Jun 4 15:45:02 2015 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 2 +-
distribution/pom.xml | 26 +++-----------------
.../gfac-application-specific-handlers/pom.xml | 6 ++---
modules/gfac/gfac-bes/pom.xml | 6 ++---
modules/gfac/gfac-client/pom.xml | 4 +--
modules/gfac/gfac-core/pom.xml | 4 +--
modules/gfac/gfac-impl/pom.xml | 6 ++---
.../gfac/ssh/config/ConfigReaderTest.java | 1 +
.../impl/DefaultSSHApiTestWithMyProxyAuth.java | 12 ++++++---
.../gfac/ssh/impl/VanilaTestWithSSHAuth.java | 12 +++++----
.../apache/airavata/job/AMQPMonitorTest.java | 17 +++++++------
modules/gfac/gfac-service/pom.xml | 10 ++++----
modules/gfac/pom.xml | 2 +-
.../orchestrator/orchestrator-client/pom.xml | 2 +-
modules/orchestrator/orchestrator-core/pom.xml | 6 ++---
.../orchestrator/orchestrator-service/pom.xml | 6 ++---
modules/server/pom.xml | 2 +-
modules/workflow-model/workflow-engine/pom.xml | 6 ++---
modules/xbaya-gui/pom.xml | 4 +--
19 files changed, 62 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/airavata-api/airavata-api-server/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index 6bf3d32..885bb16 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator-client</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index f7047f4..cf33308 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -266,12 +266,12 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-orchestrator-stubs</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-stubs</artifactId>
+ <artifactId>airavata-gfac-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -301,7 +301,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-ssh</artifactId>
+ <artifactId>airavata-gfac-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -311,21 +311,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-gsissh</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-hpc-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-gfac-local</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -341,11 +326,6 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gsissh</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.airavata</groupId>
<artifactId>airavata-model-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-application-specific-handlers/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-application-specific-handlers/pom.xml b/modules/gfac/gfac-application-specific-handlers/pom.xml
index 638c81f..36d2a37 100644
--- a/modules/gfac/gfac-application-specific-handlers/pom.xml
+++ b/modules/gfac/gfac-application-specific-handlers/pom.xml
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>gfac-application-specific-handlers</artifactId>
+ <artifactId>airavata-gfac-application-specific-handlers</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-bes/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-bes/pom.xml b/modules/gfac/gfac-bes/pom.xml
index 4e61ae0..f3fba4f 100644
--- a/modules/gfac/gfac-bes/pom.xml
+++ b/modules/gfac/gfac-bes/pom.xml
@@ -14,13 +14,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>gfac-bes</artifactId>
+ <artifactId>airavata-gfac-bes</artifactId>
<name>Airavata GFac BES implementation</name>
<description>This is the extension of GFAC to use GRAM </description>
<url>http://airavata.apache.org/</url>
@@ -36,7 +36,7 @@
<!-- GFAC schemas -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Credential Store -->
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-client/pom.xml b/modules/gfac/gfac-client/pom.xml
index 20423e0..2028c22 100644
--- a/modules/gfac/gfac-client/pom.xml
+++ b/modules/gfac/gfac-client/pom.xml
@@ -13,14 +13,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Airavata Gfac Client SDK</name>
- <artifactId>gfac-client</artifactId>
+ <artifactId>airavata-gfac-client</artifactId>
<packaging>jar</packaging>
<url>http://airavata.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/pom.xml b/modules/gfac/gfac-core/pom.xml
index 0203865..d2741a1 100644
--- a/modules/gfac/gfac-core/pom.xml
+++ b/modules/gfac/gfac-core/pom.xml
@@ -11,13 +11,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<name>Airavata GFac Core</name>
<description>The core GFAC functionality independent from any webservice implementation.</description>
<url>http://airavata.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-impl/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/pom.xml b/modules/gfac/gfac-impl/pom.xml
index 0326782..871572d 100644
--- a/modules/gfac/gfac-impl/pom.xml
+++ b/modules/gfac/gfac-impl/pom.xml
@@ -11,13 +11,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>gfac-impl</artifactId>
+ <artifactId>airavata-gfac-impl</artifactId>
<name>Airavata GFac Implementation</name>
<description>This is the extension of GFAC Local.</description>
<url>http://airavata.apache.org/</url>
@@ -33,7 +33,7 @@
<!-- GFAC schemas -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/config/ConfigReaderTest.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/config/ConfigReaderTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/config/ConfigReaderTest.java
index a90dcba..760ab17 100644
--- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/config/ConfigReaderTest.java
+++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/config/ConfigReaderTest.java
@@ -21,6 +21,7 @@
package org.apache.airavata.gfac.ssh.config;
+import org.apache.airavata.gfac.gsi.ssh.config.ConfigReader;
import org.testng.Assert;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/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 79f29e4..45d8ca2 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,10 +21,16 @@
package org.apache.airavata.gfac.ssh.impl;
+import org.apache.airavata.gfac.core.SSHApiException;
+import org.apache.airavata.gfac.core.cluster.CommandInfo;
+import org.apache.airavata.gfac.core.cluster.CommandOutput;
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;
+import org.apache.airavata.gfac.core.cluster.ServerInfo;
+import org.apache.airavata.gfac.gsi.ssh.api.CommandExecutor;
+import org.apache.airavata.gfac.gsi.ssh.config.ConfigReader;
+import org.apache.airavata.gfac.gsi.ssh.impl.PBSCluster;
+import org.apache.airavata.gfac.gsi.ssh.impl.SystemCommandOutput;
+import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPublicKeyAuthentication;
import org.apache.commons.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/VanilaTestWithSSHAuth.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/VanilaTestWithSSHAuth.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/VanilaTestWithSSHAuth.java
index 002674c..8bc8c66 100644
--- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/VanilaTestWithSSHAuth.java
+++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/gfac/ssh/impl/VanilaTestWithSSHAuth.java
@@ -21,12 +21,14 @@
package org.apache.airavata.gfac.ssh.impl;
-import org.apache.airavata.gfac.ssh.api.*;
+import org.apache.airavata.gfac.core.JobDescriptor;
import org.apache.airavata.gfac.core.authentication.AuthenticationInfo;
-import org.apache.airavata.gfac.ssh.api.job.JobDescriptor;
-import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPasswordAuthenticationInfo;
-import org.apache.airavata.gfac.ssh.impl.authentication.DefaultPublicKeyFileAuthentication;
-import org.apache.airavata.gfac.ssh.util.CommonUtils;
+import org.apache.airavata.gfac.core.cluster.Cluster;
+import org.apache.airavata.gfac.core.cluster.ServerInfo;
+import org.apache.airavata.gfac.gsi.ssh.impl.PBSCluster;
+import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPasswordAuthenticationInfo;
+import org.apache.airavata.gfac.gsi.ssh.impl.authentication.DefaultPublicKeyFileAuthentication;
+import org.apache.airavata.gfac.gsi.ssh.util.CommonUtils;
import org.testng.AssertJUnit;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
index 29d6fca..aecc8c2 100644
--- a/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
+++ b/modules/gfac/gfac-impl/src/test/java/org/apache/airavata/job/AMQPMonitorTest.java
@@ -25,15 +25,16 @@ import com.google.common.eventbus.Subscribe;
import org.airavata.appcatalog.cpi.AppCatalog;
import org.apache.aiaravata.application.catalog.data.impl.AppCatalogFactory;
import org.apache.airavata.common.utils.MonitorPublisher;
+import org.apache.airavata.gfac.core.JobDescriptor;
+import org.apache.airavata.gfac.core.SSHApiException;
+import org.apache.airavata.gfac.core.authentication.GSIAuthenticationInfo;
+import org.apache.airavata.gfac.core.cluster.Cluster;
+import org.apache.airavata.gfac.core.cluster.ServerInfo;
import org.apache.airavata.gfac.core.monitor.MonitorID;
+import org.apache.airavata.gfac.gsi.ssh.impl.PBSCluster;
+import org.apache.airavata.gfac.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo;
+import org.apache.airavata.gfac.gsi.ssh.util.CommonUtils;
import org.apache.airavata.gfac.monitor.impl.push.amqp.AMQPMonitor;
-import org.apache.airavata.gfac.ssh.api.Cluster;
-import org.apache.airavata.gfac.ssh.api.SSHApiException;
-import org.apache.airavata.gfac.ssh.api.ServerInfo;
-import org.apache.airavata.gfac.ssh.api.authentication.GSIAuthenticationInfo;
-import org.apache.airavata.gfac.ssh.api.job.JobDescriptor;
-import org.apache.airavata.gfac.ssh.impl.PBSCluster;
-import org.apache.airavata.gfac.ssh.impl.authentication.MyProxyAuthenticationInfo;
import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
import org.apache.airavata.model.appcatalog.computeresource.DataMovementInterface;
import org.apache.airavata.model.appcatalog.computeresource.DataMovementProtocol;
@@ -148,7 +149,7 @@ public class AMQPMonitorTest {
Cluster pbsCluster = new
- PBSCluster(serverInfo, authenticationInfo, org.apache.airavata.gfac.ssh.util.CommonUtils.getPBSJobManager("/usr/bin/"));
+ PBSCluster(serverInfo, authenticationInfo, CommonUtils.getPBSJobManager("/usr/bin/"));
// Execute command
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/gfac-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml
index fefc8cd..99497a3 100644
--- a/modules/gfac/gfac-service/pom.xml
+++ b/modules/gfac/gfac-service/pom.xml
@@ -13,14 +13,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<groupId>org.apache.airavata</groupId>
<version>0.16-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<name>Airavata Gfac Service</name>
- <artifactId>gfac-service</artifactId>
+ <artifactId>airavata-gfac-service</artifactId>
<packaging>jar</packaging>
<url>http://airavata.apache.org/</url>
@@ -57,17 +57,17 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-client</artifactId>
+ <artifactId>airavata-gfac-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-impl</artifactId>
+ <artifactId>airavata-gfac-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/gfac/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/pom.xml b/modules/gfac/pom.xml
index 0414afc..3bb21a9 100644
--- a/modules/gfac/pom.xml
+++ b/modules/gfac/pom.xml
@@ -19,7 +19,7 @@
<modelVersion>4.0.0</modelVersion>
- <artifactId>gfac</artifactId>
+ <artifactId>airavata-gfac</artifactId>
<packaging>pom</packaging>
<name>Airavata GFac</name>
<url>http://airavata.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/orchestrator/orchestrator-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client/pom.xml b/modules/orchestrator/orchestrator-client/pom.xml
index 0c439c9..618f31b 100644
--- a/modules/orchestrator/orchestrator-client/pom.xml
+++ b/modules/orchestrator/orchestrator-client/pom.xml
@@ -20,7 +20,7 @@
</parent>
<name>Airavata Orchestrator Client SDK</name>
- <artifactId>orchestrator-client</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<packaging>jar</packaging>
<url>http://airavata.apache.org/</url>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/orchestrator/orchestrator-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index 3a9a48a..9e111d1 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -18,7 +18,7 @@ the License. -->
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>orchestrator-core</artifactId>
+ <artifactId>airavata-orchestrator-core</artifactId>
<packaging>jar</packaging>
<name>Airavata Orchestrator Core</name>
<url>http://airavata.apache.org/</url>
@@ -46,12 +46,12 @@ the License. -->
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-client</artifactId>
+ <artifactId>airavata-gfac-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/orchestrator/orchestrator-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml
index a3f47c7..f0bb400 100644
--- a/modules/orchestrator/orchestrator-service/pom.xml
+++ b/modules/orchestrator/orchestrator-service/pom.xml
@@ -20,7 +20,7 @@
</parent>
<name>Airavata Orchestrator Service</name>
- <artifactId>orchestrator-service</artifactId>
+ <artifactId>airavata-orchestrator-service</artifactId>
<packaging>jar</packaging>
<url>http://airavata.apache.org/</url>
@@ -42,12 +42,12 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator-core</artifactId>
+ <artifactId>airavata-orchestrator-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator-client</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index a204543..37ba141 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator-client</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/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 2928014..9997800 100644
--- a/modules/workflow-model/workflow-engine/pom.xml
+++ b/modules/workflow-model/workflow-engine/pom.xml
@@ -232,12 +232,12 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator-client</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-client</artifactId>
+ <artifactId>airavata-gfac-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -259,7 +259,7 @@
<!-- TODO need clean up -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>
http://git-wip-us.apache.org/repos/asf/airavata/blob/08e3a872/modules/xbaya-gui/pom.xml
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/pom.xml b/modules/xbaya-gui/pom.xml
index 520b076..a26e09d 100644
--- a/modules/xbaya-gui/pom.xml
+++ b/modules/xbaya-gui/pom.xml
@@ -216,7 +216,7 @@
</dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>orchestrator-client</artifactId>
+ <artifactId>airavata-orchestrator-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -229,7 +229,7 @@
<!-- TODO need clean up -->
<dependency>
<groupId>org.apache.airavata</groupId>
- <artifactId>gfac-core</artifactId>
+ <artifactId>airavata-gfac-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>