[28/51] [abbrv] airavata git commit: implementing sharing server

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/thrift_models/sharing_cpi.thrift
--
diff --git a/modules/sharing-registry/thrift_models/sharing_cpi.thrift 
b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
index 02a7768..f3a91dc 100644
--- a/modules/sharing-registry/thrift_models/sharing_cpi.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
@@ -22,7 +22,7 @@ namespace java 
org.apache.airavata.sharing.registry.service.cpi
 
 include "./sharing_models.thrift"
 
-service GovRegistryService {
+service SharingRegistryService {
 
 /**
  * Domain Operations

[36/51] [abbrv] airavata git commit: owner permission is not revokable or assignable

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/4bb7c6de/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
index b9840f6..598d80f 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
@@ -153,18 +153,19 @@ public class SharingRegistryService {
  *  * Sharing Entity with Users and Groups
  * *
  * 
+ * @param domainId
  * @param entityId
  * @param userList
  * @param perssionTypeId
  * @param cascadePermission
  */
-public boolean shareEntityWithUsers(String entityId, List 
userList, String perssionTypeId, boolean cascadePermission) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean shareEntityWithUsers(String domainId, String entityId, 
List userList, String perssionTypeId, boolean cascadePermission) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean revokeEntitySharingFromUsers(String entityId, List 
userList, String perssionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean revokeEntitySharingFromUsers(String domainId, String 
entityId, List userList, String perssionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean shareEntityWithGroups(String entityId, List 
groupList, String perssionTypeId, boolean cascadePermission) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean shareEntityWithGroups(String domainId, String entityId, 
List groupList, String perssionTypeId, boolean cascadePermission) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean revokeEntitySharingFromGroups(String entityId, List 
groupList, String perssionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean revokeEntitySharingFromGroups(String domainId, String 
entityId, List groupList, String perssionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 public boolean userHasAccess(String domainId, String userId, String 
entityId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
@@ -246,13 +247,13 @@ public class SharingRegistryService {
 
 public void getPermissionTypes(String domain, int offset, int limit, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-public void shareEntityWithUsers(String entityId, List userList, 
String perssionTypeId, boolean cascadePermission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void shareEntityWithUsers(String domainId, String entityId, 
List userList, String perssionTypeId, boolean cascadePermission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-public void revokeEntitySharingFromUsers(String entityId, List 
userList, String perssionTypeId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+public void revokeEntitySharingFromUsers(String domainId, String entityId, 
List userList, String perssionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-public void shareEntityWithGroups(String entityId, List groupList, 
String perssionTypeId, boolean cascadePermission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void shareEntityWithGroups(String domainId, String entityId, 
List groupList, String perssionTypeId, boolean cascadePermission, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-public void revokeEntitySharingFromGroups(String entityId, List 
groupList, String perssionTypeId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws 

[50/51] [abbrv] airavata git commit: fixing id issues

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/b6e07d7b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
index e444c43..00dd367 100644
--- 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/DBConstants.java
@@ -29,72 +29,75 @@ public class DBConstants {
 public static int SELECT_MAX_ROWS = 1000;
 
 public static class DomainTable {
-public static String DOMAIN_ID = "domainId";
-public static String NAME = "name";
-public static String DESCRIPTION = "description";
+public static final String DOMAIN_ID = "domainId";
+public static final String NAME = "name";
+public static final String DESCRIPTION = "description";
 public static final String CREATED_TIME = "createdTime";
 public static final String UPDATED_TIME = "updatedTime";
 }
 
 public static class UserTable {
-public static String USER_ID = "userId";
-public static String DOMAIN_ID = "domainId";
-public static String USER_NAME = "userName";
+public static final String USER_ID = "userId";
+public static final String DOMAIN_ID = "domainId";
+public static final String USER_NAME = "userName";
 public static final String CREATED_TIME = "createdTime";
 public static final String UPDATED_TIME = "updatedTime";
 }
 
 public static class UserGroupTable {
-public static String GROUP_ID = "groupId";
-public static String DOMAIN_ID = "domainId";
-public static String NAME = "name";
-public static String DESCRIPTION = "description";
-public static String OWNER_ID = "ownerId";
-public static String GROUP_TYPE = "groupType";
-public static String GROUP_CARDINALITY = "groupCardinality";
+public static final String GROUP_ID = "groupId";
+public static final String DOMAIN_ID = "domainId";
+public static final String NAME = "name";
+public static final String DESCRIPTION = "description";
+public static final String OWNER_ID = "ownerId";
+public static final String GROUP_TYPE = "groupType";
+public static final String GROUP_CARDINALITY = "groupCardinality";
 public static final String CREATED_TIME = "createdTime";
 public static final String UPDATED_TIME = "updatedTime";
 }
 
 public static class GroupMembershipTable {
-public static String PARENT_ID = "parentId";
-public static String CHILD_ID = "childId";
-public static String CHILD_TYPE = "childType";
+public static final String PARENT_ID = "parentId";
+public static final String CHILD_ID = "childId";
+public static final String CHILD_TYPE = "childType";
+public static final String DOMAIN_ID = "domainId";
 public static final String CREATED_TIME = "createdTime";
 public static final String UPDATED_TIME = "updatedTime";
 }
 
 public static class EntityTypeTable {
-public static String ENTITY_TYPE_ID = "entityTypeId";
-public static String DOMAIN_ID = "domainId";
+public static final String ENTITY_TYPE_ID = "entityTypeId";
+public static final String DOMAIN_ID = "domainId";
 public static final String CREATED_TIME = "createdTime";
 public static final String UPDATED_TIME = "updatedTime";
 }
 
 public static class PermissionTypeTable {
-public static String ENTITY_TYPE_ID = "permissionTypeId";
-public static String DOMAIN_ID = "domainId";
-public static String NAME = "name";
+public static final String ENTITY_TYPE_ID = "permissionTypeId";
+public static final String DOMAIN_ID = "domainId";
+public static final String NAME = "name";
 public static final String CREATED_TIME = "createdTime";
 public static final String UPDATED_TIME = "updatedTime";
 }
 
 public static class EntityTable {
-public static String ENTITY_ID = "entityId";
-public static String PARENT_ENTITY_ID = "parentEntityId";
-public static String ENTITY_TYPE_ID = "entityTypeId";
-public static String NAME = "name";
-public static String DESCRIPTION = "description";
-public static String FULL_TEXT = "fullText";
+public static final String ENTITY_ID = "entityId";
+public static final String 

[07/51] [abbrv] airavata git commit: Correcting the create table query which was failing during build

[scnakandala]

Correcting the create table query which was failing during build


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cc749602
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cc749602
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cc749602

Branch: refs/heads/airavata-gov-registry
Commit: cc7496024032fc8d0f8e8b4bba3b932cb11d674f
Parents: c31cfa6
Author: Anuj Bhandar 
Authored: Wed Oct 12 11:30:31 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 11:32:57 2016 -0400

--
 .../credential/store/store/impl/db/CredentialsDAOTest.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/cc749602/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAOTest.java
--
diff --git 
a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAOTest.java
 
b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAOTest.java
index c175454..1750adc 100644
--- 
a/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAOTest.java
+++ 
b/modules/credential-store/credential-store-service/src/test/java/org/apache/airavata/credential/store/store/impl/db/CredentialsDAOTest.java
@@ -72,13 +72,14 @@ public class CredentialsDAOTest extends DatabaseTestCases {
  * "REQUESTED_TIME TIMESTAMP DEFAULT '-00-00 00:00:00',\n" 
+
  * "PRIMARY KEY (GATEWAY_NAME, COMMUNITY_USER_NAME)\n" + ")";
  */
-
+// Adding description field as per pull request 
https://github.com/apache/airavata/pull/54
 String createTable = "CREATE TABLE CREDENTIALS\n" + "(\n"
 + "GATEWAY_ID VARCHAR(256) NOT NULL,\n"
 + "TOKEN_ID VARCHAR(256) NOT NULL,\n"
 + // Actual token used to identify the credential
 "CREDENTIAL BLOB NOT NULL,\n" + "
PORTAL_USER_ID VARCHAR(256) NOT NULL,\n"
 + "TIME_PERSISTED TIMESTAMP DEFAULT 
CURRENT_TIMESTAMP,\n"
++ "DESCRIPTION VARCHAR(500),\n"
 + "PRIMARY KEY (GATEWAY_ID, TOKEN_ID)\n" + ")";
 
 String dropTable = "drop table CREDENTIALS";

[01/51] [abbrv] airavata git commit: Adding SSHCredentialSummary model & adding desc field to SSHCredential [Forced Update!]

[scnakandala]

Repository: airavata
Updated Branches:
  refs/heads/airavata-gov-registry 146ccc774 -> b6e07d7ba (forced update)


http://git-wip-us.apache.org/repos/asf/airavata/blob/5aa40b8a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java
--
diff --git 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java
 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java
index 3e9de8d..b7ba8b4 100644
--- 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java
+++ 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/datamodel/SSHCredential.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-08-09")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-10")
 public class SSHCredential implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("SSHCredential");
 
@@ -61,6 +61,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase schemes = 
new HashMap();
   static {
@@ -75,6 +76,7 @@ public class SSHCredential implements 
org.apache.thrift.TBase byName = new HashMap();
 
@@ -113,6 +116,8 @@ public class SSHCredential implements 
org.apache.thrift.TBase 
metaDataMap;
   static {
 Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -173,6 +178,8 @@ public class SSHCredential implements 
org.apache.thrift.TBase

[05/51] [abbrv] airavata git commit: removing add and delete method for SSHCredentialSummary, serverhandler implemented got get method

[scnakandala]

removing add and delete method for SSHCredentialSummary, serverhandler 
implemented got get method


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/077fd2c8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/077fd2c8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/077fd2c8

Branch: refs/heads/airavata-gov-registry
Commit: 077fd2c81d7b443f040e1ff0fb8af24b9c9b5f8a
Parents: 157efab
Author: Anuj Bhandar 
Authored: Mon Oct 10 16:34:38 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 11:30:42 2016 -0400

--
 .../impl/ssh/SSHCredentialSummary.java  |  101 -
 .../server/CredentialStoreServerHandler.java|   25 +
 .../store/cpi/CredentialStoreService.java   | 4216 +-
 3 files changed, 1110 insertions(+), 3232 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/077fd2c8/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialSummary.java
--
diff --git 
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialSummary.java
 
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialSummary.java
deleted file mode 100644
index f838eaa..000
--- 
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/credential/impl/ssh/SSHCredentialSummary.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.credential.store.credential.impl.ssh;
-
-import org.apache.airavata.credential.store.credential.Credential;
-
-import java.io.Serializable;
-
-/**
- * An SSH Credential Summary class which is an extension of Airavata Credential
- */
-public class SSHCredentialSummary extends Credential implements Serializable {
-
-/**
-*
-*/
-   private static final long serialVersionUID = 1235236447420198981L;
-
-private byte[] publicKey;
-private String gateway;
-private String username;
-private String token;
-private String description;
-
-@Override
-public String getToken() {
-return token;
-}
-
-@Override
-public void setToken(String token) {
-this.token = token;
-}
-
-
-
-public String getUsername() {
-return username;
-}
-
-public void setUsername(String username) {
-this.username = username;
-}
-
-public String getDescription() {
-return description;
-}
-
-public void setDescription(String description) {
-this.description = description;
-}
-
-
-public SSHCredentialSummary() {
-}
-
-public SSHCredentialSummary(byte[] publicKey, String token, String 
gateway, String username) {
-this.publicKey = publicKey;
-this.gateway = gateway;
-this.username = username;
-this.token = token;
-this.setPortalUserName(username);
-}
-
-
-public byte[] getPublicKey() {
-return publicKey;
-}
-
-public void setPublicKey(byte[] pubKey) {
-this.publicKey = pubKey;
-}
-
-   public String getGateway() {
-   return gateway;
-   }
-
-   public void setGateway(String gateway) {
-   this.gateway = gateway;
-   }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/077fd2c8/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
--
diff --git 
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
 

[45/51] [abbrv] airavata git commit: adding initial how to use documents

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/61a0fc95/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
index 7605f82..25ab01a 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
@@ -42,16 +42,16 @@ public class SharingRegistryService {
 /**
  * API method to create a new domain
  * 
- * @param domainId
+ * @param domain
  */
-public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to update a domain
  * 
- * @param domainId
+ * @param domain
  */
-public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to delete domain
@@ -387,9 +387,9 @@ public class SharingRegistryService {
 
   public interface AsyncIface {
 
-public void 
createDomain(org.apache.airavata.sharing.registry.models.Domain domainId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-public void 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domainId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
 public void deleteDomain(String domainId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -495,16 +495,16 @@ public class SharingRegistryService {
   super(iprot, oprot);
 }
 
-public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
 {
-  send_createDomain(domainId);
+  send_createDomain(domain);
   return recv_createDomain();
 }
 
-public void 
send_createDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.thrift.TException
+public void 
send_createDomain(org.apache.airavata.sharing.registry.models.Domain domain) 
throws org.apache.thrift.TException
 {
   createDomain_args args = new createDomain_args();
-  args.setDomainId(domainId);
+  args.setDomain(domain);
   sendBase("createDomain", args);
 }
 
@@ -521,16 +521,16 @@ public class SharingRegistryService {
   throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "createDomain failed: unknown result");
 }
 
-public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
 {
-  send_updateDomain(domainId);
+  send_updateDomain(domain);
   return recv_updateDomain();
 }
 
-public void 
send_updateDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.thrift.TException
+public void 

[18/51] [abbrv] airavata git commit: adding search criteria as a new struct

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
index e041fd5..c355c7e 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
@@ -6,13 +6,13 @@
  */
 package org.apache.airavata.sharing.registry.service.cpi;
 
-import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.thrift.scheme.IScheme;
 import org.apache.thrift.scheme.SchemeFactory;
 import org.apache.thrift.scheme.StandardScheme;
 
 import org.apache.thrift.scheme.TupleScheme;
 import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
 import org.apache.thrift.async.AsyncMethodCallback;
@@ -22,15 +22,19 @@ import java.util.ArrayList;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.EnumSet;
 import java.util.Collections;
 import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
 import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-06")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-12")
 public class GovRegistryService {
 
   public interface Iface {
@@ -41,15 +45,15 @@ public class GovRegistryService {
  * 
  * @param domain
  */
-public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
SharingRegistryException, org.apache.thrift.TException;
+public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
SharingRegistryException, org.apache.thrift.TException;
+public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean deleteDomain(String domainId) throws 
SharingRegistryException, org.apache.thrift.TException;
+public boolean deleteDomain(String domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws SharingRegistryException, org.apache.thrift.TException;
+public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public List 
getDomains(int offset, int limit) throws SharingRegistryException, 
org.apache.thrift.TException;
+public List 
getDomains(int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  *  * User Operations
@@ -57,15 +61,15 @@ public class GovRegistryService {
  * 
  * @param user
  */
-public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws SharingRegistryException, org.apache.thrift.TException;
+public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
SharingRegistryException, org.apache.thrift.TException;
+public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean deleteUser(String userId) throws SharingRegistryException, 
org.apache.thrift.TException;
+public boolean deleteUser(String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public 

[14/51] [abbrv] airavata git commit: Code cleanup

[scnakandala]

Code cleanup


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1b91dd1c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1b91dd1c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1b91dd1c

Branch: refs/heads/airavata-gov-registry
Commit: 1b91dd1ce35f2ed37ad93b9762fe227aa72ae913
Parents: 8f91bde
Author: Ajinkya Dhamnaskar 
Authored: Wed Oct 12 13:47:00 2016 -0400
Committer: Ajinkya Dhamnaskar 
Committed: Wed Oct 12 13:47:00 2016 -0400

--
 .../main/java/org/apache/airavata/gfac/impl/HTTPUtils.java| 7 +++
 .../orchestrator/cpi/impl/SimpleOrchestratorImpl.java | 6 ++
 2 files changed, 9 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/1b91dd1c/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
--
diff --git 
a/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
 
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
new file mode 100644
index 000..cbf5adc
--- /dev/null
+++ 
b/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/HTTPUtils.java
@@ -0,0 +1,7 @@
+package org.apache.airavata.gfac.impl;
+
+/**
+ * Created by Ajinkya on 10/10/16.
+ */
+public class HTTPUtils {
+}

http://git-wip-us.apache.org/repos/asf/airavata/blob/1b91dd1c/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
--
diff --git 
a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
 
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
index b14b5cd..dec9b2c 100644
--- 
a/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
+++ 
b/modules/orchestrator/orchestrator-core/src/main/java/org/apache/airavata/orchestrator/cpi/impl/SimpleOrchestratorImpl.java
@@ -406,15 +406,13 @@ public class SimpleOrchestratorImpl extends 
AbstractOrchestrator{
 DataType type = processOutput.getType();
 switch (type) {
 case STDOUT :
-if(null == processOutput.getValue() ||
-(null != processOutput.getValue() && 
processOutput.getValue().trim().isEmpty())){
+if(null == processOutput.getValue() || 
processOutput.getValue().trim().isEmpty()){
 processOutput.setValue(appName + ".stdout");
 }
 createOutputDataSatagingTasks(processModel, gatewayId, 
dataStagingTaskIds, processOutput);
 break;
 case STDERR:
-if(null == processOutput.getValue() ||
-(null != processOutput.getValue() && 
processOutput.getValue().trim().isEmpty())){
+if(null == processOutput.getValue() || 
processOutput.getValue().trim().isEmpty()){
 processOutput.setValue(appName + ".stderr");
 }
 createOutputDataSatagingTasks(processModel, gatewayId, 
dataStagingTaskIds, processOutput);

[42/51] [abbrv] airavata git commit: adding docs

[scnakandala]

adding docs


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/87564d2b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/87564d2b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/87564d2b

Branch: refs/heads/airavata-gov-registry
Commit: 87564d2be2c0a118213443e2938df511cef356f9
Parents: d521922
Author: scnakandala 
Authored: Fri Oct 14 17:26:41 2016 -0400
Committer: scnakandala 
Committed: Fri Oct 14 17:26:41 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   | 8 +-
 modules/sharing-registry/api-docs/index.html|10 +-
 .../sharing-registry/api-docs/sharing_cpi.html  |   174 +-
 .../api-docs/sharing_models.html|   160 +-
 .../migrator/airavata/AiravataDataMigrator.java | 6 +-
 .../registry/db/entities/SharingUserEntity.java |11 +
 .../registry/db/entities/UserGroupEntity.java   |11 +
 .../db/repositories/UserGroupRepository.java| 4 +-
 .../sharing/registry/db/utils/DBConstants.java  | 1 +
 .../server/SharingRegistryServerHandler.java|57 +-
 .../main/resources/sharing-registry-derby.sql   | 2 +
 .../main/resources/sharing-registry-mysql.sql   | 2 +
 .../SharingRegistryServerHandlerTest.java   |26 +-
 .../sharing/registry/models/Domain.java |13 +-
 .../sharing/registry/models/Entity.java |22 +-
 .../registry/models/EntitySearchField.java  |10 +
 .../sharing/registry/models/EntityType.java |12 +-
 .../sharing/registry/models/GroupChildType.java | 4 +
 .../registry/models/GroupMembership.java| 6 +-
 .../sharing/registry/models/GroupType.java  |12 +-
 .../sharing/registry/models/PermissionType.java |12 +-
 .../registry/models/SearchCondition.java|18 +-
 .../sharing/registry/models/SearchCriteria.java | 9 +-
 .../sharing/registry/models/Sharing.java| 6 +-
 .../models/SharingRegistryException.java| 6 +-
 .../sharing/registry/models/SharingType.java| 4 +
 .../airavata/sharing/registry/models/User.java  |   168 +-
 .../sharing/registry/models/UserGroup.java  |   394 +-
 .../service/cpi/SharingRegistryService.java | 10311 ++---
 .../thrift_models/sharing_cpi.thrift|   226 +-
 .../thrift_models/sharing_models.thrift |   183 +-
 .../thrift_models/thrift-gen.sh | 1 -
 32 files changed, 7065 insertions(+), 4824 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/87564d2b/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 45ddc3f..7690ca2 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
@@ -123,7 +123,7 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 user.setDomainId(domain.domainId);
 
user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway());
 user.setUserName(ServerSettings.getDefaultUser());
-sharingRegistryServerHandler.createUser(user);
+sharingRegistryServerHandler.registerUser(user);
 
 //Creating Entity Types for each domain
 EntityType entityType = new EntityType();
@@ -671,7 +671,7 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 entity.setName(project.getName());
 entity.setDescription(project.getDescription());
 
-sharingRegistryServerHandler.createEntity(entity);
+sharingRegistryServerHandler.registerEntity(entity);
 }
 
 logger.debug("Airavata created project with project Id : " + 
projectId + " for gateway Id : " + gatewayId);
@@ -1046,7 +1046,7 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 entity.setName(experiment.getExperimentName());
 entity.setDescription(experiment.getDescription());
 
-sharingRegistryServerHandler.createEntity(entity);
+sharingRegistryServerHandler.registerEntity(entity);
 }
 
 ExperimentStatusChangeEvent event = new 
ExperimentStatusChangeEvent(ExperimentState.CREATED,
@@ -1586,7 +1586,7 @@ public class 

[15/51] [abbrv] airavata git commit: Approved and merge pull request 52 into develop branch

[scnakandala]

Approved and merge pull request 52 into develop branch


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6250ff1d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6250ff1d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6250ff1d

Branch: refs/heads/airavata-gov-registry
Commit: 6250ff1dcd72f54bca5333d3c71729b12578f740
Parents: 7c6c562 1b91dd1
Author: Shameera Rathnayaka 
Authored: Wed Oct 12 15:37:33 2016 -0400
Committer: Shameera Rathnayaka 
Committed: Wed Oct 12 15:37:33 2016 -0400

--
 .../airavata/compute_resource_model_types.cpp   |  28 ++--
 .../lib/airavata/compute_resource_model_types.h |  13 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |   2 +
 .../model/appcatalog/computeresource/ttypes.py  |   5 +
 .../computeresource/LOCALSubmission.java|  53 +++
 .../appcatalog/computeresource/MonitorMode.java |   5 +-
 .../server/src/main/resources/gfac-config.yaml  |   4 +-
 .../airavata/gfac/impl/GFacEngineImpl.java  |  11 +-
 .../apache/airavata/gfac/impl/HTTPUtils.java|   7 +
 .../airavata/gfac/impl/LocalRemoteCluster.java  |  42 +-
 .../gfac/impl/task/LocalJobSubmissionTask.java  | 150 ++-
 .../airavata/gfac/impl/task/TaskUtils.java  |   2 +-
 .../cpi/impl/SimpleOrchestratorImpl.java|  12 +-
 .../app/catalog/impl/ComputeResourceImpl.java   |   1 +
 .../core/app/catalog/model/LocalSubmission.java |  11 ++
 .../resources/LocalSubmissionResource.java  |  12 +-
 .../app/catalog/util/AppCatalogJPAUtils.java|   1 +
 .../util/AppCatalogThriftConversion.java|   1 +
 .../src/main/resources/appcatalog-derby.sql |   1 +
 .../src/main/resources/appcatalog-mysql.sql |   1 +
 .../compute_resource_model.thrift   |   5 +-
 21 files changed, 228 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/gfac/gfac-impl/src/main/java/org/apache/airavata/gfac/impl/GFacEngineImpl.java
--

http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogJPAUtils.java
--

http://git-wip-us.apache.org/repos/asf/airavata/blob/6250ff1d/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/app/catalog/util/AppCatalogThriftConversion.java
--

[38/51] [abbrv] airavata git commit: adding api docs of the sharing registry

[scnakandala]

adding api docs of the sharing registry


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d521922f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d521922f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d521922f

Branch: refs/heads/airavata-gov-registry
Commit: d521922ffe45ee224da8390b08700d1aee3a47e2
Parents: 4bb7c6d
Author: scnakandala 
Authored: Fri Oct 14 13:38:37 2016 -0400
Committer: scnakandala 
Committed: Fri Oct 14 13:38:37 2016 -0400

--
 modules/sharing-registry/api-docs/index.html|  77 ++
 .../sharing-registry/api-docs/sharing_cpi.html  | 240 +++
 .../api-docs/sharing_models.html| 165 +
 modules/sharing-registry/api-docs/style.css | 184 ++
 .../sharing/registry/models/Domain.java |   2 +-
 .../sharing/registry/models/Entity.java |   2 +-
 .../sharing/registry/models/EntityType.java |   2 +-
 .../registry/models/GroupMembership.java|   2 +-
 .../sharing/registry/models/PermissionType.java |   2 +-
 .../sharing/registry/models/SearchCriteria.java |   2 +-
 .../sharing/registry/models/Sharing.java|   2 +-
 .../models/SharingRegistryException.java|   2 +-
 .../airavata/sharing/registry/models/User.java  |   2 +-
 .../sharing/registry/models/UserGroup.java  |   2 +-
 .../service/cpi/SharingRegistryService.java |   2 +-
 .../thrift_models/thrift-gen.sh |   9 +-
 16 files changed, 685 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/d521922f/modules/sharing-registry/api-docs/index.html
--
diff --git a/modules/sharing-registry/api-docs/index.html 
b/modules/sharing-registry/api-docs/index.html
new file mode 100644
index 000..ead6c2f
--- /dev/null
+++ b/modules/sharing-registry/api-docs/index.html
@@ -0,0 +1,77 @@
+
+
+All Thrift declarations
+
+All Thrift declarations
+ModuleServicesData 
typesConstants
+
+sharing_cpiSharingRegistryService
+
+addChildGroupToParentGroup
+addUsersToGroup
+createDomain
+createEntity
+createEntityType
+createGroup
+createPermissionType
+createUser
+deleteDomain
+deleteEntity
+deleteEntityType
+deleteGroup
+deletePermissionType
+deleteUser
+getDomain
+getDomains
+getEntity
+getEntityType
+getEntityTypes
+getGroup
+getGroupMembers
+getGroups
+getListOfSharedGroups
+getListOfSharedUsers
+getPermissionType
+getPermissionTypes
+getUser
+getUsers
+removeChildGroupFromParentGroup
+removeUsersFromGroup
+revokeEntitySharingFromGroups
+revokeEntitySharingFromUsers
+searchEntities
+shareEntityWithGroups
+shareEntityWithUsers
+updateDomain
+updateEntity
+updateEntityType
+updateGroup
+updatePermissionType
+updatedUser
+userHasAccess
+
+
+
+
+
+sharing_models
+Domain
+Entity
+EntitySearchField
+EntityType
+GroupChildType
+GroupMembership
+GroupType
+PermissionType
+SearchCondition
+SearchCriteria
+Sharing
+SharingRegistryException
+SharingType
+User
+UserGroup
+
+DO_NOT_SET_AT_CLIENTS_ID
+
+
+

http://git-wip-us.apache.org/repos/asf/airavata/blob/d521922f/modules/sharing-registry/api-docs/sharing_cpi.html
--
diff --git a/modules/sharing-registry/api-docs/sharing_cpi.html 
b/modules/sharing-registry/api-docs/sharing_cpi.html
new file mode 100644
index 000..b510ecc
--- /dev/null
+++ b/modules/sharing-registry/api-docs/sharing_cpi.html
@@ -0,0 +1,240 @@
+http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;>
+http://www.w3.org/1999/xhtml;>
+
+
+
+Thrift module: sharing_cpi
+
+Thrift module: sharing_cpi
+ModuleServicesData 
typesConstants
+
+sharing_cpiSharingRegistryService
+
+addChildGroupToParentGroup
+addUsersToGroup
+createDomain
+createEntity
+createEntityType
+createGroup
+createPermissionType
+createUser
+deleteDomain
+deleteEntity
+deleteEntityType
+deleteGroup
+deletePermissionType
+deleteUser
+getDomain
+getDomains
+getEntity
+getEntityType
+getEntityTypes
+getGroup
+getGroupMembers
+getGroups
+getListOfSharedGroups
+getListOfSharedUsers
+getPermissionType
+getPermissionTypes
+getUser
+getUsers
+removeChildGroupFromParentGroup
+removeUsersFromGroup
+revokeEntitySharingFromGroups
+revokeEntitySharingFromUsers
+searchEntities
+shareEntityWithGroups
+shareEntityWithUsers
+updateDomain
+updateEntity
+updateEntityType
+updateGroup
+updatePermissionType
+updatedUser
+userHasAccess
+
+
+
+
+
+Services
+Service: SharingRegistryService
+Function: 
SharingRegistryService.createDomain
+string createDomain(sharing_models.Domain 
domain)
+throws sharing_models.SharingRegistryException
+ * Domain Operations
+*
+Function: 
SharingRegistryService.updateDomain
+bool 

[22/51] [abbrv] airavata git commit: adding separate distribution

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/e36c145d/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
 
b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
new file mode 100644
index 000..0e58356
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/resources/sharing-registry-derby.sql
@@ -0,0 +1,141 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+
+CREATE TABLE DOMAIN (
+  DOMAIN_ID VARCHAR(255) NOT NULL,
+  NAME VARCHAR(255) NOT NULL,
+  DESCRIPTION VARCHAR(255),
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (DOMAIN_ID)
+);
+
+CREATE TABLE SHARING_USER (
+  USER_ID VARCHAR(255) NOT NULL,
+  DOMAIN_ID VARCHAR(255) NOT NULL,
+  USER_NAME VARCHAR(255) NOT NULL,
+  FIRST_NAME VARCHAR (255),
+  LAST_NAME VARCHAR (255),
+  ICON BLOB,
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (USER_ID),
+  FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION
+);
+
+CREATE TABLE USER_GROUP (
+  GROUP_ID VARCHAR(255) NOT NULL,
+  DOMAIN_ID VARCHAR(255) NOT NULL,
+  NAME VARCHAR(255) NOT NULL,
+  DESCRIPTION VARCHAR(255),
+  OWNER_ID VARCHAR(255) NOT NULL,
+  GROUP_TYPE VARCHAR(255) NOT NULL,
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (GROUP_ID),
+  FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION,
+  FOREIGN KEY (OWNER_ID) REFERENCES SHARING_USER(USER_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION
+);
+
+
+CREATE TABLE GROUP_MEMBERSHIP (
+  PARENT_ID VARCHAR(255) NOT NULL,
+  CHILD_ID VARCHAR(255) NOT NULL,
+  CHILD_TYPE VARCHAR(255) NOT NULL,
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (PARENT_ID, CHILD_ID),
+  FOREIGN KEY (PARENT_ID) REFERENCES USER_GROUP(GROUP_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION,
+  FOREIGN KEY (CHILD_ID) REFERENCES USER_GROUP(GROUP_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION
+);
+
+CREATE TABLE ENTITY_TYPE (
+  ENTITY_TYPE_ID VARCHAR(255) NOT NULL,
+  DOMAIN_ID VARCHAR(255) NOT NULL,
+  NAME VARCHAR(255) NOT NULL,
+  DESCRIPTION VARCHAR(255),
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (ENTITY_TYPE_ID),
+  FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION
+);
+
+CREATE TABLE PERMISSION_TYPE (
+  PERMISSION_TYPE_ID VARCHAR(255) NOT NULL,
+  DOMAIN_ID VARCHAR(255) NOT NULL,
+  NAME VARCHAR(255) NOT NULL,
+  DESCRIPTION VARCHAR(255),
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (PERMISSION_TYPE_ID),
+  FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION
+);
+
+CREATE TABLE ENTITY (
+  ENTITY_ID VARCHAR(255) NOT NULL,
+  DOMAIN_ID VARCHAR(255) NOT NULL,
+  ENTITY_TYPE_ID VARCHAR(255) NOT NULL,
+  OWNER_ID VARCHAR(255) NOT NULL,
+  PARENT_ENTITY_ID VARCHAR(255),
+  NAME VARCHAR(255) NOT NULL,
+  DESCRIPTION VARCHAR(255),
+  FULL_TEXT CLOB,
+  CREATED_TIME BIGINT NOT NULL,
+  UPDATED_TIME BIGINT NOT NULL,
+  PRIMARY KEY (ENTITY_ID),
+  FOREIGN KEY (DOMAIN_ID) REFERENCES DOMAIN(DOMAIN_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION,
+  FOREIGN KEY (ENTITY_TYPE_ID) REFERENCES ENTITY_TYPE(ENTITY_TYPE_ID) ON 
DELETE CASCADE ON UPDATE NO ACTION,
+  FOREIGN KEY (OWNER_ID) REFERENCES SHARING_USER(USER_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION,
+  FOREIGN KEY (PARENT_ENTITY_ID) REFERENCES ENTITY(ENTITY_ID) ON DELETE 
CASCADE ON UPDATE NO ACTION
+);
+
+-- ALTER TABLE ENTITY ADD FULLTEXT FULL_TEXT_INDEX(FULL_TEXT);
+
+CREATE TABLE ENTITY_METADATA (
+  ENTITY_ID VARCHAR (255) NOT NULL,
+  META_KEY VARCHAR (255) NOT NULL,
+  META_VALUE VARCHAR (255) NOT NULL,
+  PRIMARY KEY (ENTITY_ID, META_KEY),
+  FOREIGN KEY (ENTITY_ID) REFERENCES ENTITY(ENTITY_ID) ON DELETE CASCADE ON 
UPDATE NO ACTION
+);
+
+CREATE TABLE SHARING (
+  PERMISSION_TYPE_ID VARCHAR(255) NOT NULL,
+  

[39/51] [abbrv] airavata git commit: adding docs

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/87564d2b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
--
diff --git a/modules/sharing-registry/thrift_models/sharing_cpi.thrift 
b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
index 3cef3e6..51d494f 100644
--- a/modules/sharing-registry/thrift_models/sharing_cpi.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
@@ -25,73 +25,187 @@ include "./sharing_models.thrift"
 service SharingRegistryService {
 
 /**
- * Domain Operations
-**/
-string createDomain(1: required sharing_models.Domain domain) throws (1: 
sharing_models.SharingRegistryException gre)
-bool updateDomain(1: required sharing_models.Domain domain) throws (1: 
sharing_models.SharingRegistryException gre)
-bool deleteDomain(1: required string domainId) throws (1: 
sharing_models.SharingRegistryException gre)
-sharing_models.Domain getDomain(1: required string domainId) throws (1: 
sharing_models.SharingRegistryException gre)
-list getDomains(1: required i32 offset, 2: required 
i32 limit) throws (1: sharing_models.SharingRegistryException gre);
+  API method to create a new domainId.
+*/
+string createDomain(1: required sharing_models.Domain domainId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to update a domainId.
+*/
+bool updateDomain(1: required sharing_models.Domain domainId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to delete domainId.
+*/
+bool deleteDomain(1: required string domainId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to retrieve a domainId.
+*/
+sharing_models.Domain getDomain(1: required string domainId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to get all domainIds.
+*/
+list getDomains(1: required i32 offset, 2: required 
i32 limit) throws (1: sharing_models.SharingRegistryException sre);
+
+/**
+ API method to register a user in the system
+*/
+string registerUser(1: required sharing_models.User user) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to update existing user
+*/
+bool updatedUser(1: required sharing_models.User user) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to delete user
+*/
+bool deleteUser(1: required string userId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to get a user
+*/
+sharing_models.User getUser(1: required string userId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to get a list of users in a specific domainId. Users will 
be reverse sorted based on the created time.
+ domainId : Domain id
+ offset : Starting result number
+ limit : Number of max results to be sent
+*/
+list getUsers(1: required string domainId, 2: 
required i32 offset, 3: required i32 limit) throws (1: 
sharing_models.SharingRegistryException sre);
 
 /**
- * User Operations
-**/
-string createUser(1: required sharing_models.User user) throws (1: 
sharing_models.SharingRegistryException gre)
-bool updatedUser(1: required sharing_models.User user) throws (1: 
sharing_models.SharingRegistryException gre)
-bool deleteUser(1: required string userId) throws (1: 
sharing_models.SharingRegistryException gre)
-sharing_models.User getUser(1: required string userId) throws (1: 
sharing_models.SharingRegistryException gre)
-list getUsers(1: required string domain, 2: required 
i32 offset, 3: required i32 limit) throws (1: 
sharing_models.SharingRegistryException gre);
+ API method to create a new group
+*/
+string createGroup(1: required sharing_models.UserGroup group) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to update a group
+*/
+bool updateGroup(1: required sharing_models.UserGroup group) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to delete a group
+*/
+bool deleteGroup(1: required string groupId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to get a group
+*/
+sharing_models.UserGroup getGroup(1: required string groupId) throws (1: 
sharing_models.SharingRegistryException sre)
+/**
+ API method to get groups in a domainId. Results are reverse sorted 
based on created time.
+*/
+list getGroups(1: required string domainId, 2: 
required i32 offset, 3: required i32 limit)
+
+/**
+ API method to add list of users to a group
+*/
+bool addUsersToGroup(1: required list userIds, 2: required string 
groupId) throws (1: sharing_models.SharingRegistryException sre);
+/**
+ API method to remove users from a group
+   

[43/51] [abbrv] airavata git commit: updating docs

[scnakandala]

updating docs


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6718761f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6718761f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6718761f

Branch: refs/heads/airavata-gov-registry
Commit: 6718761f77e943aa65ee6545af2106a44d45d51c
Parents: 87564d2
Author: scnakandala 
Authored: Fri Oct 14 18:20:47 2016 -0400
Committer: scnakandala 
Committed: Fri Oct 14 18:20:47 2016 -0400

--
 modules/sharing-registry/api-docs/sharing_cpi.html| 12 ++--
 .../airavata/sharing/registry/models/Domain.java  |  2 +-
 .../airavata/sharing/registry/models/Entity.java  |  2 +-
 .../airavata/sharing/registry/models/EntityType.java  |  2 +-
 .../sharing/registry/models/GroupMembership.java  |  2 +-
 .../sharing/registry/models/PermissionType.java   |  2 +-
 .../sharing/registry/models/SearchCriteria.java   |  2 +-
 .../airavata/sharing/registry/models/Sharing.java |  2 +-
 .../registry/models/SharingRegistryException.java |  2 +-
 .../apache/airavata/sharing/registry/models/User.java |  2 +-
 .../airavata/sharing/registry/models/UserGroup.java   |  2 +-
 .../registry/service/cpi/SharingRegistryService.java  | 14 +++---
 .../sharing-registry/thrift_models/sharing_cpi.thrift | 12 ++--
 13 files changed, 29 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/6718761f/modules/sharing-registry/api-docs/sharing_cpi.html
--
diff --git a/modules/sharing-registry/api-docs/sharing_cpi.html 
b/modules/sharing-registry/api-docs/sharing_cpi.html
index fa1edc1..037f75e 100644
--- a/modules/sharing-registry/api-docs/sharing_cpi.html
+++ b/modules/sharing-registry/api-docs/sharing_cpi.html
@@ -64,24 +64,24 @@
 Function: 
SharingRegistryService.createDomain
 string createDomain(sharing_models.Domain 
domainId)
 throws sharing_models.SharingRegistryException
-API method to create a new domainId.
+API method to create a new domain
 Function: 
SharingRegistryService.updateDomain
 bool updateDomain(sharing_models.Domain 
domainId)
 throws sharing_models.SharingRegistryException
-API method to update a domainId.
+API method to update a domain
 Function: 
SharingRegistryService.deleteDomain
 bool deleteDomain(string domainId)
 throws sharing_models.SharingRegistryException
-API method to delete domainId.
+API method to delete domain
 Function: 
SharingRegistryService.getDomain
 sharing_models.Domain 
getDomain(string domainId)
 throws sharing_models.SharingRegistryException
-API method to retrieve a domainId.
+API method to retrieve a domain
 Function: 
SharingRegistryService.getDomains
 listsharing_models.Domain
 getDomains(i32 offset,
i32 limit)
 throws sharing_models.SharingRegistryException
-API method to get all domainIds.
+API method to get all domain.
 Function: 
SharingRegistryService.registerUser
 string registerUser(sharing_models.User user)
 throws sharing_models.SharingRegistryException
@@ -103,7 +103,7 @@
i32 offset,
i32 limit)
 throws sharing_models.SharingRegistryException
-API method to get a list of users in a specific domainId. Users will 
be reverse sorted based on the created time.
+API method to get a list of users in a specific domain Users will be 
reverse sorted based on the created time.
 domainId : Domain id
 offset : Starting result number
 limit : Number of max results to be sent

http://git-wip-us.apache.org/repos/asf/airavata/blob/6718761f/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
index a0e89a5..f7ea565 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Domain.java
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
  * updatedTime : Will be set by the system
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-14")
 public class Domain implements org.apache.thrift.TBase, java.io.Serializable, 

[35/51] [abbrv] airavata git commit: fixing logging issue

[scnakandala]

fixing logging issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eb62af94
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eb62af94
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eb62af94

Branch: refs/heads/airavata-gov-registry
Commit: eb62af94250c690c933b2f8d15fe620de23aa36f
Parents: 6efb535
Author: scnakandala 
Authored: Thu Oct 13 19:03:38 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 19:03:38 2016 -0400

--
 .../src/main/assembly/bin-assembly.xml  |  1 +
 .../src/main/resources/bin/sharing-registry.sh  |  8 +-
 .../sharing/registry/server/ServerMain.java | 98 
 .../registry/server/SharingRegistryServer.java  |  8 --
 4 files changed, 103 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
index b8fdfd4..cef9a11 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/assembly/bin-assembly.xml
@@ -43,6 +43,7 @@
 bin
 
 airavata-server.properties
+log4j.properties
 
 
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
index 44aef1f..02be943 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
@@ -62,10 +62,10 @@ done
 
 if $STOP;
 then
-   for f in `find . -name "*-start_*"`; do
+   for f in `find . -name "server_start_*"`; do
IFS='_' read -a f_split <<< "$f"
echo "Found process file : $f"
-   echo -n "Sending kill signals to process ${f_split[1]}..."
+   echo -n "Sending kill signals to process ${f_split[2]}..."
out=`kill -9 ${f_split[1]} 2>&1`
if [ -z "$out" ]; then
echo "done"
@@ -83,8 +83,8 @@ then
 else
if $IS_DAEMON_MODE ; then
echo "Starting Sharing Registry Server in daemon mode..."
-   nohup $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer > 
../sharing-registry.out & echo $! > "../sharing-registry-start_$!"
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.ServerMain $* > /dev/null 2>&1 &
else
-   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.ServerMain $*
fi
 fi
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/eb62af94/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
new file mode 100644
index 000..54e1722
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/ServerMain.java
@@ -0,0 +1,98 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may 

[02/51] [abbrv] airavata git commit: Adding SSHCredentialSummary model & adding desc field to SSHCredential

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/5aa40b8a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
--
diff --git 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
index 565e9c6..f5c4276 100644
--- 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
+++ 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-08-09")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-10")
 public class CredentialStoreService {
 
   public interface Iface {
@@ -68,12 +68,16 @@ public class CredentialStoreService {
  */
 public String 
addSSHCredential(org.apache.airavata.credential.store.datamodel.SSHCredential 
sshCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
+public String 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+
 public String 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
 public String 
addPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
 public org.apache.airavata.credential.store.datamodel.SSHCredential 
getSSHCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
+public org.apache.airavata.credential.store.datamodel.SSHCredentialSummary 
getSSHCredentialSummary(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+
 public 
org.apache.airavata.credential.store.datamodel.CertificateCredential 
getCertificateCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
 public org.apache.airavata.credential.store.datamodel.PasswordCredential 
getPasswordCredential(String tokenId, String gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
@@ -86,6 +90,8 @@ public class CredentialStoreService {
 
 public boolean deleteSSHCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
+public boolean deleteSSHCredentialSummary(String tokenId, String 
gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
+
 public boolean deletePWDCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
   }
@@ -96,12 +102,16 @@ public class CredentialStoreService {
 
 public void 
addSSHCredential(org.apache.airavata.credential.store.datamodel.SSHCredential 
sshCredential, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
+public void 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+
 public void 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
 public void 
addPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
 public void getSSHCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 

[29/51] [abbrv] airavata git commit: implementing sharing server

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
new file mode 100644
index 000..b9840f6
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
@@ -0,0 +1,45160 @@
+/**
+ * Autogenerated by Thrift Compiler (0.9.3)
+ *
+ * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
+ */
+package org.apache.airavata.sharing.registry.service.cpi;
+
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import javax.annotation.Generated;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+public class SharingRegistryService {
+
+  public interface Iface {
+
+/**
+ *  * Domain Operations
+ * *
+ * 
+ * @param domain
+ */
+public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public boolean deleteDomain(String domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public List 
getDomains(int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+/**
+ *  * User Operations
+ * *
+ * 
+ * @param user
+ */
+public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public boolean deleteUser(String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public org.apache.airavata.sharing.registry.models.User getUser(String 
userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public List 
getUsers(String domain, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+/**
+ *  * Group Operations
+ * *
+ * 
+ * @param group
+ */
+public String 
createGroup(org.apache.airavata.sharing.registry.models.UserGroup group) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public boolean 
updateGroup(org.apache.airavata.sharing.registry.models.UserGroup group) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public boolean deleteGroup(String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public org.apache.airavata.sharing.registry.models.UserGroup 
getGroup(String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+
+public 

[27/51] [abbrv] airavata git commit: adding separate distribution

[scnakandala]

adding separate distribution


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e36c145d
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e36c145d
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e36c145d

Branch: refs/heads/airavata-gov-registry
Commit: e36c145d0fa794d0a56be117f321c30fbce1189a
Parents: a8e0333
Author: scnakandala 
Authored: Thu Oct 13 16:30:27 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 16:30:40 2016 -0400

--
 airavata-api/airavata-api-server/pom.xml|   2 +-
 modules/sharing-registry/pom.xml|  11 +-
 .../sharing-data-migrator/pom.xml   |   2 +-
 .../sharing-registry-core/pom.xml   | 104 
 .../registry/db/entities/DomainEntity.java  | 113 
 .../registry/db/entities/EntityEntity.java  | 192 --
 .../registry/db/entities/EntityTypeEntity.java  | 125 
 .../db/entities/GroupMembershipEntity.java  | 112 
 .../db/entities/GroupMembershipEntityPK.java|  74 ---
 .../db/entities/PermissionTypeEntity.java   | 125 
 .../registry/db/entities/SharingEntity.java | 136 
 .../registry/db/entities/SharingEntityPK.java   |  99 ---
 .../registry/db/entities/SharingUserEntity.java | 146 -
 .../registry/db/entities/UserGroupEntity.java   | 150 -
 .../db/repositories/AbstractRepository.java | 138 -
 .../db/repositories/DomainRepository.java   |  34 -
 .../db/repositories/EntityRepository.java   |  86 ---
 .../db/repositories/EntityTypeRepository.java   |  34 -
 .../repositories/GroupMembershipRepository.java |  98 ---
 .../repositories/PermissionTypeRepository.java  |  52 --
 .../db/repositories/SharingRepository.java  |  80 ---
 .../db/repositories/UserGroupRepository.java|  51 --
 .../db/repositories/UserRepository.java |  51 --
 .../sharing/registry/db/utils/Committer.java|  27 -
 .../registry/db/utils/ConnectionPool.java   | 382 
 .../sharing/registry/db/utils/DBConstants.java  | 101 ---
 .../registry/db/utils/DatabaseCreator.java  | 353 ---
 .../sharing/registry/db/utils/JPAUtils.java | 230 ---
 .../sharing/registry/db/utils/JdbcStorage.java  | 175 --
 .../db/utils/ObjectMapperSingleton.java |  39 --
 .../registry/server/SharingRegistryServer.java  |  28 -
 .../server/SharingRegistryServerHandler.java| 613 ---
 .../src/main/resources/META-INF/persistence.xml |  15 -
 .../main/resources/sharing-registry-derby.sql   | 141 -
 .../main/resources/sharing-registry-mysql.sql   | 141 -
 .../SharingRegistryServerHandlerTest.java   | 290 -
 .../sharing/registry/util/Initialize.java   | 298 -
 .../sharing-registry-distribution/pom.xml   |  91 +++
 .../src/main/assembly/bin-assembly.xml  |  69 +++
 .../src/main/resources/bin/setenv.sh|  65 ++
 .../src/main/resources/bin/sharing-registry.sh  |  87 +++
 .../sharing-registry-server/pom.xml |  99 +++
 .../registry/db/entities/DomainEntity.java  | 113 
 .../registry/db/entities/EntityEntity.java  | 192 ++
 .../registry/db/entities/EntityTypeEntity.java  | 125 
 .../db/entities/GroupMembershipEntity.java  | 112 
 .../db/entities/GroupMembershipEntityPK.java|  74 +++
 .../db/entities/PermissionTypeEntity.java   | 125 
 .../registry/db/entities/SharingEntity.java | 136 
 .../registry/db/entities/SharingEntityPK.java   |  99 +++
 .../registry/db/entities/SharingUserEntity.java | 146 +
 .../registry/db/entities/UserGroupEntity.java   | 150 +
 .../db/repositories/AbstractRepository.java | 138 +
 .../db/repositories/DomainRepository.java   |  34 +
 .../db/repositories/EntityRepository.java   |  86 +++
 .../db/repositories/EntityTypeRepository.java   |  34 +
 .../repositories/GroupMembershipRepository.java |  98 +++
 .../repositories/PermissionTypeRepository.java  |  52 ++
 .../db/repositories/SharingRepository.java  |  80 +++
 .../db/repositories/UserGroupRepository.java|  51 ++
 .../db/repositories/UserRepository.java |  51 ++
 .../sharing/registry/db/utils/Committer.java|  27 +
 .../registry/db/utils/ConnectionPool.java   | 382 
 .../sharing/registry/db/utils/DBConstants.java  | 101 +++
 .../registry/db/utils/DatabaseCreator.java  | 353 +++
 .../sharing/registry/db/utils/JPAUtils.java | 230 +++
 .../sharing/registry/db/utils/JdbcStorage.java  | 175 ++
 .../db/utils/ObjectMapperSingleton.java |  39 ++
 .../registry/server/SharingRegistryServer.java  |  28 +
 .../server/SharingRegistryServerHandler.java| 613 +++
 .../src/main/resources/META-INF/persistence.xml |  15 +
 .../main/resources/sharing-registry-derby.sql   | 

[37/51] [abbrv] airavata git commit: owner permission is not revokable or assignable

[scnakandala]

owner permission is not revokable  or assignable


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4bb7c6de
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4bb7c6de
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4bb7c6de

Branch: refs/heads/airavata-gov-registry
Commit: 4bb7c6deec45966f00a4e9676b10d945bcdd8075
Parents: eb62af9
Author: scnakandala 
Authored: Fri Oct 14 11:40:52 2016 -0400
Committer: scnakandala 
Committed: Fri Oct 14 11:40:52 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   |  10 +-
 .../repositories/PermissionTypeRepository.java  |   4 +-
 .../server/SharingRegistryServerHandler.java|  34 +-
 .../SharingRegistryServerHandlerTest.java   |   4 +-
 .../sharing/registry/models/Domain.java |  25 +-
 .../airavata/sharing/registry/models/User.java  |  26 +-
 .../service/cpi/SharingRegistryService.java | 613 ---
 .../thrift_models/sharing_cpi.thrift|   8 +-
 8 files changed, 594 insertions(+), 130 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/4bb7c6de/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 aba57eb..45ddc3f 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
@@ -3825,11 +3825,12 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 AiravataClientException, AiravataSystemException, 
AuthorizationException, TException {
 try {
 for(Map.Entry userPermission : 
userPermissionList.entrySet()){
+String gatewayId = 
authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
 
if(userPermission.getValue().equals(ResourcePermissionType.WRITE))
-
sharingRegistryServerHandler.shareEntityWithUsers(resourceId,
+
sharingRegistryServerHandler.shareEntityWithUsers(gatewayId, resourceId,
 Arrays.asList(userPermission.getKey()), 
authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":" + "WRITE", true);
 else
-
sharingRegistryServerHandler.shareEntityWithUsers(resourceId,
+
sharingRegistryServerHandler.shareEntityWithUsers(gatewayId, resourceId,
 Arrays.asList(userPermission.getKey()), 
authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":" + "READ", true);
 }
 return true;
@@ -3848,11 +3849,12 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 Map userPermissionList) throws InvalidRequestException, 
AiravataClientException, AiravataSystemException, AuthorizationException, 
TException {
 try {
 for(Map.Entry userPermission : 
userPermissionList.entrySet()){
+String gatewayId = 
authzToken.getClaimsMap().get(Constants.GATEWAY_ID);
 
if(userPermission.getValue().equals(ResourcePermissionType.WRITE))
-
sharingRegistryServerHandler.revokeEntitySharingFromUsers(resourceId,
+
sharingRegistryServerHandler.revokeEntitySharingFromUsers(gatewayId, resourceId,
 Arrays.asList(userPermission.getKey()), 
authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":" + "WRITE");
 else
-
sharingRegistryServerHandler.revokeEntitySharingFromUsers(resourceId,
+
sharingRegistryServerHandler.revokeEntitySharingFromUsers(gatewayId, resourceId,
 Arrays.asList(userPermission.getKey()), 
authzToken.getClaimsMap().get(Constants.GATEWAY_ID) + ":" + "READ");
 }
 return true;

http://git-wip-us.apache.org/repos/asf/airavata/blob/4bb7c6de/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/PermissionTypeRepository.java
--
diff --git 

[10/51] [abbrv] airavata git commit: Adding getAllSSHKeyForUsersInGateway and removing dates in auto gen files

[scnakandala]

Adding getAllSSHKeyForUsersInGateway and removing dates in auto gen files


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ac769369
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ac769369
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ac769369

Branch: refs/heads/airavata-gov-registry
Commit: ac769369bb3b5c42d28ee0bc96b3fbfe251f8474
Parents: d8c17d9
Author: Anuj Bhandar 
Authored: Wed Oct 12 12:53:56 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 12:53:56 2016 -0400

--
 .../server/CredentialStoreServerHandler.java|   35 +
 .../store/cpi/CredentialStoreService.java   | 1200 +-
 .../store/datamodel/CertificateCredential.java  |   27 +-
 .../store/datamodel/CommunityUser.java  |   26 +-
 .../store/datamodel/PasswordCredential.java |   27 +-
 .../store/datamodel/SSHCredential.java  |   27 +-
 .../store/datamodel/SSHCredentialSummary.java   |   27 +-
 .../exception/CredentialStoreException.java |2 +-
 .../component-cpis/credential-store-cpi.thrift  |2 +
 9 files changed, 1231 insertions(+), 142 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/ac769369/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
--
diff --git 
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
 
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index e8d0ef2..4914395 100644
--- 
a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++ 
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -340,6 +340,7 @@ public class CredentialStoreServerHandler implements 
CredentialStoreService.Ifac
 
sshCredentialSummary.setUsername(sshCredential.getPortalUserName());
 
sshCredentialSummary.setGatewayId(sshCredential.getGateway());
 
sshCredentialSummary.setDescription(sshCredential.getDescription());
+sshCredentialSummary.setPublicKey(new 
String(sshCredential.getPublicKey()));
 summaryList.add(sshCredentialSummary);
 }
 }
@@ -352,6 +353,40 @@ public class CredentialStoreServerHandler implements 
CredentialStoreService.Ifac
 }
 
 @Override
+public List 
getAllSSHCredentialSummaryForUserInGateway(String gatewayId, String userId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
TException {
+Map sshKeyMap = new HashMap<>();
+List summaryList = new ArrayList<>();
+try {
+List allCredentials = 
credentialReader.getAllCredentials();
+if (allCredentials != null && !allCredentials.isEmpty()){
+for (Credential credential : allCredentials) {
+if (credential instanceof 
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential) {
+
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential 
sshCredential = 
(org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential) 
credential;
+String portalUserName = 
sshCredential.getPortalUserName();
+String gateway = sshCredential.getGateway();
+if (portalUserName != null && gateway != null){
+if (portalUserName.equals(userId) && 
gateway.equals(gatewayId)) {
+
org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential 
sshCredentialKey = 
(org.apache.airavata.credential.store.credential.impl.ssh.SSHCredential) 
credential;
+SSHCredentialSummary sshCredentialSummary = 
new SSHCredentialSummary();
+
sshCredentialSummary.setToken(sshCredentialKey.getToken());
+
sshCredentialSummary.setUsername(sshCredentialKey.getPortalUserName());
+
sshCredentialSummary.setGatewayId(sshCredentialKey.getGateway());
+
sshCredentialSummary.setDescription(sshCredentialKey.getDescription());
+sshCredentialSummary.setPublicKey(new 

[11/51] [abbrv] airavata git commit: Adding Airavata Api level changes associated with last commit

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e59d800/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
--
diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift 
b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
index 9195209..78ec08c 100644
--- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
+++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift
@@ -365,6 +365,29 @@ service Airavata {
  2: airavata_errors.AiravataClientException ace,
  3: airavata_errors.AiravataSystemException ase)
 
+  /**
+ *
+ * Get all Public Key summaries for user in a Gateway
+ *
+ * @param CredStoreToken
+ *Credential Store Token which you want to find the Public Key for.
+ *
+ * @param gatewayId
+ *This is the unique identifier of your gateway where the token 
and public key was generated from.
+ *
+ * @param userId
+ *This is the unique identifier of user whose public keys are to 
be fetched.
+ *
+ * @return CredentialSummary
+ *
+ **/
+list 
getAllSSHPubKeysSummaryForUserInGateway (1: required security_model.AuthzToken 
authzToken,
+ 2: required string 
gatewayId,
+ 3: required string userId)
+   throws (1: airavata_errors.InvalidRequestException ire,
+   2: airavata_errors.AiravataClientException ace,
+   3: airavata_errors.AiravataSystemException ase)
+
 
   map getAllGatewayPWDCredentials (1: required 
security_model.AuthzToken authzToken,
  2: required string gatewayId)

[17/51] [abbrv] airavata git commit: adding search criteria as a new struct

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/modules/sharing-registry/thrift_models/sharing_cpi.thrift
--
diff --git a/modules/sharing-registry/thrift_models/sharing_cpi.thrift 
b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
index 3b26a27..02a7768 100644
--- a/modules/sharing-registry/thrift_models/sharing_cpi.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_cpi.thrift
@@ -73,8 +73,7 @@ service GovRegistryService {
 bool updateEntity(1: required sharing_models.Entity entity) throws (1: 
sharing_models.SharingRegistryException gre)
 bool deleteEntity(1: required string entityId) throws (1: 
sharing_models.SharingRegistryException gre)
 sharing_models.Entity getEntity(1: required string entityId) throws (1: 
sharing_models.SharingRegistryException gre)
-list searchEntities(1: required string userId, 2: 
required string entityTypeId, 3: required map filters, 4: required i32 offset, 5: required i32 limit) throws 
(1: sharing_models.SharingRegistryException gre)
+list searchEntities(1: required string userId, 2: 
required string entityTypeId, 3: required list 
filters, 4: required i32 offset, 5: required i32 limit) throws (1: 
sharing_models.SharingRegistryException gre)
 list getListOfSharedUsers(1: required string 
entityId, 2: required string permissionTypeId) throws (1: 
sharing_models.SharingRegistryException gre)
 list getListOfSharedGroups(1: required string 
entityId, 2: required string permissionTypeId) throws (1: 
sharing_models.SharingRegistryException gre)
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/bff76559/modules/sharing-registry/thrift_models/sharing_models.thrift
--
diff --git a/modules/sharing-registry/thrift_models/sharing_models.thrift 
b/modules/sharing-registry/thrift_models/sharing_models.thrift
index 8e78143..79bb564 100644
--- a/modules/sharing-registry/thrift_models/sharing_models.thrift
+++ b/modules/sharing-registry/thrift_models/sharing_models.thrift
@@ -78,12 +78,27 @@ struct EntityType {
 6: optional i64 updatedTime
 }
 
-enum EntitySearchFields {
+enum EntitySearchField {
 NAME,
 DESCRIPTION,
-FULL_TEXT
+FULL_TEXT,
+PRRENT_ENTITY_ID,
+CREATED_TIME,
+UPDATED_TIME
 }
 
+enum SearchCondition {
+EQUAL,
+LIKE,
+GTE,
+LTE
+}
+
+struct SearchCriteria {
+1: optional EntitySearchField searchField,
+2: optional string value,
+3: optional SearchCondition searchCondition
+}
 
 struct Entity {
 1: optional string entityId = DO_NOT_SET_AT_CLIENTS_ID,

[20/51] [abbrv] airavata git commit: adding first name, last name, email and icon to sharing user profile

[scnakandala]

adding first name, last name, email and icon to sharing user profile


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7cb338d6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7cb338d6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7cb338d6

Branch: refs/heads/airavata-gov-registry
Commit: 7cb338d6aaf983e91a4213cde0ee6aa05715e872
Parents: bff7655
Author: scnakandala 
Authored: Thu Oct 13 13:51:03 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 13:51:03 2016 -0400

--
 .../registry/db/entities/SharingUserEntity.java |  34 ++
 .../main/resources/sharing-registry-derby.sql   |   3 +
 .../main/resources/sharing-registry-mysql.sql   |   3 +
 .../sharing/registry/models/Domain.java |   2 +-
 .../sharing/registry/models/Entity.java |   2 +-
 .../registry/models/EntitySearchField.java  |   4 +
 .../sharing/registry/models/EntityType.java |   2 +-
 .../registry/models/GroupMembership.java|   2 +-
 .../sharing/registry/models/PermissionType.java |   2 +-
 .../sharing/registry/models/SearchCriteria.java |   2 +-
 .../sharing/registry/models/Sharing.java|   2 +-
 .../models/SharingRegistryException.java|   2 +-
 .../airavata/sharing/registry/models/User.java  | 387 +--
 .../sharing/registry/models/UserGroup.java  |   2 +-
 .../service/cpi/GovRegistryService.java |   2 +-
 .../thrift_models/sharing_models.thrift |   7 +-
 16 files changed, 410 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java
 
b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java
index 31e6e6e..0d17279 100644
--- 
a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java
+++ 
b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/entities/SharingUserEntity.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.persistence.*;
+import java.nio.ByteBuffer;
 
 @Entity
 @Table(name = "SHARING_USER", schema = "")
@@ -32,6 +33,9 @@ public class SharingUserEntity {
 private String userId;
 private String domainId;
 private String userName;
+private String firstName;
+private String lastName;
+private ByteBuffer icon;
 private Long createdTime;
 private Long updatedTime;
 
@@ -66,6 +70,36 @@ public class SharingUserEntity {
 }
 
 @Basic
+@Column(name = "FIRST_NAME")
+public String getFirstName() {
+return firstName;
+}
+
+public void setFirstName(String firstName) {
+this.firstName = firstName;
+}
+
+@Basic
+@Column(name = "LAST_NAME")
+public String getLastName() {
+return lastName;
+}
+
+public void setLastName(String lastName) {
+this.lastName = lastName;
+}
+
+@Lob
+@Column(name = "ICON")
+public ByteBuffer getIcon() {
+return icon;
+}
+
+public void setIcon(ByteBuffer icon) {
+this.icon = icon;
+}
+
+@Basic
 @Column(name = "CREATED_TIME")
 public Long getCreatedTime() {
 return createdTime;

http://git-wip-us.apache.org/repos/asf/airavata/blob/7cb338d6/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql
--
diff --git 
a/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql
 
b/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql
index 4e0fab3..0e58356 100644
--- 
a/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql
+++ 
b/modules/sharing-registry/sharing-registry-core/src/main/resources/sharing-registry-derby.sql
@@ -32,6 +32,9 @@ CREATE TABLE SHARING_USER (
   USER_ID VARCHAR(255) NOT NULL,
   DOMAIN_ID VARCHAR(255) NOT NULL,
   USER_NAME VARCHAR(255) NOT NULL,
+  FIRST_NAME VARCHAR (255),
+  LAST_NAME VARCHAR (255),
+  ICON BLOB,
   CREATED_TIME BIGINT NOT NULL,
   UPDATED_TIME BIGINT NOT NULL,
   PRIMARY KEY (USER_ID),

[33/51] [abbrv] airavata git commit: changing the module name

[scnakandala]

changing the module name


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fe76d11e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fe76d11e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fe76d11e

Branch: refs/heads/airavata-gov-registry
Commit: fe76d11e33006bd7429981734ba56f2fdaca8957
Parents: 1764699
Author: scnakandala 
Authored: Thu Oct 13 17:56:05 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 17:56:05 2016 -0400

--
 modules/sharing-registry/sharing-registry-distribution/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/fe76d11e/modules/sharing-registry/sharing-registry-distribution/pom.xml
--
diff --git a/modules/sharing-registry/sharing-registry-distribution/pom.xml 
b/modules/sharing-registry/sharing-registry-distribution/pom.xml
index f818807..f9bff9a 100644
--- a/modules/sharing-registry/sharing-registry-distribution/pom.xml
+++ b/modules/sharing-registry/sharing-registry-distribution/pom.xml
@@ -9,7 +9,7 @@
 
 4.0.0
 
-airavata-sharing-distribution
+airavata-sharing-registry-distribution
 
 
 

[34/51] [abbrv] airavata git commit: removing invalid echo

[scnakandala]

removing invalid echo


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6efb535b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6efb535b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6efb535b

Branch: refs/heads/airavata-gov-registry
Commit: 6efb535b0a4df26f3fc2453e3180a429075fc5a4
Parents: fe76d11
Author: scnakandala 
Authored: Thu Oct 13 18:01:37 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 18:01:37 2016 -0400

--
 .../src/main/resources/bin/sharing-registry.sh  | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/6efb535b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
index 0725c48..44aef1f 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
@@ -81,7 +81,6 @@ then
fi
done
 else
-   echo $SHARING_REGISTRY_CLASSPATH
if $IS_DAEMON_MODE ; then
echo "Starting Sharing Registry Server in daemon mode..."
nohup $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer > 
../sharing-registry.out & echo $! > "../sharing-registry-start_$!"

[08/51] [abbrv] airavata git commit: Merge branch 'ssh-cred-model-change' of github.com:anujbhan/airavata into ssh-cred-model-change

[scnakandala]

Merge branch 'ssh-cred-model-change' of github.com:anujbhan/airavata into 
ssh-cred-model-change


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d8c17d98
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d8c17d98
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d8c17d98

Branch: refs/heads/airavata-gov-registry
Commit: d8c17d98fd280516aa55dfa11930789ec81589a9
Parents: cc74960 b654836
Author: Anuj Bhandar 
Authored: Wed Oct 12 11:36:09 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 11:36:09 2016 -0400

--

--

[09/51] [abbrv] airavata git commit: moving sharing registry initialization to AiravataServerHandler

[scnakandala]

moving sharing registry initialization to AiravataServerHandler


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7c6c5625
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7c6c5625
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7c6c5625

Branch: refs/heads/airavata-gov-registry
Commit: 7c6c562533efbb5a42ab136b9a7a61a5d8d9b9e5
Parents: 81d8dee
Author: scnakandala 
Authored: Wed Oct 12 11:46:50 2016 -0400
Committer: scnakandala 
Committed: Wed Oct 12 11:46:50 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   | 59 ++--
 .../server/SharingRegistryServerHandler.java| 53 --
 2 files changed, 55 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/7c6c5625/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 1a64ef8..a0a563c 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
@@ -77,10 +77,7 @@ 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.sharing.registry.models.Domain;
-import org.apache.airavata.sharing.registry.models.Entity;
-import org.apache.airavata.sharing.registry.models.EntityType;
-import org.apache.airavata.sharing.registry.models.PermissionType;
+import org.apache.airavata.sharing.registry.models.*;
 import 
org.apache.airavata.sharing.registry.server.SharingRegistryServerHandler;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;
@@ -102,6 +99,7 @@ public class AiravataServerHandler implements Airavata.Iface 
{
 experimentPublisher = 
MessagingFactory.getPublisher(Type.EXPERIMENT_LAUNCH);
 
 sharingRegistryServerHandler = new SharingRegistryServerHandler();
+initSharingRegistry();
 } catch (ApplicationSettingsException e) {
 logger.error("Error occured while reading airavata-server 
properties..", e);
 } catch (AiravataException e) {
@@ -111,6 +109,59 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 }
 }
 
+private void initSharingRegistry() throws ApplicationSettingsException, 
TException {
+
if(sharingRegistryServerHandler.getDomain(ServerSettings.getDefaultUserGateway())
 == null){
+Domain domain = new Domain();
+domain.setDomainId(ServerSettings.getDefaultUserGateway());
+domain.setName(ServerSettings.getDefaultUserGateway());
+domain.setDescription("Domain entry for " + domain.name);
+sharingRegistryServerHandler.createDomain(domain);
+
+User user = new User();
+user.setDomainId(domain.domainId);
+
user.setUserId(ServerSettings.getDefaultUser()+"@"+ServerSettings.getDefaultUserGateway());
+user.setUserName(ServerSettings.getDefaultUser());
+sharingRegistryServerHandler.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");
+sharingRegistryServerHandler.createEntityType(entityType);
+
+entityType = new EntityType();
+entityType.setEntityTypeId(domain.domainId+":EXPERIMENT");
+entityType.setDomainId(domain.domainId);
+entityType.setName("EXPERIMENT");
+entityType.setDescription("Experiment entity type");
+sharingRegistryServerHandler.createEntityType(entityType);
+
+entityType = new EntityType();
+entityType.setEntityTypeId(domain.domainId+":FILE");
+entityType.setDomainId(domain.domainId);
+entityType.setName("FILE");
+entityType.setDescription("File entity type");
+sharingRegistryServerHandler.createEntityType(entityType);
+
+   

[47/51] [abbrv] airavata git commit: fixing id issues

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/b6e07d7b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html
--
diff --git 
a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html 
b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html
index 9b6253d..ed7fb89 100644
--- a/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html
+++ b/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html
@@ -91,11 +91,13 @@
 throws sharing_models.SharingRegistryException
 API method to update existing user
 Function: 
SharingRegistryService.deleteUser
-bool deleteUser(string userId)
+bool deleteUser(string domainId,
+string userId)
 throws sharing_models.SharingRegistryException
 API method to delete user
 Function: 
SharingRegistryService.getUser
-sharing_models.User 
getUser(string userId)
+sharing_models.User 
getUser(string domainId,
+string userId)
 throws sharing_models.SharingRegistryException
 API method to get a user
 Function: 
SharingRegistryService.getUsers
@@ -116,11 +118,13 @@
 throws sharing_models.SharingRegistryException
 API method to update a group
 Function: 
SharingRegistryService.deleteGroup
-bool deleteGroup(string groupId)
+bool deleteGroup(string domainId,
+ string groupId)
 throws sharing_models.SharingRegistryException
 API method to delete a group
 Function: 
SharingRegistryService.getGroup
-sharing_models.UserGroup 
getGroup(string groupId)
+sharing_models.UserGroup 
getGroup(string domainId,
+  string groupId)
 throws sharing_models.SharingRegistryException
 API method to get a group
 Function: 
SharingRegistryService.getGroups
@@ -129,34 +133,40 @@
  i32 limit)
 API method to get groups in a domainId. Results are reverse sorted 
based on created time.
 Function: 
SharingRegistryService.addUsersToGroup
-bool 
addUsersToGroup(liststring userIds,
+bool addUsersToGroup(string domainId,
+ liststring userIds,
  string groupId)
 throws sharing_models.SharingRegistryException
 API method to add list of users to a group
 Function: 
SharingRegistryService.removeUsersFromGroup
-bool 
removeUsersFromGroup(liststring userIds,
+bool removeUsersFromGroup(string domainId,
+  liststring userIds,
   string groupId)
 throws sharing_models.SharingRegistryException
 API method to remove users from a group
 Function: 
SharingRegistryService.getGroupMembersOfTypeUser
-listsharing_models.User
 getGroupMembersOfTypeUser(string groupId,
+listsharing_models.User
 getGroupMembersOfTypeUser(string domainId,
+string 
groupId,
 i32 offset,
 i32 limit)
 throws sharing_models.SharingRegistryException
 API method to get list of child users in a group. Only the direct 
members will be returned. Results are reverse time sorted based on creation 
time
 Function: 
SharingRegistryService.getGroupMembersOfTypeGroup
-listsharing_models.UserGroup
 getGroupMembersOfTypeGroup(string groupId,
+listsharing_models.UserGroup
 getGroupMembersOfTypeGroup(string domainId,
+  string 
groupId,
   i32 
offset,
   i32 
limit)
 throws sharing_models.SharingRegistryException
 API method to get list of child groups in a group. Only the direct 
members will be returned. Results are reverse time sorted based on creation 
time
 Function: 
SharingRegistryService.addChildGroupsToParentGroup
-bool 
addChildGroupsToParentGroup(liststring 
childIds,
+bool addChildGroupsToParentGroup(string 
domainId,
+ liststring 
childIds,
  string groupId)
 throws sharing_models.SharingRegistryException
 API method to add a child group to a parent group.
 Function: 
SharingRegistryService.removeChildGroupFromParentGroup
-bool removeChildGroupFromParentGroup(string 
childId,
+bool removeChildGroupFromParentGroup(string 
domainId,
+ string childId,
  string groupId)
 throws sharing_models.SharingRegistryException
 API method to remove a child group from parent group.
@@ -169,11 +179,13 @@
 throws sharing_models.SharingRegistryException
 API method to update entity type
 Function: 
SharingRegistryService.deleteEntityType
-bool deleteEntityType(string entityTypeId)
+bool deleteEntityType(string domainId,
+  string entityTypeId)
 throws sharing_models.SharingRegistryException
 

[48/51] [abbrv] airavata git commit: fixing id issues

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/b6e07d7b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
index 25ab01a..106ff41 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-16")
 public class SharingRegistryService {
 
   public interface Iface {
@@ -92,16 +92,18 @@ public class SharingRegistryService {
 /**
  * API method to delete user
  * 
+ * @param domainId
  * @param userId
  */
-public boolean deleteUser(String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean deleteUser(String domainId, String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to get a user
  * 
+ * @param domainId
  * @param userId
  */
-public org.apache.airavata.sharing.registry.models.User getUser(String 
userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public org.apache.airavata.sharing.registry.models.User getUser(String 
domainId, String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to get a list of users in a specific domain Users will be 
reverse sorted based on the created time.
@@ -132,16 +134,18 @@ public class SharingRegistryService {
 /**
  * API method to delete a group
  * 
+ * @param domainId
  * @param groupId
  */
-public boolean deleteGroup(String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean deleteGroup(String domainId, String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to get a group
  * 
+ * @param domainId
  * @param groupId
  */
-public org.apache.airavata.sharing.registry.models.UserGroup 
getGroup(String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public org.apache.airavata.sharing.registry.models.UserGroup 
getGroup(String domainId, String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to get groups in a domainId. Results are reverse sorted 
based on created time.
@@ -155,52 +159,58 @@ public class SharingRegistryService {
 /**
  * API method to add list of users to a group
  * 
+ * @param domainId
  * @param userIds
  * @param groupId
  */
-public boolean addUsersToGroup(List userIds, String groupId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean addUsersToGroup(String domainId, List userIds, 
String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to remove users from a group
  * 
+ * @param domainId
  * @param userIds
  * @param groupId
  */
-public boolean removeUsersFromGroup(List userIds, String groupId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public boolean removeUsersFromGroup(String domainId, List userIds, 
String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
  * API method to get list of child users in a group. Only the direct 
members will be returned. Results are reverse time sorted based on creation 
time
  * 
+ * @param domainId
  * @param groupId
  * @param offset
  * @param limit
  */
-public List 
getGroupMembersOfTypeUser(String groupId, int offset, 

[46/51] [abbrv] airavata git commit: adding initial how to use documents

[scnakandala]

adding initial how to use documents


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/61a0fc95
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/61a0fc95
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/61a0fc95

Branch: refs/heads/airavata-gov-registry
Commit: 61a0fc95416a658fae5164165e67bd896dc228fb
Parents: 6718761
Author: scnakandala 
Authored: Fri Oct 14 20:03:16 2016 -0400
Committer: scnakandala 
Committed: Fri Oct 14 20:03:16 2016 -0400

--
 modules/sharing-registry/api-docs/index.html|  79 -
 .../sharing-registry/api-docs/sharing_cpi.html  | 278 -
 .../api-docs/sharing_models.html| 273 -
 modules/sharing-registry/api-docs/style.css | 184 
 .../registry/SharingRegistryServiceTest.java|  84 ++
 .../service/cpi/SharingRegistryService.java | 296 +--
 .../sharing-service-docs/api-docs/index.html|  79 +
 .../api-docs/sharing_cpi.html   | 278 +
 .../api-docs/sharing_models.html| 273 +
 .../sharing-service-docs/api-docs/style.css | 184 
 .../sharing-service-docs/index.html |  93 ++
 .../sharing-service-docs/style.css  | 184 
 .../thrift_models/sharing_cpi.thrift|   4 +-
 .../thrift_models/thrift-gen.sh |   4 +-
 14 files changed, 1327 insertions(+), 966 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/61a0fc95/modules/sharing-registry/api-docs/index.html
--
diff --git a/modules/sharing-registry/api-docs/index.html 
b/modules/sharing-registry/api-docs/index.html
deleted file mode 100644
index 6663a9d..000
--- a/modules/sharing-registry/api-docs/index.html
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-All Thrift declarations
-
-All Thrift declarations
-ModuleServicesData 
typesConstants
-
-sharing_cpiSharingRegistryService
-
-addChildGroupsToParentGroup
-addUsersToGroup
-createDomain
-createEntityType
-createGroup
-createPermissionType
-deleteDomain
-deleteEntity
-deleteEntityType
-deleteGroup
-deletePermissionType
-deleteUser
-getDomain
-getDomains
-getEntity
-getEntityType
-getEntityTypes
-getGroup
-getGroupMembersOfTypeGroup
-getGroupMembersOfTypeUser
-getGroups
-getListOfSharedGroups
-getListOfSharedUsers
-getPermissionType
-getPermissionTypes
-getUser
-getUsers
-registerEntity
-registerUser
-removeChildGroupFromParentGroup
-removeUsersFromGroup
-revokeEntitySharingFromGroups
-revokeEntitySharingFromUsers
-searchEntities
-shareEntityWithGroups
-shareEntityWithUsers
-updateDomain
-updateEntity
-updateEntityType
-updateGroup
-updatePermissionType
-updatedUser
-userHasAccess
-
-
-
-
-
-sharing_models
-Domain
-Entity
-EntitySearchField
-EntityType
-GroupCardinality
-GroupChildType
-GroupMembership
-GroupType
-PermissionType
-SearchCondition
-SearchCriteria
-Sharing
-SharingRegistryException
-SharingType
-User
-UserGroup
-
-DO_NOT_SET_AT_CLIENTS_ID
-
-
-

http://git-wip-us.apache.org/repos/asf/airavata/blob/61a0fc95/modules/sharing-registry/api-docs/sharing_cpi.html
--
diff --git a/modules/sharing-registry/api-docs/sharing_cpi.html 
b/modules/sharing-registry/api-docs/sharing_cpi.html
deleted file mode 100644
index 037f75e..000
--- a/modules/sharing-registry/api-docs/sharing_cpi.html
+++ /dev/null
@@ -1,278 +0,0 @@
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd;>
-http://www.w3.org/1999/xhtml;>
-
-
-
-Thrift module: sharing_cpi
-
-Thrift module: sharing_cpi
-ModuleServicesData 
typesConstants
-
-sharing_cpiSharingRegistryService
-
-addChildGroupsToParentGroup
-addUsersToGroup
-createDomain
-createEntityType
-createGroup
-createPermissionType
-deleteDomain
-deleteEntity
-deleteEntityType
-deleteGroup
-deletePermissionType
-deleteUser
-getDomain
-getDomains
-getEntity
-getEntityType
-getEntityTypes
-getGroup
-getGroupMembersOfTypeGroup
-getGroupMembersOfTypeUser
-getGroups
-getListOfSharedGroups
-getListOfSharedUsers
-getPermissionType
-getPermissionTypes
-getUser
-getUsers
-registerEntity
-registerUser
-removeChildGroupFromParentGroup
-removeUsersFromGroup
-revokeEntitySharingFromGroups
-revokeEntitySharingFromUsers
-searchEntities
-shareEntityWithGroups
-shareEntityWithUsers
-updateDomain
-updateEntity
-updateEntityType
-updateGroup
-updatePermissionType
-updatedUser
-userHasAccess
-
-
-
-
-
-Services
-Service: SharingRegistryService
-Function: 
SharingRegistryService.createDomain
-string createDomain(sharing_models.Domain 
domainId)
-throws sharing_models.SharingRegistryException
-API method to create a new domain

[32/51] [abbrv] airavata git commit: fixing the sharing server start script issue

[scnakandala]

fixing the sharing server start script issue


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/17646993
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/17646993
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/17646993

Branch: refs/heads/airavata-gov-registry
Commit: 1764699364e5a07f3d9fe129a6af4e7505c68e10
Parents: 9101a51
Author: scnakandala 
Authored: Thu Oct 13 17:35:49 2016 -0400
Committer: scnakandala 
Committed: Thu Oct 13 17:35:49 2016 -0400

--
 .../src/main/resources/bin/setenv.sh  |  6 +-
 .../src/main/resources/bin/sharing-registry.sh| 18 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/17646993/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
index 1dcf419..1e5475d 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/setenv.sh
@@ -52,14 +52,10 @@ PRGDIR=`dirname "$PRG"`
 
 SHARING_REGISTRY_CLASSPATH=""
 
-
-
-for f in "SHARING_REGISTRY_HOME"/lib/*.jar
+for f in "$SHARING_REGISTRY_HOME"/lib/*.jar
 do
   SHARING_REGISTRY_CLASSPATH="$SHARING_REGISTRY_CLASSPATH":$f
 done
 
-SHARING_REGISTRY_CLASSPATH="$SHARING_REGISTRY_CLASSPATH":"$SHARING_REGISTRY_HOME"/conf/log4j.properties
-
 export SHARING_REGISTRY_HOME
 export SHARING_REGISTRY_CLASSPATH
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/airavata/blob/17646993/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
--
diff --git 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
index 35bf0ef..0725c48 100644
--- 
a/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
+++ 
b/modules/sharing-registry/sharing-registry-distribution/src/main/resources/bin/sharing-registry.sh
@@ -18,16 +18,22 @@
 # under the License.
 
 . `dirname $0`/setenv.sh
-cd $SHARING_REGISTRY_HOME
+cd $SHARING_REGISTRY_HOME/bin
 
 IS_DAEMON_MODE=false
 SHARING_REGISTRY_COMMAND=""
 STOP=false
 FORCE=false
+JAVA_OPTS=""
 
 for var in "$@"
 do
 case $var in
+-xdebug)
+   AIRAVATA_COMMAND="${AIRAVATA_COMMAND}"
+JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent 
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
+shift
+;;
start)
IS_DAEMON_MODE=true
 shift
@@ -43,6 +49,7 @@ do
 echo "command options:"
echo "  start  Start server in daemon mode"
echo "  stop   Stop server."
+   echo "  -xdebugStart Sharing Registry 
Server under JPDA debugger"
echo "  -h Display this help and exit"
shift
 exit 0
@@ -74,14 +81,11 @@ then
fi
done
 else
+   echo $SHARING_REGISTRY_CLASSPATH
if $IS_DAEMON_MODE ; then
echo "Starting Sharing Registry Server in daemon mode..."
-   cd "$SHARING_REGISTRY_HOME"/lib
-   nohup $JAVA_HOME/bin/java -jar 
"$SHARING_REGISTRY_HOME"/lib/airavata-sharing-registry-server-0.17-SNAPSHOT.jar 
> ../sharing-registry.out & echo $! > "../sharing-registry-start_$!"
-   cd ..
+   nohup $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer > 
../sharing-registry.out & echo $! > "../sharing-registry-start_$!"
else
-cd "$SHARING_REGISTRY_HOME"/lib
-   $JAVA_HOME/bin/java -jar 
"$SHARING_REGISTRY_HOME"/lib/airavata-sharing-registry-server-0.17-SNAPSHOT.jar
-   cd ..
+   $JAVA_HOME/bin/java ${JAVA_OPTS} -classpath 
"$SHARING_REGISTRY_CLASSPATH"  
org.apache.airavata.sharing.registry.server.SharingRegistryServer
fi
 fi
\ No newline at end of file

[13/51] [abbrv] airavata git commit: Adding Airavata Api level changes associated with last commit

[scnakandala]

Adding Airavata Api level changes associated with last commit


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8e59d800
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8e59d800
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8e59d800

Branch: refs/heads/airavata-gov-registry
Commit: 8e59d800f4bf6984d1c84d9f940161a0ba218638
Parents: ac76936
Author: Anuj Bhandar 
Authored: Wed Oct 12 13:08:58 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 13:08:58 2016 -0400

--
 .../server/handler/AiravataServerHandler.java   |   28 +
 .../java/org/apache/airavata/api/Airavata.java  | 8473 ++
 .../airavata-apis/airavata_api.thrift   |   23 +
 3 files changed, 5033 insertions(+), 3491 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/8e59d800/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 9441119..0b61e0f 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
@@ -516,6 +516,34 @@ public class AiravataServerHandler implements 
Airavata.Iface {
 }
 
 @Override
+public List 
getAllSSHPubKeysSummaryForUserInGateway(AuthzToken authzToken, String 
gatewayId, String userId) throws InvalidRequestException, 
AiravataClientException, AiravataSystemException, TException {
+try {
+List allCredentialSummaries =  new 
ArrayList<>();
+if (csClient == null){
+csClient = getCredentialStoreServiceClient();
+}
+List sshSummaryListForUser = 
csClient.getAllSSHCredentialSummaryForUserInGateway(gatewayId,userId);
+for(SSHCredentialSummary key : sshSummaryListForUser){
+CredentialSummary userPubKeySummary = new CredentialSummary();
+userPubKeySummary.setGatewayId(key.getGatewayId());
+userPubKeySummary.setUsername(key.getUsername());
+userPubKeySummary.setPublicKey(key.getPublicKey());
+userPubKeySummary.setDescription(key.getDescription());
+userPubKeySummary.setPersistedTime(key.getPersistedTime());
+allCredentialSummaries.add(userPubKeySummary);
+}
+logger.debug("Airavata retrieved all SSH pub keys summaries for 
gateway Id : " + gatewayId + " & user ID : " +userId);
+return allCredentialSummaries;
+}catch (Exception e){
+logger.error("Error occurred while retrieving SSH public keys 
summaries for user : " + userId , e);
+AiravataSystemException exception = new AiravataSystemException();
+exception.setAiravataErrorType(AiravataErrorType.INTERNAL_ERROR);
+exception.setMessage("Error occurred while retrieving SSH public 
keys summaries for user : " + userId + ". More info : " + e.getMessage());
+throw exception;
+}
+}
+
+@Override
 @SecurityCheck
 public Map getAllGatewayPWDCredentials(AuthzToken 
authzToken, String gatewayId) throws InvalidRequestException, 
AiravataClientException, AiravataSystemException, TException {
 try {

[03/51] [abbrv] airavata git commit: Adding SSHCredentialSummary model & adding desc field to SSHCredential

[scnakandala]

Adding SSHCredentialSummary model & adding desc field to SSHCredential


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5aa40b8a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5aa40b8a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5aa40b8a

Branch: refs/heads/airavata-gov-registry
Commit: 5aa40b8a611f3f6778bdb1a72d6757f9d243465b
Parents: 81d8dee
Author: Anuj Bhandar 
Authored: Mon Oct 10 12:58:25 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 11:30:42 2016 -0400

--
 .../store/cpi/CredentialStoreService.java   | 5239 ++
 .../store/datamodel/SSHCredential.java  |  117 +-
 .../store/datamodel/SSHCredentialSummary.java   |  937 
 .../component-cpis/credential-store-cpi.thrift  |8 +
 .../credential_store_data_models.thrift |   12 +-
 5 files changed, 5249 insertions(+), 1064 deletions(-)
--

[24/51] [abbrv] airavata git commit: adding separate distribution

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/e36c145d/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
new file mode 100644
index 000..de8abf4
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/entities/EntityEntity.java
@@ -0,0 +1,192 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.sharing.registry.db.entities;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.*;
+import java.util.Map;
+
+@Entity
+@Table(name = "ENTITY", schema = "")
+public class EntityEntity {
+private final static Logger logger = 
LoggerFactory.getLogger(EntityEntity.class);
+private String entityId;
+private String domainId;
+private String entityTypeId;
+private String ownerId;
+private String parentEntityId;
+private String name;
+private String description;
+private Map metadata;
+private String fullText;
+private Long createdTime;
+private Long updatedTime;
+
+@Id
+@Column(name = "ENTITY_ID")
+public String getEntityId() {
+return entityId;
+}
+
+public void setEntityId(String entityId) {
+this.entityId = entityId;
+}
+
+@Basic
+@Column(name = "DOMAIN_ID")
+public String getDomainId() {
+return domainId;
+}
+
+public void setDomainId(String domainId) {
+this.domainId = domainId;
+}
+
+@Basic
+@Column(name = "ENTITY_TYPE_ID")
+public String getEntityTypeId() {
+return entityTypeId;
+}
+
+public void setEntityTypeId(String entityTypeId) {
+this.entityTypeId = entityTypeId;
+}
+
+@Basic
+@Column(name = "OWNER_ID")
+public String getOwnerId() {
+return ownerId;
+}
+
+public void setOwnerId(String ownerId) {
+this.ownerId = ownerId;
+}
+
+@Basic
+@Column(name = "PARENT_ENTITY_ID")
+public String getParentEntityId() {
+return parentEntityId;
+}
+
+public void setParentEntityId(String parentEntityId) {
+this.parentEntityId = parentEntityId;
+}
+
+@Basic
+@Column(name = "NAME")
+public String getName() {
+return name;
+}
+
+public void setName(String name) {
+this.name = name;
+}
+
+@Basic
+@Column(name = "DESCRIPTION")
+public String getDescription() {
+return description;
+}
+
+public void setDescription(String description) {
+this.description = description;
+}
+
+@ElementCollection
+@CollectionTable(
+name="ENTITY_METADATA",
+joinColumns=@JoinColumn(name="ENTITY_ID")
+)
+@MapKeyColumn(name="META_KEY")
+@Column(name="META_VALUE")
+public Map getMetadata() {
+return metadata;
+}
+
+public void setMetadata(Map metadata) {
+this.metadata = metadata;
+}
+
+@Lob
+@Column(name = "FULL_TEXT")
+public String getFullText() {
+return fullText;
+}
+
+public void setFullText(String fullText) {
+this.fullText = fullText;
+}
+
+@Basic
+@Column(name = "CREATED_TIME")
+public Long getCreatedTime() {
+return createdTime;
+}
+
+public void setCreatedTime(Long createdTime) {
+this.createdTime = createdTime;
+}
+
+@Basic
+@Column(name = "UPDATED_TIME")
+public Long getUpdatedTime() {
+return updatedTime;
+}
+
+public void setUpdatedTime(Long updatedTime) {
+this.updatedTime = updatedTime;
+}
+
+@Override
+public boolean equals(Object o) {
+if (this == o) return true;
+if (o == null || getClass() != o.getClass()) return false;

[12/51] [abbrv] airavata git commit: Adding Airavata Api level changes associated with last commit

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/8e59d800/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
--
diff --git 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
index 0b12271..a600dce 100644
--- 
a/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
+++ 
b/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
@@ -316,6 +316,29 @@ public class Airavata {
  */
 public 
List 
getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
 
+/**
+ * 
+ * Get all Public Key summaries for user in a Gateway
+ * 
+ * @param CredStoreToken
+ *Credential Store Token which you want to find the Public Key for.
+ * 
+ * @param gatewayId
+ *This is the unique identifier of your gateway where the token and 
public key was generated from.
+ * 
+ * @param userId
+ *This is the unique identifier of user whose public keys are to be 
fetched.
+ * 
+ * @return CredentialSummary
+ * 
+ * 
+ * 
+ * @param authzToken
+ * @param gatewayId
+ * @param userId
+ */
+public 
List 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
+
 public Map 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException;
 
 /**
@@ -2913,6 +2936,8 @@ public class Airavata {
 
 public void 
getAllGatewaySSHPubKeysSummary(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
+public void 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+
 public void 
getAllGatewayPWDCredentials(org.apache.airavata.model.security.AuthzToken 
authzToken, String gatewayId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
 public void deleteSSHPubKey(org.apache.airavata.model.security.AuthzToken 
authzToken, String airavataCredStoreToken, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
@@ -3904,6 +3929,40 @@ public class Airavata {
   throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getAllGatewaySSHPubKeysSummary failed: unknown result");
 }
 
+public 
List 
getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
+{
+  send_getAllSSHPubKeysSummaryForUserInGateway(authzToken, gatewayId, 
userId);
+  return recv_getAllSSHPubKeysSummaryForUserInGateway();
+}
+
+public void 
send_getAllSSHPubKeysSummaryForUserInGateway(org.apache.airavata.model.security.AuthzToken
 authzToken, String gatewayId, String userId) throws 
org.apache.thrift.TException
+{
+  getAllSSHPubKeysSummaryForUserInGateway_args args = new 
getAllSSHPubKeysSummaryForUserInGateway_args();
+  args.setAuthzToken(authzToken);
+  args.setGatewayId(gatewayId);
+  args.setUserId(userId);
+  sendBase("getAllSSHPubKeysSummaryForUserInGateway", args);
+}
+
+public 
List 
recv_getAllSSHPubKeysSummaryForUserInGateway() throws 
org.apache.airavata.model.error.InvalidRequestException, 
org.apache.airavata.model.error.AiravataClientException, 
org.apache.airavata.model.error.AiravataSystemException, 
org.apache.thrift.TException
+{
+  getAllSSHPubKeysSummaryForUserInGateway_result result = new 
getAllSSHPubKeysSummaryForUserInGateway_result();
+  

[40/51] [abbrv] airavata git commit: adding docs

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/87564d2b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
index fc4f384..70459c3 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
@@ -34,124 +34,305 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
 public class SharingRegistryService {
 
   public interface Iface {
 
 /**
- *  * Domain Operations
- * *
+ * API method to create a new domainId.
  * 
- * @param domain
+ * @param domainId
  */
-public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+/**
+ * API method to update a domainId.
+ * 
+ * @param domainId
+ */
+public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domainId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
+/**
+ * API method to delete domainId.
+ * 
+ * @param domainId
+ */
 public boolean deleteDomain(String domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
+/**
+ * API method to retrieve a domainId.
+ * 
+ * @param domainId
+ */
 public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
+/**
+ * API method to get all domainIds.
+ * 
+ * @param offset
+ * @param limit
+ */
 public List 
getDomains(int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
 /**
- *  * User Operations
- * *
+ * API method to register a user in the system
  * 
  * @param user
  */
-public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+public String 
registerUser(org.apache.airavata.sharing.registry.models.User user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
+/**
+ * API method to update existing user
+ * 
+ * @param user
+ */
 public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
+/**
+ * API method to delete user
+ * 
+ * @param userId
+ */
 public boolean deleteUser(String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
+/**
+ * API method to get a user
+ * 
+ * @param userId
+ */
 public org.apache.airavata.sharing.registry.models.User getUser(String 
userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
-public List 
getUsers(String domain, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+/**
+ * API method to get a list of users in a specific domainId. Users will 
be reverse sorted based on the created time.
+ * domainId : Domain id
+ * offset : Starting result number
+ * limit : Number of max results to be sent
+ * 
+ * @param domainId
+ * @param offset
+ * @param limit
+ */
+public 

[16/51] [abbrv] airavata git commit: moving credential-store data model thrift file to data-models directory

[scnakandala]

moving credential-store data model thrift file to data-models directory


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c9e26ec3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c9e26ec3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c9e26ec3

Branch: refs/heads/airavata-gov-registry
Commit: c9e26ec359c79d3d321e67060aac994941523e2f
Parents: 8e59d80
Author: Anuj Bhandar 
Authored: Wed Oct 12 16:36:46 2016 -0400
Committer: Anuj Bhandar 
Committed: Wed Oct 12 16:36:46 2016 -0400

--
 .../component-cpis/credential-store-cpi.thrift  |  2 +-
 .../credential_store_data_models.thrift | 72 
 .../credential_store_data_models.thrift | 72 
 .../generate-thrift-stubs.sh| 24 +++
 4 files changed, 97 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/airavata/blob/c9e26ec3/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
--
diff --git 
a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift 
b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
index 36e7980..923a192 100644
--- a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
+++ b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift
@@ -23,7 +23,7 @@
  *
 */
 
-include "credential_store_data_models.thrift"
+include 
"../data-models/credential-store-models/credential_store_data_models.thrift"
 include "credential_store_errors.thrift"
 
 namespace java org.apache.airavata.credential.store.cpi

http://git-wip-us.apache.org/repos/asf/airavata/blob/c9e26ec3/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift
--
diff --git 
a/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift
 
b/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift
deleted file mode 100644
index f2c2c77..000
--- 
a/thrift-interface-descriptions/component-cpis/credential_store_data_models.thrift
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-
-namespace java org.apache.airavata.credential.store.datamodel
-namespace php Airavata.Model.Credential.Store
-
-const string DEFAULT_ID = "DO_NOT_SET_AT_CLIENTS"
-
-struct SSHCredential {
-1: required string gatewayId,
-2: required string username,
-3: optional string passphrase,
-4: optional string publicKey,
-5: optional string privateKey,
-6: optional i64 persistedTime,
-7: optional string token,
-8: optional string description
-}
-
-struct SSHCredentialSummary {
-1: required string gatewayId,
-2: required string username,
-3: optional string publicKey,
-4: optional i64 persistedTime,
-5: required string token,
-6: optional string description
-}
-
-struct CommunityUser {
-1: required string gatewayName,
-2: required string username,
-3: required string userEmail
-}
-
-struct CertificateCredential {
-1: required CommunityUser communityUser,
-2: required string x509Cert,
-3: optional string notAfter,
-4: optional string privateKey,
-5: optional i64 lifeTime,
-6: optional string notBefore
-7: optional i64 persistedTime,
-8: optional string token
-}
-
-struct PasswordCredential {
-1: required string gatewayId,
-2: required string portalUserName,
-3: required string loginUserName,
-4: required string password,
-5: optional string description,
-6: optional i64 persistedTime,
-7: optional string token
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/c9e26ec3/thrift-interface-descriptions/data-models/credential-store-models/credential_store_data_models.thrift
--

[30/51] [abbrv] airavata git commit: implementing sharing server

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/9101a519/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
deleted file mode 100644
index 25c4553..000
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/GovRegistryService.java
+++ /dev/null
@@ -1,45160 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.3)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.apache.airavata.sharing.registry.service.cpi;
-
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-13")
-public class GovRegistryService {
-
-  public interface Iface {
-
-/**
- *  * Domain Operations
- * *
- * 
- * @param domain
- */
-public String 
createDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public boolean 
updateDomain(org.apache.airavata.sharing.registry.models.Domain domain) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public boolean deleteDomain(String domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public org.apache.airavata.sharing.registry.models.Domain getDomain(String 
domainId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public List 
getDomains(int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-/**
- *  * User Operations
- * *
- * 
- * @param user
- */
-public String createUser(org.apache.airavata.sharing.registry.models.User 
user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public boolean 
updatedUser(org.apache.airavata.sharing.registry.models.User user) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public boolean deleteUser(String userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public org.apache.airavata.sharing.registry.models.User getUser(String 
userId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public List 
getUsers(String domain, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-/**
- *  * Group Operations
- * *
- * 
- * @param group
- */
-public String 
createGroup(org.apache.airavata.sharing.registry.models.UserGroup group) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public boolean 
updateGroup(org.apache.airavata.sharing.registry.models.UserGroup group) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public boolean deleteGroup(String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-public org.apache.airavata.sharing.registry.models.UserGroup 
getGroup(String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
-
-

[23/51] [abbrv] airavata git commit: adding separate distribution

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/e36c145d/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ConnectionPool.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ConnectionPool.java
 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ConnectionPool.java
new file mode 100644
index 000..02484f7
--- /dev/null
+++ 
b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/utils/ConnectionPool.java
@@ -0,0 +1,382 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+*/
+package org.apache.airavata.sharing.registry.db.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Stack;
+import java.util.concurrent.Semaphore;
+
+
+/**
+ * A class for preallocating, recycling, and managing JDBC connections.
+ */
+public class ConnectionPool {
+private static final Logger logger = 
LoggerFactory.getLogger(ConnectionPool.class);
+
+private long MAX_IDLE_TIME = 5 * 60 * 1000; // 5 minutes
+
+private String driver;
+private String url;
+private String username;
+private String password;
+private String jdbcUrl;
+
+private int maxConnections;
+
+private boolean autoCommit = true;
+private boolean waitIfBusy;
+
+private Semaphore needConnection = new Semaphore(0);
+private boolean stop;
+
+private Stack availableConnections;
+private Stack busyConnections;
+
+private HashMap lastAccessTimeRecord = new 
HashMap();
+
+private String urlType = "";
+
+private DataSource datasource;
+
+private int transactionIsolation = Connection.TRANSACTION_NONE;
+
+private Thread clenupThread;
+private Thread producerThread;
+
+public ConnectionPool(String driver, String url, String username, String 
password, int initialConnections,
+  int maxConnections, boolean waitIfBusy) throws 
SQLException {
+this.driver = driver;
+this.url = url;
+this.username = username;
+this.password = password;
+this.urlType = "speratedURL";
+initialize(initialConnections, maxConnections, waitIfBusy);
+}
+
+public ConnectionPool(String driver, String jdbcUrl, int 
initialConnections, int maxConnections,
+  boolean waitIfBusy, boolean autoCommit, int 
transactionIsolation) throws SQLException {
+this.driver = driver;
+this.jdbcUrl = jdbcUrl;
+this.urlType = "simpleURL";
+this.autoCommit = autoCommit;
+this.transactionIsolation = transactionIsolation;
+initialize(initialConnections, maxConnections, waitIfBusy);
+}
+
+public ConnectionPool(String driver, String jdbcUrl, int 
initialConnections, int maxConnections, boolean waitIfBusy)
+throws SQLException {
+this.driver = driver;
+this.jdbcUrl = jdbcUrl;
+this.urlType = "simpleURL";
+initialize(initialConnections, maxConnections, waitIfBusy);
+}
+
+public ConnectionPool(DataSource dataSource, int initialConnections, int 
maxConnections, boolean waitIfBusy)
+throws SQLException {
+this.urlType = "dataSource";
+this.datasource = dataSource;
+initialize(initialConnections, maxConnections, waitIfBusy);
+}
+
+/**
+ * Check if this connection pool is auto commit or not
+ *
+ * @return
+ */
+public boolean isAutoCommit() {
+return this.autoCommit;
+}
+
+private void initialize(int initialConnections, int maxConnections, 
boolean waitIfBusy) throws SQLException {
+this.maxConnections = maxConnections;
+this.waitIfBusy = waitIfBusy;
+
+int sizeOfConnections = (initialConnections > maxConnections) ? 

[04/51] [abbrv] airavata git commit: removing add and delete method for SSHCredentialSummary, serverhandler implemented got get method

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/077fd2c8/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
--
diff --git 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
index f5c4276..209bcce 100644
--- 
a/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
+++ 
b/modules/credential-store/credential-store-stubs/src/main/java/org/apache/airavata/credential/store/cpi/CredentialStoreService.java
@@ -68,8 +68,6 @@ public class CredentialStoreService {
  */
 public String 
addSSHCredential(org.apache.airavata.credential.store.datamodel.SSHCredential 
sshCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
-public String 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
-
 public String 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
 public String 
addPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
@@ -90,8 +88,6 @@ public class CredentialStoreService {
 
 public boolean deleteSSHCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
-public boolean deleteSSHCredentialSummary(String tokenId, String 
gatewayId) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
-
 public boolean deletePWDCredential(String tokenId, String gatewayId) 
throws org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException;
 
   }
@@ -102,8 +98,6 @@ public class CredentialStoreService {
 
 public void 
addSSHCredential(org.apache.airavata.credential.store.datamodel.SSHCredential 
sshCredential, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-public void 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
-
 public void 
addCertificateCredential(org.apache.airavata.credential.store.datamodel.CertificateCredential
 certificateCredential, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
 public void 
addPasswordCredential(org.apache.airavata.credential.store.datamodel.PasswordCredential
 passwordCredential, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
@@ -124,8 +118,6 @@ public class CredentialStoreService {
 
 public void deleteSSHCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-public void deleteSSHCredentialSummary(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
-
 public void deletePWDCredential(String tokenId, String gatewayId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
   }
@@ -198,32 +190,6 @@ public class CredentialStoreService {
   throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addSSHCredential failed: unknown result");
 }
 
-public String 
addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws 
org.apache.airavata.credential.store.exception.CredentialStoreException, 
org.apache.thrift.TException
-{
-  send_addSSHCredentialSummary(sshCredentialSummary);
-  return recv_addSSHCredentialSummary();
-}
-
-public void 
send_addSSHCredentialSummary(org.apache.airavata.credential.store.datamodel.SSHCredentialSummary
 sshCredentialSummary) throws org.apache.thrift.TException
-{
-  addSSHCredentialSummary_args args = new addSSHCredentialSummary_args();
-  args.setSshCredentialSummary(sshCredentialSummary);
-  

[26/51] [abbrv] airavata git commit: adding separate distribution

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/e36c145d/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
 
b/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
deleted file mode 100644
index 9c30fa4..000
--- 
a/modules/sharing-registry/sharing-registry-core/src/main/java/org/apache/airavata/sharing/registry/db/repositories/SharingRepository.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-package org.apache.airavata.sharing.registry.db.repositories;
-
-import org.apache.airavata.sharing.registry.db.entities.SharingEntity;
-import org.apache.airavata.sharing.registry.db.entities.SharingEntityPK;
-import org.apache.airavata.sharing.registry.db.utils.DBConstants;
-import org.apache.airavata.sharing.registry.models.Sharing;
-import org.apache.airavata.sharing.registry.models.SharingRegistryException;
-import org.apache.airavata.sharing.registry.models.SharingType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.HashMap;
-import java.util.List;
-
-public class SharingRepository extends AbstractRepository {
-private final static Logger logger = 
LoggerFactory.getLogger(SharingRepository.class);
-
-public SharingRepository() {
-super(Sharing.class, SharingEntity.class);
-}
-
-public List getIndirectSharedChildren(String parentId, String 
permissionTypeId) throws SharingRegistryException {
-HashMap filters = new HashMap<>();
-filters.put(DBConstants.SharingTable.INHERITED_PARENT_ID, parentId);
-filters.put(DBConstants.SharingTable.SHARING_TYPE, 
SharingType.INDIRECT_CASCADING.toString());
-filters.put(DBConstants.SharingTable.PERMISSION_TYPE_ID, 
permissionTypeId);
-
-return select(filters, 0, -1);
-}
-
-public List getCascadingPermissionsForEntity(String entityId) 
throws SharingRegistryException {
-HashMap filters = new HashMap<>();
-filters.put(DBConstants.SharingTable.ENTITY_ID, entityId);
-String query = "SELECT p from " + SharingEntity.class.getSimpleName() 
+ " as p";
-query += " WHERE ";
-query += "p." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId 
+ "' AND ";
-query += "p." + DBConstants.SharingTable.SHARING_TYPE + " IN('" + 
SharingType.DIRECT_CASCADING.toString()
-+ "', '" + SharingType.INDIRECT_CASCADING + "') ";
-query += " ORDER BY p.createdTime DESC";
-return select(query, 0, -1);
-}
-
-public boolean hasAccess(String entityId, List groupIds, 
List permissionTypeIds) throws SharingRegistryException {
-String query = "SELECT p from " + SharingEntity.class.getSimpleName() 
+ " as p";
-query += " WHERE ";
-query += "p." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId 
+ "' AND ";
-String permissionTypeIdString = "'";
-for(String permissionId : permissionTypeIds)
-permissionTypeIdString += permissionId + "','";
-permissionTypeIdString = permissionTypeIdString.substring(0, 
permissionTypeIdString.length()-2);
-query += "p." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " IN(" + 
permissionTypeIdString + ") AND ";
-String groupIdString = "'";
-for(String groupId : groupIds)
-groupIdString += groupId + "','";
-groupIdString = groupIdString.substring(0, groupIdString.length()-2);
-query += "p." + DBConstants.SharingTable.GROUP_ID + " IN(" + 
groupIdString + ") ";
-query += " ORDER BY p.createdTime DESC";
-return select(query, 0, -1).size() > 0;
-}
-}
\ No newline at end of file

[49/51] [abbrv] airavata git commit: fixing id issues

[scnakandala]

http://git-wip-us.apache.org/repos/asf/airavata/blob/b6e07d7b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
--
diff --git 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
index 9fe3043..819dd0d 100644
--- 
a/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
+++ 
b/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/GroupMembership.java
@@ -38,15 +38,16 @@ import org.slf4j.LoggerFactory;
  * System internal data type to map group memberships
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-14")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2016-10-16")
 public class GroupMembership implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("GroupMembership");
 
   private static final org.apache.thrift.protocol.TField PARENT_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("parentId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField CHILD_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("childId", 
org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField CHILD_TYPE_FIELD_DESC 
= new org.apache.thrift.protocol.TField("childType", 
org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField 
CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", 
org.apache.thrift.protocol.TType.I64, (short)4);
-  private static final org.apache.thrift.protocol.TField 
UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", 
org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField DOMAIN_ID_FIELD_DESC 
= new org.apache.thrift.protocol.TField("domainId", 
org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField CHILD_TYPE_FIELD_DESC 
= new org.apache.thrift.protocol.TField("childType", 
org.apache.thrift.protocol.TType.I32, (short)4);
+  private static final org.apache.thrift.protocol.TField 
CREATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createdTime", 
org.apache.thrift.protocol.TType.I64, (short)5);
+  private static final org.apache.thrift.protocol.TField 
UPDATED_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("updatedTime", 
org.apache.thrift.protocol.TType.I64, (short)6);
 
   private static final Map schemes = 
new HashMap();
   static {
@@ -56,6 +57,7 @@ public class GroupMembership implements 
org.apache.thrift.TBase byName = new HashMap();
 
@@ -93,11 +96,13 @@ public class GroupMembership implements 
org.apache.thrift.TBase