airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [13/14] airavata git commit: updating some external dependencies
Date Thu, 02 Feb 2017 21:24:05 GMT
updating some external dependencies


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b642ce9d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b642ce9d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b642ce9d

Branch: refs/heads/develop
Commit: b642ce9dad2aeb66890e35d72a8959ab4d6c01f0
Parents: 7aa0e2f
Author: Anuj Bhandar <bhandar.anuj@gmail.com>
Authored: Wed Jan 25 15:34:26 2017 -0500
Committer: Anuj Bhandar <bhandar.anuj@gmail.com>
Committed: Wed Jan 25 15:34:26 2017 -0500

----------------------------------------------------------------------
 .../main/java/org/apache/airavata/MigrationManager.java  |  4 ++--
 .../apache/airavata/UserProfileAiravataThriftClient.java | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/b642ce9d/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
----------------------------------------------------------------------
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 a5161cd..22d770f 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,7 +23,7 @@ package org.apache.airavata;
 
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.model.user.UserProfile;
-import org.apache.airavata.userprofile.crude.cpi.UserProfileCrudeService;
+import org.apache.airavata.userprofile.cpi.UserProfileService;
 import org.apache.thrift.TException;
 import org.wso2.carbon.um.ws.api.stub.ClaimValue;
 import org.wso2.carbon.um.ws.api.stub.RemoteUserStoreManagerServiceStub;
@@ -108,7 +108,7 @@ public class MigrationManager {
     private boolean migrateUserProfilesToAiravata(List<UserProfileDAO> ISProfileList)
throws TException, ApplicationSettingsException {
         System.out.println("Initiating migration to Airavata internal DB ...");
         UserProfileAiravataThriftClient objFactory = new UserProfileAiravataThriftClient();
-        UserProfileCrudeService.Client client = objFactory.getRegistryServiceClient();
+        UserProfileService.Client client = objFactory.getRegistryServiceClient();
         UserProfile airavataUserProfile = new UserProfile();
         // Here are the data associations...
         for(UserProfileDAO ISProfile : ISProfileList){

http://git-wip-us.apache.org/repos/asf/airavata/blob/b642ce9d/modules/user-profile-migration/src/main/java/org/apache/airavata/UserProfileAiravataThriftClient.java
----------------------------------------------------------------------
diff --git a/modules/user-profile-migration/src/main/java/org/apache/airavata/UserProfileAiravataThriftClient.java
b/modules/user-profile-migration/src/main/java/org/apache/airavata/UserProfileAiravataThriftClient.java
index 9e5568f..7785148 100644
--- a/modules/user-profile-migration/src/main/java/org/apache/airavata/UserProfileAiravataThriftClient.java
+++ b/modules/user-profile-migration/src/main/java/org/apache/airavata/UserProfileAiravataThriftClient.java
@@ -23,9 +23,9 @@ package org.apache.airavata;
 
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.registry.api.exception.RegistryServiceException;
-import org.apache.airavata.userprofile.crude.cpi.UserProfileCrudeService;
-import org.apache.airavata.userprofile.crude.cpi.client.UserProfileServiceClientFactory;
+import org.apache.airavata.userprofile.cpi.UserProfileService;
+import org.apache.airavata.userprofile.cpi.exception.UserProfileServiceException;
+import org.apache.airavata.userprofile.cpi.client.UserProfileServiceClientFactory;
 import org.apache.thrift.TException;
 
 import java.util.ArrayList;
@@ -33,12 +33,13 @@ import java.util.List;
 
 public class UserProfileAiravataThriftClient {
 
-    public UserProfileCrudeService.Client getRegistryServiceClient() throws TException, ApplicationSettingsException
{
+    public UserProfileService.Client getRegistryServiceClient() throws TException, ApplicationSettingsException
{
+        // Check the server ports before running migration
         final int serverPort = Integer.parseInt(ServerSettings.getRegistryServerPort());
         final String serverHost = ServerSettings.getRegistryServerHost();
         try {
             return UserProfileServiceClientFactory.createRegistryClient(serverHost, serverPort);
-        } catch (RegistryServiceException e) {
+        } catch (UserProfileServiceException e) {
             throw new TException("Unable to create registry client...", e);
         }
     }


Mime
View raw message