Repository: airavata Updated Branches: refs/heads/orchestratorJobThrottleFeature [created] eed05a434
http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMICGSSCredentials.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMICGSSCredentials.java b/tools/gsissh/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMICGSSCredentials.java index 24028b6..69c141f 100644 --- a/tools/gsissh/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMICGSSCredentials.java +++ b/tools/gsissh/src/main/java/com/jcraft/jsch/UserAuthGSSAPIWithMICGSSCredentials.java @@ -25,8 +25,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.GSSContextX509; -import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; import org.globus.gsi.gssapi.GSSConstants; import org.ietf.jgss.GSSException; import org.ietf.jgss.Oid; http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java index 070e718..2015964 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/CommandExecutor.java @@ -21,6 +21,8 @@ package org.apache.airavata.gsi.ssh.api; import com.jcraft.jsch.*; +import org.apache.airavata.credential.store.util.AuthenticationInfo; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.api.authentication.*; import org.apache.airavata.gsi.ssh.config.ConfigReader; import org.apache.airavata.gsi.ssh.jsch.ExtendedJSch; http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/AuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/AuthenticationInfo.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/AuthenticationInfo.java deleted file mode 100644 index 84cbae1..0000000 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/AuthenticationInfo.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.apache.airavata.gsi.ssh.api.authentication;/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -/** - * User: AmilaJ ([email protected]) - * Date: 10/4/13 - * Time: 11:25 AM - */ - -/** - * An empty interface that represents authentication data to the API. - */ -public interface AuthenticationInfo { -} http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/GSIAuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/GSIAuthenticationInfo.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/GSIAuthenticationInfo.java deleted file mode 100644 index 3ed81c0..0000000 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/GSIAuthenticationInfo.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.apache.airavata.gsi.ssh.api.authentication;/* - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -import org.ietf.jgss.GSSCredential; - -import java.util.Properties; - -/** - * Authentication data. Could be MyProxy user name, password, could be GSSCredentials - * or could be SSH keys. - */ -public abstract class GSIAuthenticationInfo implements AuthenticationInfo { - - public Properties properties = new Properties(); - - public abstract GSSCredential getCredentials() throws SecurityException; - - public Properties getProperties() { - return properties; - } - - public void setProperties(Properties properties) { - this.properties = properties; - } -} http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHKeyAuthentication.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHKeyAuthentication.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHKeyAuthentication.java index f56cdbf..25582c0 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHKeyAuthentication.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHKeyAuthentication.java @@ -25,6 +25,8 @@ package org.apache.airavata.gsi.ssh.api.authentication;/* * Time: 2:39 PM */ +import org.apache.airavata.credential.store.util.AuthenticationInfo; + /** * Abstracts out common methods for SSH key authentication. */ http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHPasswordAuthentication.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHPasswordAuthentication.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHPasswordAuthentication.java index f9adcdb..57f2d60 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHPasswordAuthentication.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/api/authentication/SSHPasswordAuthentication.java @@ -27,6 +27,8 @@ package org.apache.airavata.gsi.ssh.api.authentication; * Time: 11:22 AM */ +import org.apache.airavata.credential.store.util.AuthenticationInfo; + /** * Password authentication for vanilla SSH. */ http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java index 0572069..11087b9 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/GSISSHAbstractCluster.java @@ -22,6 +22,8 @@ package org.apache.airavata.gsi.ssh.impl; import com.jcraft.jsch.*; +import org.apache.airavata.credential.store.util.AuthenticationInfo; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.api.*; import org.apache.airavata.gsi.ssh.api.authentication.*; import org.apache.airavata.gsi.ssh.api.job.JobDescriptor; http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java index 4efeef1..c015364 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/PBSCluster.java @@ -20,9 +20,8 @@ */ package org.apache.airavata.gsi.ssh.impl; -import com.jcraft.jsch.*; +import org.apache.airavata.credential.store.util.AuthenticationInfo; import org.apache.airavata.gsi.ssh.api.*; -import org.apache.airavata.gsi.ssh.api.authentication.*; import org.apache.airavata.gsi.ssh.api.job.JobManagerConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java index 2679f57..9b84ab7 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/DefaultPasswordAuthenticationInfo.java @@ -27,9 +27,7 @@ package org.apache.airavata.gsi.ssh.impl.authentication; * Time: 12:15 PM */ -import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.api.authentication.SSHPasswordAuthentication; -import org.ietf.jgss.*; /** * An authenticator used for raw SSH sessions. Gives SSH user name, password http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java index b95ae99..784d69c 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/impl/authentication/MyProxyAuthenticationInfo.java @@ -21,7 +21,7 @@ package org.apache.airavata.gsi.ssh.impl.authentication; -import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; import org.globus.myproxy.MyProxy; import org.globus.myproxy.MyProxyException; import org.ietf.jgss.GSSCredential; http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/jsch/ExtendedJSch.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/jsch/ExtendedJSch.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/jsch/ExtendedJSch.java index 047580e..01289ba 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/jsch/ExtendedJSch.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/jsch/ExtendedJSch.java @@ -25,7 +25,7 @@ import com.jcraft.jsch.ExtendedSession; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; import com.jcraft.jsch.Session; -import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; /** * User: AmilaJ ([email protected]) http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java index 20bd042..e101316 100644 --- a/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java +++ b/tools/gsissh/src/main/java/org/apache/airavata/gsi/ssh/util/SSHUtils.java @@ -22,7 +22,7 @@ package org.apache.airavata.gsi.ssh.util; import com.jcraft.jsch.*; -import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.api.SSHApiException; import org.apache.airavata.gsi.ssh.api.ServerInfo; import org.apache.airavata.gsi.ssh.config.ConfigReader; http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java index 747b740..54237e2 100644 --- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java +++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/DefaultSSHApiTestWithMyProxyAuth.java @@ -21,23 +21,14 @@ package org.apache.airavata.gsi.ssh.impl; -import junit.framework.Assert; +import org.apache.airavata.credential.store.util.GSIAuthenticationInfo; import org.apache.airavata.gsi.ssh.api.*; -import org.apache.airavata.gsi.ssh.api.authentication.GSIAuthenticationInfo; -import org.apache.airavata.gsi.ssh.api.job.JobDescriptor; import org.apache.airavata.gsi.ssh.config.ConfigReader; import org.apache.airavata.gsi.ssh.impl.authentication.MyProxyAuthenticationInfo; -import org.apache.airavata.gsi.ssh.util.CommonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testng.AssertJUnit; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; -import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; public class DefaultSSHApiTestWithMyProxyAuth { private static final Logger log = LoggerFactory.getLogger(PBSCluster.class); http://git-wip-us.apache.org/repos/asf/airavata/blob/9a138b54/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java ---------------------------------------------------------------------- diff --git a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java index dfbaef0..4e6aff6 100644 --- a/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java +++ b/tools/gsissh/src/test/java/org/apache/airavata/gsi/ssh/impl/VanilaTestWithSSHAuth.java @@ -21,10 +21,9 @@ package org.apache.airavata.gsi.ssh.impl; +import org.apache.airavata.credential.store.util.AuthenticationInfo; import org.apache.airavata.gsi.ssh.api.*; -import org.apache.airavata.gsi.ssh.api.authentication.AuthenticationInfo; import org.apache.airavata.gsi.ssh.api.job.JobDescriptor; -import org.apache.airavata.gsi.ssh.config.ConfigReader; import org.apache.airavata.gsi.ssh.impl.authentication.DefaultPasswordAuthenticationInfo; import org.apache.airavata.gsi.ssh.impl.authentication.DefaultPublicKeyFileAuthentication; import org.apache.airavata.gsi.ssh.util.CommonUtils;
