Repository: airavata Updated Branches: refs/heads/develop 2c81c1ed5 -> a8b15d86c
fixing wrong constant value Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a8b15d86 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a8b15d86 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a8b15d86 Branch: refs/heads/develop Commit: a8b15d86cb637ef120d88c47369e3230767893ac Parents: 2c81c1e Author: scnakandala <[email protected]> Authored: Mon Oct 10 01:40:40 2016 -0400 Committer: scnakandala <[email protected]> Committed: Mon Oct 10 01:40:40 2016 -0400 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 2 +- .../server/SharingRegistryServerHandler.java | 110 ++++++++++--------- 2 files changed, 57 insertions(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/a8b15d86/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 7ae3888..0d0b8b8 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 @@ -3664,7 +3664,7 @@ public class AiravataServerHandler implements Airavata.Iface { Arrays.asList(userPermission.getKey()), authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":" + "WRITE", true); else sharingRegistryServerHandler.shareEntityWithUsers(resourceId, - Arrays.asList(userPermission.getKey()), authzToken.getClaimsMap().get("GatewatId") + ":" + "READ", true); + Arrays.asList(userPermission.getKey()), authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":" + "READ", true); } return true; } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/airavata/blob/a8b15d86/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index 7909d07..9b299f0 100644 --- a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -21,10 +21,12 @@ package org.apache.airavata.sharing.registry.server; import org.apache.airavata.common.exception.ApplicationSettingsException; +import org.apache.airavata.common.utils.ServerSettings; import org.apache.airavata.sharing.registry.db.entities.GroupMembershipEntityPK; import org.apache.airavata.sharing.registry.db.entities.SharingEntityPK; import org.apache.airavata.sharing.registry.db.repositories.*; import org.apache.airavata.sharing.registry.db.utils.DBConstants; +import org.apache.airavata.sharing.registry.db.utils.JPAUtils; import org.apache.airavata.sharing.registry.models.*; import org.apache.airavata.sharing.registry.service.cpi.GovRegistryService; import org.apache.thrift.TException; @@ -49,8 +51,8 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{ private SharingRepository sharingRepository; public SharingRegistryServerHandler() throws ApplicationSettingsException, TException { -// JPAUtils.initializeDB(); -// + JPAUtils.initializeDB(); + this.domainRepository = new DomainRepository(); this.userRepository = new UserRepository(); this.userGroupRepository = new UserGroupRepository(); @@ -59,58 +61,58 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{ this.permissionTypeRepository = new PermissionTypeRepository(); this.entityRepository = new EntityRepository(); this.sharingRepository = new SharingRepository(); -// -// if(!domainRepository.isExists(ServerSettings.getDefaultUserGateway())){ -// Domain domain = new Domain(); -// domain.setDomainId(ServerSettings.getDefaultUserGateway()); -// domain.setName(ServerSettings.getDefaultUserGateway()); -// domain.setDescription("Domain entry for " + domain.name); -// createDomain(domain); -// -// User user = new User(); -// user.setDomainId(domain.domainId); -// user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway()); -// user.setUserName(ServerSettings.getDefaultUser()); -// createUser(user); -// -// //Creating Entity Types for each domain -// EntityType entityType = new EntityType(); -// entityType.setEntityTypeId(domain.domainId+":PROJECT"); -// entityType.setDomainId(domain.domainId); -// entityType.setName("PROJECT"); -// entityType.setDescription("Project entity type"); -// createEntityType(entityType); -// -// entityType = new EntityType(); -// entityType.setEntityTypeId(domain.domainId+":EXPERIMENT"); -// entityType.setDomainId(domain.domainId); -// entityType.setName("EXPERIMENT"); -// entityType.setDescription("Experiment entity type"); -// createEntityType(entityType); -// -// entityType = new EntityType(); -// entityType.setEntityTypeId(domain.domainId+":FILE"); -// entityType.setDomainId(domain.domainId); -// entityType.setName("FILE"); -// entityType.setDescription("File entity type"); -// createEntityType(entityType); -// -// //Creating Permission Types for each domain -// PermissionType permissionType = new PermissionType(); -// permissionType.setPermissionTypeId(domain.domainId+":READ"); -// permissionType.setDomainId(domain.domainId); -// permissionType.setName("READ"); -// permissionType.setDescription("Read permission type"); -// createPermissionType(permissionType); -// -// permissionType = new PermissionType(); -// permissionType.setPermissionTypeId(domain.domainId+":WRITE"); -// permissionType.setDomainId(domain.domainId); -// permissionType.setName("WRITE"); -// permissionType.setDescription("Write permission type"); -// createPermissionType(permissionType); -// -// } + + if(!domainRepository.isExists(ServerSettings.getDefaultUserGateway())){ + Domain domain = new Domain(); + domain.setDomainId(ServerSettings.getDefaultUserGateway()); + domain.setName(ServerSettings.getDefaultUserGateway()); + domain.setDescription("Domain entry for " + domain.name); + createDomain(domain); + + User user = new User(); + user.setDomainId(domain.domainId); + user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway()); + user.setUserName(ServerSettings.getDefaultUser()); + createUser(user); + + //Creating Entity Types for each domain + EntityType entityType = new EntityType(); + entityType.setEntityTypeId(domain.domainId+":PROJECT"); + entityType.setDomainId(domain.domainId); + entityType.setName("PROJECT"); + entityType.setDescription("Project entity type"); + createEntityType(entityType); + + entityType = new EntityType(); + entityType.setEntityTypeId(domain.domainId+":EXPERIMENT"); + entityType.setDomainId(domain.domainId); + entityType.setName("EXPERIMENT"); + entityType.setDescription("Experiment entity type"); + createEntityType(entityType); + + entityType = new EntityType(); + entityType.setEntityTypeId(domain.domainId+":FILE"); + entityType.setDomainId(domain.domainId); + entityType.setName("FILE"); + entityType.setDescription("File entity type"); + createEntityType(entityType); + + //Creating Permission Types for each domain + PermissionType permissionType = new PermissionType(); + permissionType.setPermissionTypeId(domain.domainId+":READ"); + permissionType.setDomainId(domain.domainId); + permissionType.setName("READ"); + permissionType.setDescription("Read permission type"); + createPermissionType(permissionType); + + permissionType = new PermissionType(); + permissionType.setPermissionTypeId(domain.domainId+":WRITE"); + permissionType.setDomainId(domain.domainId); + permissionType.setName("WRITE"); + permissionType.setDescription("Write permission type"); + createPermissionType(permissionType); + + } } /**
