[airavata] branch develop updated: Create project entities before experiment entities

[machristie]

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 0c4e246  Create project entities before experiment entities
0c4e246 is described below

commit 0c4e24612cb94796f62119534008dde92d337d29
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Thu Jul 19 14:44:06 2018 -0400

    Create project entities before experiment entities
---
 .../registry/migrator/airavata/AiravataDataMigrator.java      | 11 +++++++++++
 1 file changed, 11 insertions(+)

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 2207e31..48c10bc 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
@@ -259,6 +259,17 @@ public class AiravataDataMigrator {
             }
         }
 
+        for (Entity entity : projectEntities) {
+            if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, 
entity.entityId)) {
+                sharingRegistryServerHandler.createEntity(entity);
+            }
+            if (gatewayGroupsMap.containsKey(entity.domainId)) {
+                
shareEntityWithAdminGatewayGroups(sharingRegistryServerHandler, entity, 
gatewayGroupsMap.get(entity.domainId), false);
+            } else {
+                System.out.println("Warning: no Admin gateway groups to share 
project entity " + entity.entityId + " in gateway " + entity.domainId);
+            }
+        }
+
         for (Entity entity : experimentEntities) {
             if (!sharingRegistryServerHandler.isEntityExists(entity.domainId, 
entity.entityId))
                 sharingRegistryServerHandler.createEntity(entity);