Repository: airavata Updated Branches: refs/heads/master ae129dd21 -> 7d4da1958
SGE -> UGE renamed Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7d4da195 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7d4da195 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7d4da195 Branch: refs/heads/master Commit: 7d4da19587bef2b90dbebe7889d4f9099fc5ff45 Parents: ae129dd Author: shamrath <shameerai...@gmail.com> Authored: Thu May 14 18:08:42 2015 -0400 Committer: shamrath <shameerai...@gmail.com> Committed: Thu May 14 18:08:42 2015 -0400 ---------------------------------------------------------------------- .../org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java | 2 +- .../java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java | 4 ++-- .../main/java/org/apache/airavata/gsi/ssh/util/CommonUtils.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/7d4da195/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java index cfd40e0..0428bc0 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java @@ -140,7 +140,7 @@ public class GFACGSISSHUtils { } else if (SLURM_JOB_MANAGER.equalsIgnoreCase(jobManager)) { jConfig = CommonUtils.getSLURMJobManager(installedParentPath); } else if (SUN_GRID_ENGINE_JOB_MANAGER.equalsIgnoreCase(jobManager)) { - jConfig = CommonUtils.getSGEJobManager(installedParentPath); + jConfig = CommonUtils.getUGEJobManager(installedParentPath); }else if(LSF_JOB_MANAGER.equalsIgnoreCase(jobManager)) { jConfig = CommonUtils.getLSFJobManager(installedParentPath); } http://git-wip-us.apache.org/repos/asf/airavata/blob/7d4da195/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java index eb0b811..b38a170 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/GFACSSHUtils.java @@ -163,7 +163,7 @@ public class GFACSSHUtils { } else if (SLURM_JOB_MANAGER.equalsIgnoreCase(jobManager)) { jConfig = CommonUtils.getSLURMJobManager(installedParentPath); } else if (SUN_GRID_ENGINE_JOB_MANAGER.equalsIgnoreCase(jobManager)) { - jConfig = CommonUtils.getSGEJobManager(installedParentPath); + jConfig = CommonUtils.getUGEJobManager(installedParentPath); } else if (LSF_JOB_MANAGER.equalsIgnoreCase(jobManager)) { jConfig = CommonUtils.getLSFJobManager(installedParentPath); } @@ -262,7 +262,7 @@ public class GFACSSHUtils { } else if (SLURM_JOB_MANAGER.equalsIgnoreCase(jobManager)) { jConfig = CommonUtils.getSLURMJobManager(installedParentPath); } else if (SUN_GRID_ENGINE_JOB_MANAGER.equalsIgnoreCase(jobManager)) { - jConfig = CommonUtils.getSGEJobManager(installedParentPath); + jConfig = CommonUtils.getUGEJobManager(installedParentPath); } else if (LSF_JOB_MANAGER.equals(jobManager)) { jConfig = CommonUtils.getLSFJobManager(installedParentPath); } http://git-wip-us.apache.org/repos/asf/airavata/blob/7d4da195/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/CommonUtils.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/CommonUtils.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/CommonUtils.java index f1086d7..c6cd5c8 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/CommonUtils.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/CommonUtils.java @@ -71,7 +71,7 @@ public class CommonUtils { return new SlurmJobConfiguration("SLURMTemplate.xslt", ".slurm", installedPath, new SlurmOutputParser()); } - public static JobManagerConfiguration getSGEJobManager(String installedPath) { + public static JobManagerConfiguration getUGEJobManager(String installedPath) { return new UGEJobConfiguration("UGETemplate.xslt", ".pbs", installedPath, new UGEOutputParser()); }
