You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ra...@apache.org on 2014/07/29 23:24:56 UTC
[1/3] git commit: Fixed AIRAVATA-1367 for SGE. Its defined as UGE
Repository: airavata
Updated Branches:
refs/heads/master aef99c061 -> d498c7b23
Fixed AIRAVATA-1367 for SGE. Its defined as UGE
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/3bf8e23f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/3bf8e23f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/3bf8e23f
Branch: refs/heads/master
Commit: 3bf8e23f85d5c2d957084a23fa3c8444999a59ad
Parents: e61a290
Author: raminder <ra...@apache.org>
Authored: Tue Jul 29 17:22:42 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue Jul 29 17:22:42 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/3bf8e23f/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 6ce84d2..82ec900 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
@@ -58,7 +58,7 @@ public class GFACGSISSHUtils {
public static final String PBS_JOB_MANAGER = "pbs";
public static final String SLURM_JOB_MANAGER = "slurm";
- public static final String SUN_GRID_ENGINE_JOB_MANAGER = "sge";
+ public static final String SUN_GRID_ENGINE_JOB_MANAGER = "UGE";
public static void addSecurityContext(JobExecutionContext jobExecutionContext) throws GFacException, ApplicationSettingsException {
HostDescription registeredHost = jobExecutionContext.getApplicationContext().getHostDescription();
[3/3] git commit: Cleaned up the imports.
Posted by ra...@apache.org.
Cleaned up the imports.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d498c7b2
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d498c7b2
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d498c7b2
Branch: refs/heads/master
Commit: d498c7b23916f3e2f7bde31b90bf4ce4a74c66d9
Parents: 5398ba7
Author: raminder <ra...@apache.org>
Authored: Tue Jul 29 17:24:41 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue Jul 29 17:24:41 2014 -0400
----------------------------------------------------------------------
.../gfac/gsissh/util/GFACGSISSHUtils.java | 24 ++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/d498c7b2/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 f67e774..e287e3a 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
@@ -20,38 +20,44 @@
*/
package org.apache.airavata.gfac.gsissh.util;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+
import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.common.utils.StringUtil;
import org.apache.airavata.commons.gfac.type.ActualParameter;
import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.MappingFactory;
-import org.apache.airavata.credential.store.store.CredentialReader;
-import org.apache.airavata.gfac.Constants;
import org.apache.airavata.gfac.GFacException;
import org.apache.airavata.gfac.RequestData;
import org.apache.airavata.gfac.core.context.JobExecutionContext;
import org.apache.airavata.gfac.core.context.MessageContext;
-import org.apache.airavata.gfac.core.utils.GFacUtils;
import org.apache.airavata.gfac.gsissh.security.GSISecurityContext;
import org.apache.airavata.gfac.gsissh.security.TokenizedMyProxyAuthInfo;
import org.apache.airavata.gsi.ssh.api.Cluster;
-import org.apache.airavata.gsi.ssh.api.SSHApiException;
import org.apache.airavata.gsi.ssh.api.ServerInfo;
-import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo;
import org.apache.airavata.gsi.ssh.api.job.JobDescriptor;
import org.apache.airavata.gsi.ssh.api.job.JobManagerConfiguration;
import org.apache.airavata.gsi.ssh.impl.PBSCluster;
-import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo;
import org.apache.airavata.gsi.ssh.util.CommonUtils;
import org.apache.airavata.model.workspace.experiment.ComputationalResourceScheduling;
import org.apache.airavata.model.workspace.experiment.TaskDetails;
-import org.apache.airavata.schemas.gfac.*;
+import org.apache.airavata.schemas.gfac.ApplicationDeploymentDescriptionType;
+import org.apache.airavata.schemas.gfac.FileArrayType;
+import org.apache.airavata.schemas.gfac.GlobusHostType;
+import org.apache.airavata.schemas.gfac.GsisshHostType;
+import org.apache.airavata.schemas.gfac.HpcApplicationDeploymentType;
+import org.apache.airavata.schemas.gfac.SSHHostType;
+import org.apache.airavata.schemas.gfac.StringArrayType;
+import org.apache.airavata.schemas.gfac.URIArrayType;
+import org.apache.airavata.schemas.gfac.UnicoreHostType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-
public class GFACGSISSHUtils {
private final static Logger logger = LoggerFactory.getLogger(GFACGSISSHUtils.class);
[2/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata
Posted by ra...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5398ba79
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5398ba79
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5398ba79
Branch: refs/heads/master
Commit: 5398ba79b14d3e26ae0e9ce2913030ed2cd03b12
Parents: 3bf8e23 aef99c0
Author: raminder <ra...@apache.org>
Authored: Tue Jul 29 17:23:28 2014 -0400
Committer: raminder <ra...@apache.org>
Committed: Tue Jul 29 17:23:28 2014 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 4 +-
.../client/tools/DocumentCreatorNew.java | 2 +-
.../airavata/common/utils/ServerSettings.java | 4 +
.../server/src/main/resources/PBSTemplate.xslt | 5 +
.../main/resources/airavata-server.properties | 2 +-
.../server/src/main/resources/zoo.cfg | 5 +
.../credential/impl/ssh/SSHCredential.java | 2 +
.../server/src/main/assembly/bin-assembly.xml | 1 +
.../airavata/gfac/server/GfacServerHandler.java | 75 ++-
.../gfac/gsissh/util/GFACGSISSHUtils.java | 4 +-
.../gfac/ssh/provider/impl/SSHProvider.java | 2 +-
.../gfac/ssh/security/TokenizedSSHAuthInfo.java | 12 +-
.../airavata/gfac/ssh/util/GFACSSHUtils.java | 4 +-
.../gfac/services/impl/CredentialStoreTest.java | 36 +-
modules/gfac/pom.xml | 1 +
.../integration-tests/tomcat-distribution.iml | 656 -------------------
modules/server/pom.xml | 7 +-
.../org/apache/airavata/server/ServerMain.java | 91 ++-
.../gsi/ssh/api/job/PBSOutputParser.java | 4 +-
.../gsi/ssh/api/job/SlurmOutputParser.java | 2 +-
20 files changed, 183 insertions(+), 736 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/5398ba79/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/util/GFACGSISSHUtils.java
----------------------------------------------------------------------