Repository: airavata Updated Branches: refs/heads/master d2814f66f -> 0364b6540
reverting commented SSHSecurityContext code Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0364b654 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0364b654 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0364b654 Branch: refs/heads/master Commit: 0364b6540512f295a123532520c5444c560bc9b2 Parents: d2814f6 Author: Saminda Wijeratne <[email protected]> Authored: Wed Apr 23 12:05:40 2014 -0700 Committer: Saminda Wijeratne <[email protected]> Committed: Wed Apr 23 12:05:40 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/airavata/gfac/cpi/GFacImpl.java | 9 +++++---- .../apache/airavata/gfac/provider/impl/GSISSHProvider.java | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0364b654/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java index 4530d37..064c9ba 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/cpi/GFacImpl.java @@ -51,6 +51,7 @@ import org.apache.airavata.gfac.notification.listeners.WorkflowTrackingListener; import org.apache.airavata.gfac.provider.GFacProvider; import org.apache.airavata.gfac.scheduler.HostScheduler; import org.apache.airavata.gfac.utils.GFacUtils; +import org.apache.airavata.gfac.context.security.SSHSecurityContext; import org.apache.airavata.gsi.ssh.api.Cluster; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.api.ServerInfo; @@ -456,7 +457,7 @@ public class GFacImpl implements GFac, AbstractActivityListener { String sshPrivateKeyPass = configurationProperties.getProperty(Constants.SSH_PRIVATE_KEY_PASS); String sshPassword = configurationProperties.getProperty(Constants.SSH_PASSWORD); String sshPublicKey = configurationProperties.getProperty(Constants.SSH_PUBLIC_KEY); -// SSHSecurityContext sshSecurityContext = new SSHSecurityContext(); + SSHSecurityContext sshSecurityContext = new SSHSecurityContext(); AuthenticationInfo authenticationInfo = null; // we give higher preference to the password over keypair ssh authentication if (sshPassword != null) { @@ -478,9 +479,9 @@ public class GFacImpl implements GFac, AbstractActivityListener { } catch (SSHApiException e) { e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. } -// sshSecurityContext.setPbsCluster(pbsCluster); -// sshSecurityContext.setUsername(sshUserName); -// jobExecutionContext.addSecurityContext(SSHSecurityContext.SSH_SECURITY_CONTEXT, sshSecurityContext); + sshSecurityContext.setPbsCluster(pbsCluster); + sshSecurityContext.setUsername(sshUserName); + jobExecutionContext.addSecurityContext(SSHSecurityContext.SSH_SECURITY_CONTEXT, sshSecurityContext); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/0364b654/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java index 4da1bcb..69ad519 100644 --- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java +++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/provider/impl/GSISSHProvider.java @@ -25,6 +25,7 @@ import java.util.Map; import org.apache.airavata.gfac.GFacException; import org.apache.airavata.gfac.context.JobExecutionContext; import org.apache.airavata.gfac.context.security.GSISecurityContext; +import org.apache.airavata.gfac.context.security.SSHSecurityContext; import org.apache.airavata.gfac.notification.events.StartExecutionEvent; import org.apache.airavata.gfac.provider.GFacProviderException; import org.apache.airavata.gfac.utils.GFacUtils; @@ -65,7 +66,7 @@ public class GSISSHProvider extends AbstractProvider{ if (jobExecutionContext.getSecurityContext(GSISecurityContext.GSI_SECURITY_CONTEXT) != null) { cluster = ((GSISecurityContext) jobExecutionContext.getSecurityContext(GSISecurityContext.GSI_SECURITY_CONTEXT)).getPbsCluster(); } else { -// cluster = ((SSHSecurityContext) jobExecutionContext.getSecurityContext(SSHSecurityContext.SSH_SECURITY_CONTEXT)).getPbsCluster(); + cluster = ((SSHSecurityContext) jobExecutionContext.getSecurityContext(SSHSecurityContext.SSH_SECURITY_CONTEXT)).getPbsCluster(); } if (cluster == null) { throw new GFacProviderException("Security context is not set properly");
