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 2016/11/02 00:23:19 UTC
airavata git commit: Added aurora client to distribution
Repository: airavata
Updated Branches:
refs/heads/develop 11ff4d8e9 -> b3d4c7a1a
Added aurora client to distribution
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b3d4c7a1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b3d4c7a1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b3d4c7a1
Branch: refs/heads/develop
Commit: b3d4c7a1ac2330dc1653194129d0f1e5e35d554b
Parents: 11ff4d8
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Tue Nov 1 20:23:14 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Tue Nov 1 20:23:14 2016 -0400
----------------------------------------------------------------------
modules/distribution/pom.xml | 29 ++++----------------
.../src/main/assembly/bin-assembly.xml | 5 ----
.../gfac/impl/task/AuroraJobSubmission.java | 8 ++++--
3 files changed, 10 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b3d4c7a1/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 1199647..427d4b4 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -55,30 +55,6 @@
</executions>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.codehaus.gmaven</groupId>-->
- <!--<artifactId>gmaven-plugin</artifactId>-->
- <!--<version>1.4</version>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>generate-timestamp</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>execute</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<source>-->
- <!--import java.util.Date-->
- <!--import java.text.MessageFormat-->
-
- <!--project.properties['buildTimestamp'] =-->
- <!--MessageFormat.format("{0,date,dd-MM-yyyy}", new-->
- <!--Date())-->
- <!--</source>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
@@ -319,6 +295,11 @@
</dependency>-->
<dependency>
<groupId>org.apache.airavata</groupId>
+ <artifactId>aurora-client</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/b3d4c7a1/modules/distribution/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml
index 6aa8fa9..971bba0 100644
--- a/modules/distribution/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/bin-assembly.xml
@@ -107,11 +107,6 @@
<include>persistence.xml</include>
<include>provenance.sql</include>
<include>gfac-config.yaml</include>
- <!--<include>PBSTemplate.xslt</include>-->
- <!--<include>SLURMTemplate.xslt</include>-->
- <!--<include>LSFTemplate.xslt</include>-->
- <!--<include>UGETemplate.xslt</include>-->
- <!--<include>ForkTemplate.xslt</include>-->
<include>PBS_Groovy.template</include>
<include>SLURM_Groovy.template</include>
<include>LSF_Groovy.template</include>
http://git-wip-us.apache.org/repos/asf/airavata/blob/b3d4c7a1/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java
index c2e12d5..1c2596c 100644
--- a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java
+++ b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/task/AuroraJobSubmission.java
@@ -60,7 +60,9 @@ public class AuroraJobSubmission implements JobSubmissionTask{
@Override
public JobStatus cancel(TaskContext taskcontext) throws TaskException {
- return null;
+ JobStatus jobStatus = new JobStatus();
+ jobStatus.setJobState(JobState.ACTIVE);
+ return jobStatus;
}
@Override
@@ -136,11 +138,11 @@ public class AuroraJobSubmission implements JobSubmissionTask{
@Override
public TaskStatus recover(TaskContext taskContext) {
- return null;
+ return execute(taskContext);
}
@Override
public TaskTypes getType() {
- return null;
+ return TaskTypes.JOB_SUBMISSION;
}
}