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 {
     /**
      * <p>API method to delete user</p>
      * 
+     * @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;
 
     /**
      * <p>API method to get a user</p>
      * 
+     * @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;
 
     /**
      * <p>API method to get a list of users in a specific domain Users will be 
reverse sorted based on the created time.</p>
@@ -132,16 +134,18 @@ public class SharingRegistryService {
     /**
      * <p>API method to delete a group</p>
      * 
+     * @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;
 
     /**
      * <p>API method to get a group</p>
      * 
+     * @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;
 
     /**
      * <p>API method to get groups in a domainId. Results are reverse sorted 
based on created time.</p>
@@ -155,52 +159,58 @@ public class SharingRegistryService {
     /**
      * <p>API method to add list of users to a group</p>
      * 
+     * @param domainId
      * @param userIds
      * @param groupId
      */
-    public boolean addUsersToGroup(List<String> userIds, String groupId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean addUsersToGroup(String domainId, List<String> userIds, 
String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to remove users from a group</p>
      * 
+     * @param domainId
      * @param userIds
      * @param groupId
      */
-    public boolean removeUsersFromGroup(List<String> userIds, String groupId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean removeUsersFromGroup(String domainId, List<String> userIds, 
String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>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</p>
      * 
+     * @param domainId
      * @param groupId
      * @param offset
      * @param limit
      */
-    public List<org.apache.airavata.sharing.registry.models.User> 
getGroupMembersOfTypeUser(String groupId, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.sharing.registry.models.User> 
getGroupMembersOfTypeUser(String domainId, String groupId, int offset, int 
limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>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</p>
      * 
+     * @param domainId
      * @param groupId
      * @param offset
      * @param limit
      */
-    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getGroupMembersOfTypeGroup(String groupId, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getGroupMembersOfTypeGroup(String domainId, String groupId, int offset, int 
limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to add a child group to a parent group.</p>
      * 
+     * @param domainId
      * @param childIds
      * @param groupId
      */
-    public boolean addChildGroupsToParentGroup(List<String> childIds, String 
groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean addChildGroupsToParentGroup(String domainId, List<String> 
childIds, String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to remove a child group from parent group.</p>
      * 
+     * @param domainId
      * @param childId
      * @param groupId
      */
-    public boolean removeChildGroupFromParentGroup(String childId, String 
groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean removeChildGroupFromParentGroup(String domainId, String 
childId, String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to create a new entity type</p>
@@ -219,16 +229,18 @@ public class SharingRegistryService {
     /**
      * <p>API method to delete entity type</p>
      * 
+     * @param domainId
      * @param entityTypeId
      */
-    public boolean deleteEntityType(String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean deleteEntityType(String domainId, String entityTypeId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get an entity type</p>
      * 
+     * @param domainId
      * @param entityTypeId
      */
-    public org.apache.airavata.sharing.registry.models.EntityType 
getEntityType(String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public org.apache.airavata.sharing.registry.models.EntityType 
getEntityType(String domainId, String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get entity types in a domainId. Results are reverse 
time sorted based on creation time</p>
@@ -256,43 +268,48 @@ public class SharingRegistryService {
     /**
      * <p>API method to delete entity</p>
      * 
+     * @param domainId
      * @param entityId
      */
-    public boolean deleteEntity(String entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean deleteEntity(String domainId, String entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get entity</p>
      * 
+     * @param domainId
      * @param entityId
      */
-    public org.apache.airavata.sharing.registry.models.Entity getEntity(String 
entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public org.apache.airavata.sharing.registry.models.Entity getEntity(String 
domainId, String entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to search entities</p>
      * 
+     * @param domainId
      * @param userId
      * @param entityTypeId
      * @param filters
      * @param offset
      * @param limit
      */
-    public List<org.apache.airavata.sharing.registry.models.Entity> 
searchEntities(String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.sharing.registry.models.Entity> 
searchEntities(String domainId, String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get a list of shared users given the entity id</p>
      * 
+     * @param domainId
      * @param entityId
      * @param permissionTypeId
      */
-    public List<org.apache.airavata.sharing.registry.models.User> 
getListOfSharedUsers(String entityId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.sharing.registry.models.User> 
getListOfSharedUsers(String domainId, String entityId, String permissionTypeId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get a list of shared groups given the entity id</p>
      * 
+     * @param domainId
      * @param entityId
      * @param permissionTypeId
      */
-    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getListOfSharedGroups(String entityId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getListOfSharedGroups(String domainId, String entityId, String 
permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to create permission type</p>
@@ -311,16 +328,18 @@ public class SharingRegistryService {
     /**
      * <p>API method to delete permission type</p>
      * 
-     * @param entityTypeId
+     * @param domainId
+     * @param permissionTypeId
      */
-    public boolean deletePermissionType(String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public boolean deletePermissionType(String domainId, String 
permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get permission type</p>
      * 
+     * @param domainId
      * @param permissionTypeId
      */
-    public org.apache.airavata.sharing.registry.models.PermissionType 
getPermissionType(String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
+    public org.apache.airavata.sharing.registry.models.PermissionType 
getPermissionType(String domainId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException;
 
     /**
      * <p>API method to get list of permission types in a given domainId. 
Results are reverse time sorted based on creation time</p>
@@ -401,9 +420,9 @@ public class SharingRegistryService {
 
     public void updatedUser(org.apache.airavata.sharing.registry.models.User 
user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void deleteUser(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void deleteUser(String domainId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getUser(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getUser(String domainId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getUsers(String domainId, int offset, int limit, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -411,31 +430,31 @@ public class SharingRegistryService {
 
     public void 
updateGroup(org.apache.airavata.sharing.registry.models.UserGroup group, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void deleteGroup(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void deleteGroup(String domainId, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getGroup(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getGroup(String domainId, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getGroups(String domainId, int offset, int limit, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void addUsersToGroup(List<String> userIds, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void addUsersToGroup(String domainId, List<String> userIds, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void removeUsersFromGroup(List<String> userIds, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void removeUsersFromGroup(String domainId, List<String> userIds, 
String groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void getGroupMembersOfTypeUser(String groupId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getGroupMembersOfTypeUser(String domainId, String groupId, int 
offset, int limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void getGroupMembersOfTypeGroup(String groupId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getGroupMembersOfTypeGroup(String domainId, String groupId, 
int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void addChildGroupsToParentGroup(List<String> childIds, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void addChildGroupsToParentGroup(String domainId, List<String> 
childIds, String groupId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void removeChildGroupFromParentGroup(String childId, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void removeChildGroupFromParentGroup(String domainId, String 
childId, String groupId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
     public void 
createEntityType(org.apache.airavata.sharing.registry.models.EntityType 
entityType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void 
updateEntityType(org.apache.airavata.sharing.registry.models.EntityType 
entityType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void deleteEntityType(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void deleteEntityType(String domainId, String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getEntityType(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getEntityType(String domainId, String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getEntityTypes(String domainId, int offset, int limit, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -443,23 +462,23 @@ public class SharingRegistryService {
 
     public void 
updateEntity(org.apache.airavata.sharing.registry.models.Entity entity, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void deleteEntity(String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void deleteEntity(String domainId, String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getEntity(String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getEntity(String domainId, String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void searchEntities(String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void searchEntities(String domainId, String userId, String 
entityTypeId, List<org.apache.airavata.sharing.registry.models.SearchCriteria> 
filters, int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-    public void getListOfSharedUsers(String entityId, String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getListOfSharedUsers(String domainId, String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void getListOfSharedGroups(String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+    public void getListOfSharedGroups(String domainId, String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
     public void 
createPermissionType(org.apache.airavata.sharing.registry.models.PermissionType 
permissionType, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
     public void 
updatePermissionType(org.apache.airavata.sharing.registry.models.PermissionType 
permissionType, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-    public void deletePermissionType(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void deletePermissionType(String domainId, String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
-    public void getPermissionType(String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+    public void getPermissionType(String domainId, String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
     public void getPermissionTypes(String domainId, int offset, int limit, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
@@ -678,15 +697,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updatedUser failed: unknown result");
     }
 
-    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
     {
-      send_deleteUser(userId);
+      send_deleteUser(domainId, userId);
       return recv_deleteUser();
     }
 
-    public void send_deleteUser(String userId) throws 
org.apache.thrift.TException
+    public void send_deleteUser(String domainId, String userId) throws 
org.apache.thrift.TException
     {
       deleteUser_args args = new deleteUser_args();
+      args.setDomainId(domainId);
       args.setUserId(userId);
       sendBase("deleteUser", args);
     }
@@ -704,15 +724,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteUser failed: unknown result");
     }
 
-    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
     {
-      send_getUser(userId);
+      send_getUser(domainId, userId);
       return recv_getUser();
     }
 
-    public void send_getUser(String userId) throws org.apache.thrift.TException
+    public void send_getUser(String domainId, String userId) throws 
org.apache.thrift.TException
     {
       getUser_args args = new getUser_args();
+      args.setDomainId(domainId);
       args.setUserId(userId);
       sendBase("getUser", args);
     }
@@ -810,15 +831,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateGroup failed: unknown result");
     }
 
-    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
     {
-      send_deleteGroup(groupId);
+      send_deleteGroup(domainId, groupId);
       return recv_deleteGroup();
     }
 
-    public void send_deleteGroup(String groupId) throws 
org.apache.thrift.TException
+    public void send_deleteGroup(String domainId, String groupId) throws 
org.apache.thrift.TException
     {
       deleteGroup_args args = new deleteGroup_args();
+      args.setDomainId(domainId);
       args.setGroupId(groupId);
       sendBase("deleteGroup", args);
     }
@@ -836,15 +858,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteGroup failed: unknown result");
     }
 
-    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
     {
-      send_getGroup(groupId);
+      send_getGroup(domainId, groupId);
       return recv_getGroup();
     }
 
-    public void send_getGroup(String groupId) throws 
org.apache.thrift.TException
+    public void send_getGroup(String domainId, String groupId) throws 
org.apache.thrift.TException
     {
       getGroup_args args = new getGroup_args();
+      args.setDomainId(domainId);
       args.setGroupId(groupId);
       sendBase("getGroup", args);
     }
@@ -887,15 +910,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getGroups failed: unknown result");
     }
 
-    public boolean addUsersToGroup(List<String> userIds, String groupId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean addUsersToGroup(String domainId, List<String> userIds, 
String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_addUsersToGroup(userIds, groupId);
+      send_addUsersToGroup(domainId, userIds, groupId);
       return recv_addUsersToGroup();
     }
 
-    public void send_addUsersToGroup(List<String> userIds, String groupId) 
throws org.apache.thrift.TException
+    public void send_addUsersToGroup(String domainId, List<String> userIds, 
String groupId) throws org.apache.thrift.TException
     {
       addUsersToGroup_args args = new addUsersToGroup_args();
+      args.setDomainId(domainId);
       args.setUserIds(userIds);
       args.setGroupId(groupId);
       sendBase("addUsersToGroup", args);
@@ -914,15 +938,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addUsersToGroup failed: unknown result");
     }
 
-    public boolean removeUsersFromGroup(List<String> userIds, String groupId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean removeUsersFromGroup(String domainId, List<String> userIds, 
String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_removeUsersFromGroup(userIds, groupId);
+      send_removeUsersFromGroup(domainId, userIds, groupId);
       return recv_removeUsersFromGroup();
     }
 
-    public void send_removeUsersFromGroup(List<String> userIds, String 
groupId) throws org.apache.thrift.TException
+    public void send_removeUsersFromGroup(String domainId, List<String> 
userIds, String groupId) throws org.apache.thrift.TException
     {
       removeUsersFromGroup_args args = new removeUsersFromGroup_args();
+      args.setDomainId(domainId);
       args.setUserIds(userIds);
       args.setGroupId(groupId);
       sendBase("removeUsersFromGroup", args);
@@ -941,15 +966,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "removeUsersFromGroup failed: unknown result");
     }
 
-    public List<org.apache.airavata.sharing.registry.models.User> 
getGroupMembersOfTypeUser(String groupId, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.sharing.registry.models.User> 
getGroupMembersOfTypeUser(String domainId, String groupId, int offset, int 
limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getGroupMembersOfTypeUser(groupId, offset, limit);
+      send_getGroupMembersOfTypeUser(domainId, groupId, offset, limit);
       return recv_getGroupMembersOfTypeUser();
     }
 
-    public void send_getGroupMembersOfTypeUser(String groupId, int offset, int 
limit) throws org.apache.thrift.TException
+    public void send_getGroupMembersOfTypeUser(String domainId, String 
groupId, int offset, int limit) throws org.apache.thrift.TException
     {
       getGroupMembersOfTypeUser_args args = new 
getGroupMembersOfTypeUser_args();
+      args.setDomainId(domainId);
       args.setGroupId(groupId);
       args.setOffset(offset);
       args.setLimit(limit);
@@ -969,15 +995,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getGroupMembersOfTypeUser failed: unknown result");
     }
 
-    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getGroupMembersOfTypeGroup(String groupId, int offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getGroupMembersOfTypeGroup(String domainId, String groupId, int offset, int 
limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getGroupMembersOfTypeGroup(groupId, offset, limit);
+      send_getGroupMembersOfTypeGroup(domainId, groupId, offset, limit);
       return recv_getGroupMembersOfTypeGroup();
     }
 
-    public void send_getGroupMembersOfTypeGroup(String groupId, int offset, 
int limit) throws org.apache.thrift.TException
+    public void send_getGroupMembersOfTypeGroup(String domainId, String 
groupId, int offset, int limit) throws org.apache.thrift.TException
     {
       getGroupMembersOfTypeGroup_args args = new 
getGroupMembersOfTypeGroup_args();
+      args.setDomainId(domainId);
       args.setGroupId(groupId);
       args.setOffset(offset);
       args.setLimit(limit);
@@ -997,15 +1024,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getGroupMembersOfTypeGroup failed: unknown result");
     }
 
-    public boolean addChildGroupsToParentGroup(List<String> childIds, String 
groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean addChildGroupsToParentGroup(String domainId, List<String> 
childIds, String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_addChildGroupsToParentGroup(childIds, groupId);
+      send_addChildGroupsToParentGroup(domainId, childIds, groupId);
       return recv_addChildGroupsToParentGroup();
     }
 
-    public void send_addChildGroupsToParentGroup(List<String> childIds, String 
groupId) throws org.apache.thrift.TException
+    public void send_addChildGroupsToParentGroup(String domainId, List<String> 
childIds, String groupId) throws org.apache.thrift.TException
     {
       addChildGroupsToParentGroup_args args = new 
addChildGroupsToParentGroup_args();
+      args.setDomainId(domainId);
       args.setChildIds(childIds);
       args.setGroupId(groupId);
       sendBase("addChildGroupsToParentGroup", args);
@@ -1024,15 +1052,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "addChildGroupsToParentGroup failed: unknown result");
     }
 
-    public boolean removeChildGroupFromParentGroup(String childId, String 
groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean removeChildGroupFromParentGroup(String domainId, String 
childId, String groupId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_removeChildGroupFromParentGroup(childId, groupId);
+      send_removeChildGroupFromParentGroup(domainId, childId, groupId);
       return recv_removeChildGroupFromParentGroup();
     }
 
-    public void send_removeChildGroupFromParentGroup(String childId, String 
groupId) throws org.apache.thrift.TException
+    public void send_removeChildGroupFromParentGroup(String domainId, String 
childId, String groupId) throws org.apache.thrift.TException
     {
       removeChildGroupFromParentGroup_args args = new 
removeChildGroupFromParentGroup_args();
+      args.setDomainId(domainId);
       args.setChildId(childId);
       args.setGroupId(groupId);
       sendBase("removeChildGroupFromParentGroup", args);
@@ -1103,15 +1132,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateEntityType failed: unknown result");
     }
 
-    public boolean deleteEntityType(String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean deleteEntityType(String domainId, String entityTypeId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_deleteEntityType(entityTypeId);
+      send_deleteEntityType(domainId, entityTypeId);
       return recv_deleteEntityType();
     }
 
-    public void send_deleteEntityType(String entityTypeId) throws 
org.apache.thrift.TException
+    public void send_deleteEntityType(String domainId, String entityTypeId) 
throws org.apache.thrift.TException
     {
       deleteEntityType_args args = new deleteEntityType_args();
+      args.setDomainId(domainId);
       args.setEntityTypeId(entityTypeId);
       sendBase("deleteEntityType", args);
     }
@@ -1129,15 +1159,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteEntityType failed: unknown result");
     }
 
-    public org.apache.airavata.sharing.registry.models.EntityType 
getEntityType(String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public org.apache.airavata.sharing.registry.models.EntityType 
getEntityType(String domainId, String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getEntityType(entityTypeId);
+      send_getEntityType(domainId, entityTypeId);
       return recv_getEntityType();
     }
 
-    public void send_getEntityType(String entityTypeId) throws 
org.apache.thrift.TException
+    public void send_getEntityType(String domainId, String entityTypeId) 
throws org.apache.thrift.TException
     {
       getEntityType_args args = new getEntityType_args();
+      args.setDomainId(domainId);
       args.setEntityTypeId(entityTypeId);
       sendBase("getEntityType", args);
     }
@@ -1235,15 +1266,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updateEntity failed: unknown result");
     }
 
-    public boolean deleteEntity(String entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean deleteEntity(String domainId, String entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_deleteEntity(entityId);
+      send_deleteEntity(domainId, entityId);
       return recv_deleteEntity();
     }
 
-    public void send_deleteEntity(String entityId) throws 
org.apache.thrift.TException
+    public void send_deleteEntity(String domainId, String entityId) throws 
org.apache.thrift.TException
     {
       deleteEntity_args args = new deleteEntity_args();
+      args.setDomainId(domainId);
       args.setEntityId(entityId);
       sendBase("deleteEntity", args);
     }
@@ -1261,15 +1293,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deleteEntity failed: unknown result");
     }
 
-    public org.apache.airavata.sharing.registry.models.Entity getEntity(String 
entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public org.apache.airavata.sharing.registry.models.Entity getEntity(String 
domainId, String entityId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getEntity(entityId);
+      send_getEntity(domainId, entityId);
       return recv_getEntity();
     }
 
-    public void send_getEntity(String entityId) throws 
org.apache.thrift.TException
+    public void send_getEntity(String domainId, String entityId) throws 
org.apache.thrift.TException
     {
       getEntity_args args = new getEntity_args();
+      args.setDomainId(domainId);
       args.setEntityId(entityId);
       sendBase("getEntity", args);
     }
@@ -1287,15 +1320,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getEntity failed: unknown result");
     }
 
-    public List<org.apache.airavata.sharing.registry.models.Entity> 
searchEntities(String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.sharing.registry.models.Entity> 
searchEntities(String domainId, String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_searchEntities(userId, entityTypeId, filters, offset, limit);
+      send_searchEntities(domainId, userId, entityTypeId, filters, offset, 
limit);
       return recv_searchEntities();
     }
 
-    public void send_searchEntities(String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit) throws org.apache.thrift.TException
+    public void send_searchEntities(String domainId, String userId, String 
entityTypeId, List<org.apache.airavata.sharing.registry.models.SearchCriteria> 
filters, int offset, int limit) throws org.apache.thrift.TException
     {
       searchEntities_args args = new searchEntities_args();
+      args.setDomainId(domainId);
       args.setUserId(userId);
       args.setEntityTypeId(entityTypeId);
       args.setFilters(filters);
@@ -1317,15 +1351,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "searchEntities failed: unknown result");
     }
 
-    public List<org.apache.airavata.sharing.registry.models.User> 
getListOfSharedUsers(String entityId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.sharing.registry.models.User> 
getListOfSharedUsers(String domainId, String entityId, String permissionTypeId) 
throws org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getListOfSharedUsers(entityId, permissionTypeId);
+      send_getListOfSharedUsers(domainId, entityId, permissionTypeId);
       return recv_getListOfSharedUsers();
     }
 
-    public void send_getListOfSharedUsers(String entityId, String 
permissionTypeId) throws org.apache.thrift.TException
+    public void send_getListOfSharedUsers(String domainId, String entityId, 
String permissionTypeId) throws org.apache.thrift.TException
     {
       getListOfSharedUsers_args args = new getListOfSharedUsers_args();
+      args.setDomainId(domainId);
       args.setEntityId(entityId);
       args.setPermissionTypeId(permissionTypeId);
       sendBase("getListOfSharedUsers", args);
@@ -1344,15 +1379,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "getListOfSharedUsers failed: unknown result");
     }
 
-    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getListOfSharedGroups(String entityId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public List<org.apache.airavata.sharing.registry.models.UserGroup> 
getListOfSharedGroups(String domainId, String entityId, String 
permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getListOfSharedGroups(entityId, permissionTypeId);
+      send_getListOfSharedGroups(domainId, entityId, permissionTypeId);
       return recv_getListOfSharedGroups();
     }
 
-    public void send_getListOfSharedGroups(String entityId, String 
permissionTypeId) throws org.apache.thrift.TException
+    public void send_getListOfSharedGroups(String domainId, String entityId, 
String permissionTypeId) throws org.apache.thrift.TException
     {
       getListOfSharedGroups_args args = new getListOfSharedGroups_args();
+      args.setDomainId(domainId);
       args.setEntityId(entityId);
       args.setPermissionTypeId(permissionTypeId);
       sendBase("getListOfSharedGroups", args);
@@ -1423,16 +1459,17 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "updatePermissionType failed: unknown result");
     }
 
-    public boolean deletePermissionType(String entityTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public boolean deletePermissionType(String domainId, String 
permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_deletePermissionType(entityTypeId);
+      send_deletePermissionType(domainId, permissionTypeId);
       return recv_deletePermissionType();
     }
 
-    public void send_deletePermissionType(String entityTypeId) throws 
org.apache.thrift.TException
+    public void send_deletePermissionType(String domainId, String 
permissionTypeId) throws org.apache.thrift.TException
     {
       deletePermissionType_args args = new deletePermissionType_args();
-      args.setEntityTypeId(entityTypeId);
+      args.setDomainId(domainId);
+      args.setPermissionTypeId(permissionTypeId);
       sendBase("deletePermissionType", args);
     }
 
@@ -1449,15 +1486,16 @@ public class SharingRegistryService {
       throw new 
org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT,
 "deletePermissionType failed: unknown result");
     }
 
-    public org.apache.airavata.sharing.registry.models.PermissionType 
getPermissionType(String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
+    public org.apache.airavata.sharing.registry.models.PermissionType 
getPermissionType(String domainId, String permissionTypeId) throws 
org.apache.airavata.sharing.registry.models.SharingRegistryException, 
org.apache.thrift.TException
     {
-      send_getPermissionType(permissionTypeId);
+      send_getPermissionType(domainId, permissionTypeId);
       return recv_getPermissionType();
     }
 
-    public void send_getPermissionType(String permissionTypeId) throws 
org.apache.thrift.TException
+    public void send_getPermissionType(String domainId, String 
permissionTypeId) throws org.apache.thrift.TException
     {
       getPermissionType_args args = new getPermissionType_args();
+      args.setDomainId(domainId);
       args.setPermissionTypeId(permissionTypeId);
       sendBase("getPermissionType", args);
     }
@@ -1895,23 +1933,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void deleteUser(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void deleteUser(String domainId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      deleteUser_call method_call = new deleteUser_call(userId, resultHandler, 
this, ___protocolFactory, ___transport);
+      deleteUser_call method_call = new deleteUser_call(domainId, userId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteUser_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String userId;
-      public deleteUser_call(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public deleteUser_call(String domainId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.userId = userId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deleteUser", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteUser_args args = new deleteUser_args();
+        args.setDomainId(domainId);
         args.setUserId(userId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -1927,23 +1968,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void getUser(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getUser(String domainId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getUser_call method_call = new getUser_call(userId, resultHandler, this, 
___protocolFactory, ___transport);
+      getUser_call method_call = new getUser_call(domainId, userId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getUser_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String userId;
-      public getUser_call(String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getUser_call(String domainId, String userId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.userId = userId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getUser", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getUser_args args = new getUser_args();
+        args.setDomainId(domainId);
         args.setUserId(userId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2061,23 +2105,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void deleteGroup(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void deleteGroup(String domainId, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      deleteGroup_call method_call = new deleteGroup_call(groupId, 
resultHandler, this, ___protocolFactory, ___transport);
+      deleteGroup_call method_call = new deleteGroup_call(domainId, groupId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String groupId;
-      public deleteGroup_call(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public deleteGroup_call(String domainId, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.groupId = groupId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deleteGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteGroup_args args = new deleteGroup_args();
+        args.setDomainId(domainId);
         args.setGroupId(groupId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2093,23 +2140,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void getGroup(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getGroup(String domainId, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getGroup_call method_call = new getGroup_call(groupId, resultHandler, 
this, ___protocolFactory, ___transport);
+      getGroup_call method_call = new getGroup_call(domainId, groupId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String groupId;
-      public getGroup_call(String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getGroup_call(String domainId, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.groupId = groupId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getGroup_args args = new getGroup_args();
+        args.setDomainId(domainId);
         args.setGroupId(groupId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2163,18 +2213,20 @@ public class SharingRegistryService {
       }
     }
 
-    public void addUsersToGroup(List<String> userIds, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void addUsersToGroup(String domainId, List<String> userIds, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      addUsersToGroup_call method_call = new addUsersToGroup_call(userIds, 
groupId, resultHandler, this, ___protocolFactory, ___transport);
+      addUsersToGroup_call method_call = new addUsersToGroup_call(domainId, 
userIds, groupId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class addUsersToGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private List<String> userIds;
       private String groupId;
-      public addUsersToGroup_call(List<String> userIds, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public addUsersToGroup_call(String domainId, List<String> userIds, 
String groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.userIds = userIds;
         this.groupId = groupId;
       }
@@ -2182,6 +2234,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("addUsersToGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         addUsersToGroup_args args = new addUsersToGroup_args();
+        args.setDomainId(domainId);
         args.setUserIds(userIds);
         args.setGroupId(groupId);
         args.write(prot);
@@ -2198,18 +2251,20 @@ public class SharingRegistryService {
       }
     }
 
-    public void removeUsersFromGroup(List<String> userIds, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void removeUsersFromGroup(String domainId, List<String> userIds, 
String groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
-      removeUsersFromGroup_call method_call = new 
removeUsersFromGroup_call(userIds, groupId, resultHandler, this, 
___protocolFactory, ___transport);
+      removeUsersFromGroup_call method_call = new 
removeUsersFromGroup_call(domainId, userIds, groupId, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class removeUsersFromGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private List<String> userIds;
       private String groupId;
-      public removeUsersFromGroup_call(List<String> userIds, String groupId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public removeUsersFromGroup_call(String domainId, List<String> userIds, 
String groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.userIds = userIds;
         this.groupId = groupId;
       }
@@ -2217,6 +2272,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("removeUsersFromGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         removeUsersFromGroup_args args = new removeUsersFromGroup_args();
+        args.setDomainId(domainId);
         args.setUserIds(userIds);
         args.setGroupId(groupId);
         args.write(prot);
@@ -2233,19 +2289,21 @@ public class SharingRegistryService {
       }
     }
 
-    public void getGroupMembersOfTypeUser(String groupId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getGroupMembersOfTypeUser(String domainId, String groupId, int 
offset, int limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
-      getGroupMembersOfTypeUser_call method_call = new 
getGroupMembersOfTypeUser_call(groupId, offset, limit, resultHandler, this, 
___protocolFactory, ___transport);
+      getGroupMembersOfTypeUser_call method_call = new 
getGroupMembersOfTypeUser_call(domainId, groupId, offset, limit, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getGroupMembersOfTypeUser_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String groupId;
       private int offset;
       private int limit;
-      public getGroupMembersOfTypeUser_call(String groupId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getGroupMembersOfTypeUser_call(String domainId, String groupId, 
int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.groupId = groupId;
         this.offset = offset;
         this.limit = limit;
@@ -2254,6 +2312,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getGroupMembersOfTypeUser", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getGroupMembersOfTypeUser_args args = new 
getGroupMembersOfTypeUser_args();
+        args.setDomainId(domainId);
         args.setGroupId(groupId);
         args.setOffset(offset);
         args.setLimit(limit);
@@ -2271,19 +2330,21 @@ public class SharingRegistryService {
       }
     }
 
-    public void getGroupMembersOfTypeGroup(String groupId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getGroupMembersOfTypeGroup(String domainId, String groupId, 
int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getGroupMembersOfTypeGroup_call method_call = new 
getGroupMembersOfTypeGroup_call(groupId, offset, limit, resultHandler, this, 
___protocolFactory, ___transport);
+      getGroupMembersOfTypeGroup_call method_call = new 
getGroupMembersOfTypeGroup_call(domainId, groupId, offset, limit, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getGroupMembersOfTypeGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String groupId;
       private int offset;
       private int limit;
-      public getGroupMembersOfTypeGroup_call(String groupId, int offset, int 
limit, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getGroupMembersOfTypeGroup_call(String domainId, String groupId, 
int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.groupId = groupId;
         this.offset = offset;
         this.limit = limit;
@@ -2292,6 +2353,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getGroupMembersOfTypeGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getGroupMembersOfTypeGroup_args args = new 
getGroupMembersOfTypeGroup_args();
+        args.setDomainId(domainId);
         args.setGroupId(groupId);
         args.setOffset(offset);
         args.setLimit(limit);
@@ -2309,18 +2371,20 @@ public class SharingRegistryService {
       }
     }
 
-    public void addChildGroupsToParentGroup(List<String> childIds, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void addChildGroupsToParentGroup(String domainId, List<String> 
childIds, String groupId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      addChildGroupsToParentGroup_call method_call = new 
addChildGroupsToParentGroup_call(childIds, groupId, resultHandler, this, 
___protocolFactory, ___transport);
+      addChildGroupsToParentGroup_call method_call = new 
addChildGroupsToParentGroup_call(domainId, childIds, groupId, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class addChildGroupsToParentGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private List<String> childIds;
       private String groupId;
-      public addChildGroupsToParentGroup_call(List<String> childIds, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public addChildGroupsToParentGroup_call(String domainId, List<String> 
childIds, String groupId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.childIds = childIds;
         this.groupId = groupId;
       }
@@ -2328,6 +2392,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("addChildGroupsToParentGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         addChildGroupsToParentGroup_args args = new 
addChildGroupsToParentGroup_args();
+        args.setDomainId(domainId);
         args.setChildIds(childIds);
         args.setGroupId(groupId);
         args.write(prot);
@@ -2344,18 +2409,20 @@ public class SharingRegistryService {
       }
     }
 
-    public void removeChildGroupFromParentGroup(String childId, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void removeChildGroupFromParentGroup(String domainId, String 
childId, String groupId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      removeChildGroupFromParentGroup_call method_call = new 
removeChildGroupFromParentGroup_call(childId, groupId, resultHandler, this, 
___protocolFactory, ___transport);
+      removeChildGroupFromParentGroup_call method_call = new 
removeChildGroupFromParentGroup_call(domainId, childId, groupId, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class removeChildGroupFromParentGroup_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String childId;
       private String groupId;
-      public removeChildGroupFromParentGroup_call(String childId, String 
groupId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public removeChildGroupFromParentGroup_call(String domainId, String 
childId, String groupId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.childId = childId;
         this.groupId = groupId;
       }
@@ -2363,6 +2430,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("removeChildGroupFromParentGroup", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         removeChildGroupFromParentGroup_args args = new 
removeChildGroupFromParentGroup_args();
+        args.setDomainId(domainId);
         args.setChildId(childId);
         args.setGroupId(groupId);
         args.write(prot);
@@ -2443,23 +2511,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void deleteEntityType(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void deleteEntityType(String domainId, String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      deleteEntityType_call method_call = new 
deleteEntityType_call(entityTypeId, resultHandler, this, ___protocolFactory, 
___transport);
+      deleteEntityType_call method_call = new deleteEntityType_call(domainId, 
entityTypeId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteEntityType_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String entityTypeId;
-      public deleteEntityType_call(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public deleteEntityType_call(String domainId, String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.entityTypeId = entityTypeId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deleteEntityType", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteEntityType_args args = new deleteEntityType_args();
+        args.setDomainId(domainId);
         args.setEntityTypeId(entityTypeId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2475,23 +2546,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void getEntityType(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getEntityType(String domainId, String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getEntityType_call method_call = new getEntityType_call(entityTypeId, 
resultHandler, this, ___protocolFactory, ___transport);
+      getEntityType_call method_call = new getEntityType_call(domainId, 
entityTypeId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getEntityType_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String entityTypeId;
-      public getEntityType_call(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getEntityType_call(String domainId, String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.entityTypeId = entityTypeId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getEntityType", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getEntityType_args args = new getEntityType_args();
+        args.setDomainId(domainId);
         args.setEntityTypeId(entityTypeId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2609,23 +2683,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void deleteEntity(String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void deleteEntity(String domainId, String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      deleteEntity_call method_call = new deleteEntity_call(entityId, 
resultHandler, this, ___protocolFactory, ___transport);
+      deleteEntity_call method_call = new deleteEntity_call(domainId, 
entityId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deleteEntity_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String entityId;
-      public deleteEntity_call(String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public deleteEntity_call(String domainId, String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.entityId = entityId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deleteEntity", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         deleteEntity_args args = new deleteEntity_args();
+        args.setDomainId(domainId);
         args.setEntityId(entityId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2641,23 +2718,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void getEntity(String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getEntity(String domainId, String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      getEntity_call method_call = new getEntity_call(entityId, resultHandler, 
this, ___protocolFactory, ___transport);
+      getEntity_call method_call = new getEntity_call(domainId, entityId, 
resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getEntity_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String entityId;
-      public getEntity_call(String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getEntity_call(String domainId, String entityId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.entityId = entityId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getEntity", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getEntity_args args = new getEntity_args();
+        args.setDomainId(domainId);
         args.setEntityId(entityId);
         args.write(prot);
         prot.writeMessageEnd();
@@ -2673,21 +2753,23 @@ public class SharingRegistryService {
       }
     }
 
-    public void searchEntities(String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void searchEntities(String domainId, String userId, String 
entityTypeId, List<org.apache.airavata.sharing.registry.models.SearchCriteria> 
filters, int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      searchEntities_call method_call = new searchEntities_call(userId, 
entityTypeId, filters, offset, limit, resultHandler, this, ___protocolFactory, 
___transport);
+      searchEntities_call method_call = new searchEntities_call(domainId, 
userId, entityTypeId, filters, offset, limit, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class searchEntities_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String userId;
       private String entityTypeId;
       private List<org.apache.airavata.sharing.registry.models.SearchCriteria> 
filters;
       private int offset;
       private int limit;
-      public searchEntities_call(String userId, String entityTypeId, 
List<org.apache.airavata.sharing.registry.models.SearchCriteria> filters, int 
offset, int limit, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public searchEntities_call(String domainId, String userId, String 
entityTypeId, List<org.apache.airavata.sharing.registry.models.SearchCriteria> 
filters, int offset, int limit, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.userId = userId;
         this.entityTypeId = entityTypeId;
         this.filters = filters;
@@ -2698,6 +2780,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("searchEntities", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         searchEntities_args args = new searchEntities_args();
+        args.setDomainId(domainId);
         args.setUserId(userId);
         args.setEntityTypeId(entityTypeId);
         args.setFilters(filters);
@@ -2717,18 +2800,20 @@ public class SharingRegistryService {
       }
     }
 
-    public void getListOfSharedUsers(String entityId, String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getListOfSharedUsers(String domainId, String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
-      getListOfSharedUsers_call method_call = new 
getListOfSharedUsers_call(entityId, permissionTypeId, resultHandler, this, 
___protocolFactory, ___transport);
+      getListOfSharedUsers_call method_call = new 
getListOfSharedUsers_call(domainId, entityId, permissionTypeId, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getListOfSharedUsers_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String entityId;
       private String permissionTypeId;
-      public getListOfSharedUsers_call(String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getListOfSharedUsers_call(String domainId, String entityId, 
String permissionTypeId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.entityId = entityId;
         this.permissionTypeId = permissionTypeId;
       }
@@ -2736,6 +2821,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getListOfSharedUsers", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getListOfSharedUsers_args args = new getListOfSharedUsers_args();
+        args.setDomainId(domainId);
         args.setEntityId(entityId);
         args.setPermissionTypeId(permissionTypeId);
         args.write(prot);
@@ -2752,18 +2838,20 @@ public class SharingRegistryService {
       }
     }
 
-    public void getListOfSharedGroups(String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+    public void getListOfSharedGroups(String domainId, String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
       checkReady();
-      getListOfSharedGroups_call method_call = new 
getListOfSharedGroups_call(entityId, permissionTypeId, resultHandler, this, 
___protocolFactory, ___transport);
+      getListOfSharedGroups_call method_call = new 
getListOfSharedGroups_call(domainId, entityId, permissionTypeId, resultHandler, 
this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class getListOfSharedGroups_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+      private String domainId;
       private String entityId;
       private String permissionTypeId;
-      public getListOfSharedGroups_call(String entityId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      public getListOfSharedGroups_call(String domainId, String entityId, 
String permissionTypeId, org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
+        this.domainId = domainId;
         this.entityId = entityId;
         this.permissionTypeId = permissionTypeId;
       }
@@ -2771,6 +2859,7 @@ public class SharingRegistryService {
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("getListOfSharedGroups", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         getListOfSharedGroups_args args = new getListOfSharedGroups_args();
+        args.setDomainId(domainId);
         args.setEntityId(entityId);
         args.setPermissionTypeId(permissionTypeId);
         args.write(prot);
@@ -2851,24 +2940,27 @@ public class SharingRegistryService {
       }
     }
 
-    public void deletePermissionType(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void deletePermissionType(String domainId, String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
       checkReady();
-      deletePermissionType_call method_call = new 
deletePermissionType_call(entityTypeId, resultHandler, this, 
___protocolFactory, ___transport);
+      deletePermissionType_call method_call = new 
deletePermissionType_call(domainId, permissionTypeId, resultHandler, this, 
___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class deletePermissionType_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-      private String entityTypeId;
-      public deletePermissionType_call(String entityTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+      private String domainId;
+      private String permissionTypeId;
+      public deletePermissionType_call(String domainId, String 
permissionTypeId, org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
-        this.entityTypeId = entityTypeId;
+        this.domainId = domainId;
+        this.permissionTypeId = permissionTypeId;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
         prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("deletePermissionType", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
         deletePermissionType_args args = new deletePermissionType_args();
-        args.setEntityTypeId(entityTypeId);
+        args.setDomainId(domainId);
+        args.setPermissionTypeId(permissionTypeId);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -2883,23 +2975,26 @@ public class SharingRegistryService {
       }
     }
 
-    public void getPermissionType(String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+    public void getPermissionType(String domainId, String permissionTypeId, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 

<TRUNCATED>

Reply via email to