From commits-return-19718-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Mon Sep 24 19:05:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5C1D3180649 for ; Mon, 24 Sep 2018 19:05:25 +0200 (CEST) Received: (qmail 91927 invoked by uid 500); 24 Sep 2018 17:05:24 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 91918 invoked by uid 99); 24 Sep 2018 17:05:24 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Sep 2018 17:05:24 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E94C6828E4; Mon, 24 Sep 2018 17:05:23 +0000 (UTC) Date: Mon, 24 Sep 2018 17:05:23 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch develop updated: AIRAVATA-2840 Fix change in API method MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <153780872388.21481.18216271378035606085@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: eb9b63e2738fa97ee4a38b7e81738965f62b9728 X-Git-Newrev: 6e58da8570f9fc594c86c36a365484ad7c4af974 X-Git-Rev: 6e58da8570f9fc594c86c36a365484ad7c4af974 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 6e58da8 AIRAVATA-2840 Fix change in API method 6e58da8 is described below commit 6e58da8570f9fc594c86c36a365484ad7c4af974 Author: Marcus Christie AuthorDate: Mon Sep 24 13:04:55 2018 -0400 AIRAVATA-2840 Fix change in API method --- .../src/main/java/org/apache/airavata/MigrationManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java b/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java index 378da0a..422a290 100644 --- a/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java +++ b/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java @@ -23,8 +23,6 @@ import org.apache.airavata.api.Airavata; import org.apache.airavata.api.client.AiravataClientFactory; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.Constants; -import org.apache.airavata.credential.store.client.CredentialStoreClientFactory; -import org.apache.airavata.credential.store.cpi.CredentialStoreService; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; import org.apache.airavata.model.credential.store.PasswordCredential; import org.apache.airavata.model.error.AiravataClientException; @@ -281,7 +279,7 @@ public class MigrationManager { keycloakIdentityServerClient.setUserPassword(gatewayId, this.gatewayAdminUsername, this.wso2ISAdminPassword); // Create password credential for admin username and password - String passwordToken = airavataClient.registerPwdCredential(authzToken, gatewayId, this.gatewayAdminUsername, this.gatewayAdminUsername, this.wso2ISAdminPassword, "Keycloak admin password for realm " + gatewayId); + String passwordToken = airavataClient.registerPwdCredential(authzToken, this.gatewayAdminUsername, this.wso2ISAdminPassword, "Keycloak admin password for realm " + gatewayId); // Update gateway resource profile with tenant id (gatewayId) and admin user password token GatewayResourceProfile gatewayResourceProfile = airavataClient.getGatewayResourceProfile(authzToken, gatewayId);