You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2017/04/03 16:50:06 UTC
[33/50] airavata git commit: fixing issues in the sharing data
migrator
fixing issues in the sharing data migrator
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f4edced9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f4edced9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f4edced9
Branch: refs/heads/master
Commit: f4edced90812ea8310b60449efdcb9973848bad1
Parents: 3a0b061
Author: scnakandala <su...@gmail.com>
Authored: Thu Mar 23 15:23:18 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Mar 23 15:23:18 2017 -0400
----------------------------------------------------------------------
.../registry/migrator/airavata/AiravataDataMigrator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f4edced9/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
index d11abbf..ece75aa 100644
--- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
+++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/migrator/airavata/AiravataDataMigrator.java
@@ -47,6 +47,7 @@ public class AiravataDataMigrator {
try{
//Creating domain entries
Domain domain = new Domain();
+ domain.setDomainId(rs.getString("GATEWAY_ID"));
domain.setName(rs.getString("GATEWAY_ID"));
domain.setDescription("Domain entry for " + domain.name);
@@ -84,7 +85,7 @@ public class AiravataDataMigrator {
permissionType.setDomainId(domain.domainId);
permissionType.setName("READ");
permissionType.setDescription("Read permission type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isPermissionExists(permissionType.domainId, permissionType.permissionTypeId))
sharingRegistryServerHandler.createPermissionType(permissionType);
permissionType = new PermissionType();
@@ -92,7 +93,7 @@ public class AiravataDataMigrator {
permissionType.setDomainId(domain.domainId);
permissionType.setName("WRITE");
permissionType.setDescription("Write permission type");
- if (!sharingRegistryServerHandler.isEntityTypeExists(entityType.domainId, entityType.entityTypeId))
+ if (!sharingRegistryServerHandler.isPermissionExists(permissionType.domainId, permissionType.permissionTypeId))
sharingRegistryServerHandler.createPermissionType(permissionType);
}catch (Exception ex){
ex.printStackTrace();