This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/develop by this push:
new 9935b6b Fix compile error
new be02824 Merge branch 'credential-store-get-summaries' into develop
9935b6b is described below
commit 9935b6bdb2b8f7133437cd494f9599d4a154b44d
Author: Marcus Christie <[email protected]>
AuthorDate: Wed Oct 25 16:06:20 2017 -0400
Fix compile error
---
.../credential/store/server/CredentialStoreServerHandler.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index e79da04..fbdbc80 100644
---
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -27,7 +27,6 @@ import
org.apache.airavata.credential.store.cpi.credential_store_cpiConstants;
import org.apache.airavata.credential.store.credential.CommunityUser;
import org.apache.airavata.credential.store.credential.Credential;
import org.apache.airavata.credential.store.credential.CredentialOwnerType;
-import org.apache.airavata.credential.store.credential.impl.password.*;
import org.apache.airavata.credential.store.store.CredentialStoreException;
import
org.apache.airavata.credential.store.store.impl.CertificateCredentialWriter;
import org.apache.airavata.credential.store.store.impl.CredentialReaderImpl;
@@ -36,7 +35,6 @@ import
org.apache.airavata.credential.store.store.impl.util.CredentialStoreInitU
import org.apache.airavata.credential.store.util.TokenGenerator;
import org.apache.airavata.credential.store.util.Utility;
import org.apache.airavata.model.credential.store.*;
-import org.apache.airavata.model.credential.store.PasswordCredential;
import org.apache.commons.codec.binary.Base64;
import org.apache.thrift.TException;
import org.slf4j.Logger;
@@ -166,7 +164,8 @@ public class CredentialStoreServerHandler implements
CredentialStoreService.Ifac
try {
Credential credential = credentialReader.getCredential(gatewayId,
tokenId);
if (credential instanceof
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential
- !(credential instanceof
org.apache.airavata.credential.store.credential.impl.password.PasswordCredential))
{
+ && !(credential instanceof
org.apache.airavata.credential.store.credential.impl.password
+ .PasswordCredential)) {
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential
credential1 =
(org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential)
credential;
SSHCredential sshCredential = new SSHCredential();
sshCredential.setUsername(credential1.getPortalUserName());
@@ -196,7 +195,8 @@ public class CredentialStoreServerHandler implements
CredentialStoreService.Ifac
if(type.equals(SummaryType.SSH)){
Credential credential =
credentialReader.getCredential(gatewayId, tokenId);
if (credential instanceof
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential
- !(credential instanceof
org.apache.airavata.credential.store.credential.impl.password.PasswordCredential))
{
+ && !(credential instanceof
org.apache.airavata.credential.store.credential.impl.password
+ .PasswordCredential)) {
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential
credential1 =
(org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential)
credential;
CredentialSummary sshCredentialSummary = new
CredentialSummary();
sshCredentialSummary.setType(SummaryType.SSH);
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
