Update AiravataServerHandler to use ProfileServiceClientFactory for UserProfileService
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5af1accd Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5af1accd Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5af1accd Branch: refs/heads/develop Commit: 5af1accd75b1fa6fd9968c5839ce723d3552da6e Parents: cbe1c28 Author: Gourav Shenoy <[email protected]> Authored: Sun Mar 5 18:33:13 2017 -0500 Committer: Gourav Shenoy <[email protected]> Committed: Sun Mar 5 18:33:13 2017 -0500 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 5 +++++ .../api/server/handler/AiravataServerHandler.java | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5af1accd/airavata-api/airavata-api-server/pom.xml ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml index ce94602..1554513 100644 --- a/airavata-api/airavata-api-server/pom.xml +++ b/airavata-api/airavata-api-server/pom.xml @@ -156,6 +156,11 @@ <artifactId>user-profile-stubs</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.airavata</groupId> + <artifactId>profile-service-stubs</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/airavata/blob/5af1accd/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java index 588a61a..e6a0c50 100644 --- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java +++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java @@ -79,13 +79,13 @@ import org.apache.airavata.model.workspace.Project; import org.apache.airavata.registry.api.RegistryService; import org.apache.airavata.registry.api.client.RegistryServiceClientFactory; import org.apache.airavata.registry.api.exception.RegistryServiceException; +import org.apache.airavata.service.profile.client.ProfileServiceClientFactory; +import org.apache.airavata.service.profile.user.cpi.UserProfileService; +import org.apache.airavata.service.profile.user.cpi.exception.UserProfileServiceException; import org.apache.airavata.sharing.registry.client.SharingRegistryServiceClientFactory; import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService; import org.apache.commons.pool.impl.GenericObjectPool; -import org.apache.airavata.userprofile.cpi.UserProfileService; -import org.apache.airavata.userprofile.cpi.client.UserProfileServiceClientFactory; -import org.apache.airavata.userprofile.cpi.exception.UserProfileServiceException; import org.apache.http.auth.AUTH; import org.apache.thrift.TException; import org.slf4j.Logger; @@ -4942,10 +4942,10 @@ public class AiravataServerHandler implements Airavata.Iface { } private UserProfileService.Client getUserProfileServiceClient() throws TException, ApplicationSettingsException { - final int serverPort = Integer.parseInt(ServerSettings.getUserProfileServerPort()); - final String serverHost = ServerSettings.getUserProfileServerHost(); + final int serverPort = Integer.parseInt(ServerSettings.getProfileServiceServerPort()); + final String serverHost = ServerSettings.getProfileServiceServerHost(); try { - return UserProfileServiceClientFactory.createUserProfileServiceClient(serverHost, serverPort); + return ProfileServiceClientFactory.createUserProfileServiceClient(serverHost, serverPort); } catch (UserProfileServiceException e) { throw new TException("Unable to create user profile service client...", e); }
