You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/10/08 14:32:25 UTC
airavata git commit: creating default domain entry for default gateway
Repository: airavata
Updated Branches:
refs/heads/airavata-gov-registry 21262cdd6 -> 37a3e753f
creating default domain entry for default gateway
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/37a3e753
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/37a3e753
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/37a3e753
Branch: refs/heads/airavata-gov-registry
Commit: 37a3e753fd202a27172c3bf5ca1138cb7b7a6809
Parents: 21262cd
Author: scnakandala <su...@gmail.com>
Authored: Sat Oct 8 10:32:15 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Sat Oct 8 10:32:15 2016 -0400
----------------------------------------------------------------------
dev-tools/ansible/group_vars/all.yml | 4 +-
.../airavata/sharing/registry/DataMigrator.java | 3 +-
.../server/SharingRegistryServerHandler.java | 60 +++++++++++++++++++-
.../SharingRegistryServerHandlerTest.java | 3 +-
4 files changed, 65 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/37a3e753/dev-tools/ansible/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/group_vars/all.yml b/dev-tools/ansible/group_vars/all.yml
index 92a007d..5c9da80 100644
--- a/dev-tools/ansible/group_vars/all.yml
+++ b/dev-tools/ansible/group_vars/all.yml
@@ -14,8 +14,8 @@ deployment_dir: "{{ user_home }}/dev-deployment"
airavata_source_dir: "{{ user_home }}/source"
airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-#git_branch: airavata-gov-registry
-git_branch: develop
+git_branch: airavata-gov-registry
+#git_branch: develop
# Database related variables
db_server: "{{ groups['database'][0] }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/37a3e753/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/DataMigrator.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/DataMigrator.java b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/DataMigrator.java
index 5e747dc..ea23042 100644
--- a/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/DataMigrator.java
+++ b/modules/sharing-registry/sharing-data-migrator/src/main/java/org/apache/airavata/sharing/registry/DataMigrator.java
@@ -20,6 +20,7 @@
*/
package org.apache.airavata.sharing.registry;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.sharing.registry.models.*;
import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler;
import org.apache.thrift.TException;
@@ -36,7 +37,7 @@ import java.util.Map;
public class DataMigrator {
private final static Logger logger = LoggerFactory.getLogger(DataMigrator.class);
- public static void main(String[] args) throws SQLException, ClassNotFoundException, TException {
+ public static void main(String[] args) throws SQLException, ClassNotFoundException, TException, ApplicationSettingsException {
Connection expCatConnection = ConnectionFactory.getInstance().getExpCatConnection();
SharingRegistryServerHandler govRegistryServerHandler = new SharingRegistryServerHandler();
http://git-wip-us.apache.org/repos/asf/airavata/blob/37a3e753/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 e136b47..e86de65 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
@@ -20,6 +20,8 @@
*/
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.*;
@@ -47,7 +49,7 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{
private EntityRepository entityRepository;
private SharingRepository sharingRepository;
- public SharingRegistryServerHandler(){
+ public SharingRegistryServerHandler() throws ApplicationSettingsException, TException {
this.domainRepository = new DomainRepository();
this.userRepository = new UserRepository();
this.userGroupRepository = new UserGroupRepository();
@@ -56,6 +58,62 @@ public class SharingRegistryServerHandler implements GovRegistryService.Iface{
this.permissionTypeRepository = new PermissionTypeRepository();
this.entityRepository = new EntityRepository();
this.sharingRepository = new SharingRepository();
+
+ Domain domain = null;
+ try{
+ domain = getDomain(ServerSettings.getDefaultUserGateway());
+ } finally {
+ if(domain == null){
+ 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);
+ }
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/37a3e753/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java b/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java
index a25d151..0fd4e1d 100644
--- a/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java
+++ b/modules/sharing-registry/sharing-registry-core/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServerHandlerTest.java
@@ -21,6 +21,7 @@
package org.apache.airavata.sharing.registry;
import junit.framework.Assert;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
import org.apache.airavata.sharing.registry.models.*;
import org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler;
import org.apache.thrift.TException;
@@ -36,7 +37,7 @@ public class SharingRegistryServerHandlerTest {
private final static Logger logger = LoggerFactory.getLogger(SharingRegistryServerHandlerTest.class);
@Test
- public void test() throws TException {
+ public void test() throws TException, ApplicationSettingsException {
SharingRegistryServerHandler govRegistryServerHandler = new SharingRegistryServerHandler();
//Creating domain