airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] 02/02: AIRAVATA-2835 Regenerate thrift stubs
Date Wed, 20 Jun 2018 15:51:30 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch group-based-auth
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 047c6bffaaa5ecd9671a926e1a555ab806407060
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Wed Jun 20 11:49:01 2018 -0400

    AIRAVATA-2835 Regenerate thrift stubs
---
 .../java/org/apache/airavata/api/Airavata.java     | 841 ++-------------------
 .../resources/lib/airavata/api/Airavata-remote     |  48 +-
 .../main/resources/lib/airavata/api/Airavata.py    | 180 +----
 3 files changed, 126 insertions(+), 943 deletions(-)

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 e4dacb5..e3dd9e0 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
@@ -3056,20 +3056,19 @@ public class Airavata {
      * 
      * @param authzToken
      * @param resourceId
-     * @param resourceType
      * @param userPermissionList
      */
-    public boolean shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata [...]
+    public boolean shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public boolean shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airava [...]
+    public boolean shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TE [...]
 
-    public boolean revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apach [...]
+    public boolean revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.t [...]
 
-    public boolean revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apa [...]
+    public boolean revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache [...]
 
-    public java.util.List<java.lang.String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error [...]
+    public java.util.List<java.lang.String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
-    public java.util.List<java.lang.String> getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.erro [...]
+    public java.util.List<java.lang.String> getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
     public boolean userHasAccess(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException;
 
@@ -3446,17 +3445,17 @@ public class Airavata {
 
     public void getChildDataProducts(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String productUri, org.apache.thrift.async.AsyncMethodCallback<java.util.List<org.apache.airavata.model.data.replica.DataProductModel>> resultHandler) throws org.apache.thrift.TException;
 
-    public void shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
+    public void revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException;
+    public void getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException;
+    public void getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException;
 
     public void userHasAccess(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
@@ -9651,18 +9650,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getChildDataProducts failed: unknown result");
     }
 
-    public boolean shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata [...]
+    public boolean shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_shareResourceWithUsers(authzToken, resourceId, resourceType, userPermissionList);
+      send_shareResourceWithUsers(authzToken, resourceId, userPermissionList);
       return recv_shareResourceWithUsers();
     }
 
-    public void send_shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.thrift.TException
+    public void send_shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.thrift.TException
     {
       shareResourceWithUsers_args args = new shareResourceWithUsers_args();
       args.setAuthzToken(authzToken);
       args.setResourceId(resourceId);
-      args.setResourceType(resourceType);
       args.setUserPermissionList(userPermissionList);
       sendBase("shareResourceWithUsers", args);
     }
@@ -9689,18 +9687,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "shareResourceWithUsers failed: unknown result");
     }
 
-    public boolean shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airava [...]
+    public boolean shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TE [...]
     {
-      send_shareResourceWithGroups(authzToken, resourceId, resourceType, groupPermissionList);
+      send_shareResourceWithGroups(authzToken, resourceId, groupPermissionList);
       return recv_shareResourceWithGroups();
     }
 
-    public void send_shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.thrift.TException
+    public void send_shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.thrift.TException
     {
       shareResourceWithGroups_args args = new shareResourceWithGroups_args();
       args.setAuthzToken(authzToken);
       args.setResourceId(resourceId);
-      args.setResourceType(resourceType);
       args.setGroupPermissionList(groupPermissionList);
       sendBase("shareResourceWithGroups", args);
     }
@@ -9727,18 +9724,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "shareResourceWithGroups failed: unknown result");
     }
 
-    public boolean revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apach [...]
+    public boolean revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.t [...]
     {
-      send_revokeSharingOfResourceFromUsers(authzToken, resourceId, resourceType, userPermissionList);
+      send_revokeSharingOfResourceFromUsers(authzToken, resourceId, userPermissionList);
       return recv_revokeSharingOfResourceFromUsers();
     }
 
-    public void send_revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.thrift.TException
+    public void send_revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList) throws org.apache.thrift.TException
     {
       revokeSharingOfResourceFromUsers_args args = new revokeSharingOfResourceFromUsers_args();
       args.setAuthzToken(authzToken);
       args.setResourceId(resourceId);
-      args.setResourceType(resourceType);
       args.setUserPermissionList(userPermissionList);
       sendBase("revokeSharingOfResourceFromUsers", args);
     }
@@ -9765,18 +9761,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "revokeSharingOfResourceFromUsers failed: unknown result");
     }
 
-    public boolean revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apa [...]
+    public boolean revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache [...]
     {
-      send_revokeSharingOfResourceFromGroups(authzToken, resourceId, resourceType, groupPermissionList);
+      send_revokeSharingOfResourceFromGroups(authzToken, resourceId, groupPermissionList);
       return recv_revokeSharingOfResourceFromGroups();
     }
 
-    public void send_revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.thrift.TException
+    public void send_revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList) throws org.apache.thrift.TException
     {
       revokeSharingOfResourceFromGroups_args args = new revokeSharingOfResourceFromGroups_args();
       args.setAuthzToken(authzToken);
       args.setResourceId(resourceId);
-      args.setResourceType(resourceType);
       args.setGroupPermissionList(groupPermissionList);
       sendBase("revokeSharingOfResourceFromGroups", args);
     }
@@ -9803,18 +9798,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "revokeSharingOfResourceFromGroups failed: unknown result");
     }
 
-    public java.util.List<java.lang.String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error [...]
+    public java.util.List<java.lang.String> getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getAllAccessibleUsers(authzToken, resourceId, resourceType, permissionType);
+      send_getAllAccessibleUsers(authzToken, resourceId, permissionType);
       return recv_getAllAccessibleUsers();
     }
 
-    public void send_getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.thrift.TException
+    public void send_getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.thrift.TException
     {
       getAllAccessibleUsers_args args = new getAllAccessibleUsers_args();
       args.setAuthzToken(authzToken);
       args.setResourceId(resourceId);
-      args.setResourceType(resourceType);
       args.setPermissionType(permissionType);
       sendBase("getAllAccessibleUsers", args);
     }
@@ -9841,18 +9835,17 @@ public class Airavata {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllAccessibleUsers failed: unknown result");
     }
 
-    public java.util.List<java.lang.String> getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.erro [...]
+    public java.util.List<java.lang.String> getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.airavata.model.error.InvalidRequestException, org.apache.airavata.model.error.AiravataClientException, org.apache.airavata.model.error.AiravataSystemException, org.apache.airavata.model.error.AuthorizationException, org.apache.thrift.TException
     {
-      send_getAllAccessibleGroups(authzToken, resourceId, resourceType, permissionType);
+      send_getAllAccessibleGroups(authzToken, resourceId, permissionType);
       return recv_getAllAccessibleGroups();
     }
 
-    public void send_getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.thrift.TException
+    public void send_getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType) throws org.apache.thrift.TException
     {
       getAllAccessibleGroups_args args = new getAllAccessibleGroups_args();
       args.setAuthzToken(authzToken);
       args.setResourceId(resourceId);
-      args.setResourceType(resourceType);
       args.setPermissionType(permissionType);
       sendBase("getAllAccessibleGroups", args);
     }
@@ -16725,9 +16718,9 @@ public class Airavata {
       }
     }
 
-    public void shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
+    public void shareResourceWithUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      shareResourceWithUsers_call method_call = new shareResourceWithUsers_call(authzToken, resourceId, resourceType, userPermissionList, resultHandler, this, ___protocolFactory, ___transport);
+      shareResourceWithUsers_call method_call = new shareResourceWithUsers_call(authzToken, resourceId, userPermissionList, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -16735,13 +16728,11 @@ public class Airavata {
     public static class shareResourceWithUsers_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String resourceId;
-      private org.apache.airavata.model.group.ResourceType resourceType;
       private java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList;
-      public shareResourceWithUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thr [...]
+      public shareResourceWithUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.a [...]
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
-        this.resourceType = resourceType;
         this.userPermissionList = userPermissionList;
       }
 
@@ -16750,7 +16741,6 @@ public class Airavata {
         shareResourceWithUsers_args args = new shareResourceWithUsers_args();
         args.setAuthzToken(authzToken);
         args.setResourceId(resourceId);
-        args.setResourceType(resourceType);
         args.setUserPermissionList(userPermissionList);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16766,9 +16756,9 @@ public class Airavata {
       }
     }
 
-    public void shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
+    public void shareResourceWithGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      shareResourceWithGroups_call method_call = new shareResourceWithGroups_call(authzToken, resourceId, resourceType, groupPermissionList, resultHandler, this, ___protocolFactory, ___transport);
+      shareResourceWithGroups_call method_call = new shareResourceWithGroups_call(authzToken, resourceId, groupPermissionList, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -16776,13 +16766,11 @@ public class Airavata {
     public static class shareResourceWithGroups_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String resourceId;
-      private org.apache.airavata.model.group.ResourceType resourceType;
       private java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList;
-      public shareResourceWithGroups_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.t [...]
+      public shareResourceWithGroups_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org [...]
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
-        this.resourceType = resourceType;
         this.groupPermissionList = groupPermissionList;
       }
 
@@ -16791,7 +16779,6 @@ public class Airavata {
         shareResourceWithGroups_args args = new shareResourceWithGroups_args();
         args.setAuthzToken(authzToken);
         args.setResourceId(resourceId);
-        args.setResourceType(resourceType);
         args.setGroupPermissionList(groupPermissionList);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16807,9 +16794,9 @@ public class Airavata {
       }
     }
 
-    public void revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
+    public void revokeSharingOfResourceFromUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      revokeSharingOfResourceFromUsers_call method_call = new revokeSharingOfResourceFromUsers_call(authzToken, resourceId, resourceType, userPermissionList, resultHandler, this, ___protocolFactory, ___transport);
+      revokeSharingOfResourceFromUsers_call method_call = new revokeSharingOfResourceFromUsers_call(authzToken, resourceId, userPermissionList, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -16817,13 +16804,11 @@ public class Airavata {
     public static class revokeSharingOfResourceFromUsers_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String resourceId;
-      private org.apache.airavata.model.group.ResourceType resourceType;
       private java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList;
-      public revokeSharingOfResourceFromUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org. [...]
+      public revokeSharingOfResourceFromUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) th [...]
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
-        this.resourceType = resourceType;
         this.userPermissionList = userPermissionList;
       }
 
@@ -16832,7 +16817,6 @@ public class Airavata {
         revokeSharingOfResourceFromUsers_args args = new revokeSharingOfResourceFromUsers_args();
         args.setAuthzToken(authzToken);
         args.setResourceId(resourceId);
-        args.setResourceType(resourceType);
         args.setUserPermissionList(userPermissionList);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16848,9 +16832,9 @@ public class Airavata {
       }
     }
 
-    public void revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
+    public void revokeSharingOfResourceFromGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      revokeSharingOfResourceFromGroups_call method_call = new revokeSharingOfResourceFromGroups_call(authzToken, resourceId, resourceType, groupPermissionList, resultHandler, this, ___protocolFactory, ___transport);
+      revokeSharingOfResourceFromGroups_call method_call = new revokeSharingOfResourceFromGroups_call(authzToken, resourceId, groupPermissionList, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -16858,13 +16842,11 @@ public class Airavata {
     public static class revokeSharingOfResourceFromGroups_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String resourceId;
-      private org.apache.airavata.model.group.ResourceType resourceType;
       private java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList;
-      public revokeSharingOfResourceFromGroups_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, or [...]
+      public revokeSharingOfResourceFromGroups_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport)  [...]
         super(client, protocolFactory, transport, resultHandler, false);
         this.authzToken = authzToken;
         this.resourceId = resourceId;
-        this.resourceType = resourceType;
         this.groupPermissionList = groupPermissionList;
       }
 
@@ -16873,7 +16855,6 @@ public class Airavata {
         revokeSharingOfResourceFromGroups_args args = new revokeSharingOfResourceFromGroups_args();
         args.setAuthzToken(authzToken);
         args.setResourceId(resourceId);
-        args.setResourceType(resourceType);
         args.setGroupPermissionList(groupPermissionList);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16889,9 +16870,9 @@ public class Airavata {
       }
     }
 
-    public void getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
+    public void getAllAccessibleUsers(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getAllAccessibleUsers_call method_call = new getAllAccessibleUsers_call(authzToken, resourceId, resourceType, permissionType, resultHandler, this, ___protocolFactory, ___transport);
+      getAllAccessibleUsers_call method_call = new getAllAccessibleUsers_call(authzToken, resourceId, permissionType, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -16899,13 +16880,11 @@ public class Airavata {
     public static class getAllAccessibleUsers_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<java.lang.String>> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String resourceId;
-      private org.apache.airavata.model.group.ResourceType resourceType;
       private org.apache.airavata.model.group.ResourcePermissionType permissionType;
-      public getAllAccessibleUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonbloc [...]
+      public getAllAccessibleUsers_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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.authzToken = authzToken;
         this.resourceId = resourceId;
-        this.resourceType = resourceType;
         this.permissionType = permissionType;
       }
 
@@ -16914,7 +16893,6 @@ public class Airavata {
         getAllAccessibleUsers_args args = new getAllAccessibleUsers_args();
         args.setAuthzToken(authzToken);
         args.setResourceId(resourceId);
-        args.setResourceType(resourceType);
         args.setPermissionType(permissionType);
         args.write(prot);
         prot.writeMessageEnd();
@@ -16930,9 +16908,9 @@ public class Airavata {
       }
     }
 
-    public void getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
+    public void getAllAccessibleGroups(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getAllAccessibleGroups_call method_call = new getAllAccessibleGroups_call(authzToken, resourceId, resourceType, permissionType, resultHandler, this, ___protocolFactory, ___transport);
+      getAllAccessibleGroups_call method_call = new getAllAccessibleGroups_call(authzToken, resourceId, permissionType, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -16940,13 +16918,11 @@ public class Airavata {
     public static class getAllAccessibleGroups_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<java.lang.String>> {
       private org.apache.airavata.model.security.AuthzToken authzToken;
       private java.lang.String resourceId;
-      private org.apache.airavata.model.group.ResourceType resourceType;
       private org.apache.airavata.model.group.ResourcePermissionType permissionType;
-      public getAllAccessibleGroups_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourceType resourceType, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblo [...]
+      public getAllAccessibleGroups_call(org.apache.airavata.model.security.AuthzToken authzToken, java.lang.String resourceId, org.apache.airavata.model.group.ResourcePermissionType permissionType, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> 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.authzToken = authzToken;
         this.resourceId = resourceId;
-        this.resourceType = resourceType;
         this.permissionType = permissionType;
       }
 
@@ -16955,7 +16931,6 @@ public class Airavata {
         getAllAccessibleGroups_args args = new getAllAccessibleGroups_args();
         args.setAuthzToken(authzToken);
         args.setResourceId(resourceId);
-        args.setResourceType(resourceType);
         args.setPermissionType(permissionType);
         args.write(prot);
         prot.writeMessageEnd();
@@ -22835,7 +22810,7 @@ public class Airavata {
       public shareResourceWithUsers_result getResult(I iface, shareResourceWithUsers_args args) throws org.apache.thrift.TException {
         shareResourceWithUsers_result result = new shareResourceWithUsers_result();
         try {
-          result.success = iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList);
+          result.success = iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.userPermissionList);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -22866,7 +22841,7 @@ public class Airavata {
       public shareResourceWithGroups_result getResult(I iface, shareResourceWithGroups_args args) throws org.apache.thrift.TException {
         shareResourceWithGroups_result result = new shareResourceWithGroups_result();
         try {
-          result.success = iface.shareResourceWithGroups(args.authzToken, args.resourceId, args.resourceType, args.groupPermissionList);
+          result.success = iface.shareResourceWithGroups(args.authzToken, args.resourceId, args.groupPermissionList);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -22897,7 +22872,7 @@ public class Airavata {
       public revokeSharingOfResourceFromUsers_result getResult(I iface, revokeSharingOfResourceFromUsers_args args) throws org.apache.thrift.TException {
         revokeSharingOfResourceFromUsers_result result = new revokeSharingOfResourceFromUsers_result();
         try {
-          result.success = iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList);
+          result.success = iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.userPermissionList);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -22928,7 +22903,7 @@ public class Airavata {
       public revokeSharingOfResourceFromGroups_result getResult(I iface, revokeSharingOfResourceFromGroups_args args) throws org.apache.thrift.TException {
         revokeSharingOfResourceFromGroups_result result = new revokeSharingOfResourceFromGroups_result();
         try {
-          result.success = iface.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.resourceType, args.groupPermissionList);
+          result.success = iface.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.groupPermissionList);
           result.setSuccessIsSet(true);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
@@ -22959,7 +22934,7 @@ public class Airavata {
       public getAllAccessibleUsers_result getResult(I iface, getAllAccessibleUsers_args args) throws org.apache.thrift.TException {
         getAllAccessibleUsers_result result = new getAllAccessibleUsers_result();
         try {
-          result.success = iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.resourceType, args.permissionType);
+          result.success = iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.permissionType);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -22989,7 +22964,7 @@ public class Airavata {
       public getAllAccessibleGroups_result getResult(I iface, getAllAccessibleGroups_args args) throws org.apache.thrift.TException {
         getAllAccessibleGroups_result result = new getAllAccessibleGroups_result();
         try {
-          result.success = iface.getAllAccessibleGroups(args.authzToken, args.resourceId, args.resourceType, args.permissionType);
+          result.success = iface.getAllAccessibleGroups(args.authzToken, args.resourceId, args.permissionType);
         } catch (org.apache.airavata.model.error.InvalidRequestException ire) {
           result.ire = ire;
         } catch (org.apache.airavata.model.error.AiravataClientException ace) {
@@ -36695,7 +36670,7 @@ public class Airavata {
       }
 
       public void start(I iface, shareResourceWithUsers_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
-        iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList,resultHandler);
+        iface.shareResourceWithUsers(args.authzToken, args.resourceId, args.userPermissionList,resultHandler);
       }
     }
 
@@ -36773,7 +36748,7 @@ public class Airavata {
       }
 
       public void start(I iface, shareResourceWithGroups_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
-        iface.shareResourceWithGroups(args.authzToken, args.resourceId, args.resourceType, args.groupPermissionList,resultHandler);
+        iface.shareResourceWithGroups(args.authzToken, args.resourceId, args.groupPermissionList,resultHandler);
       }
     }
 
@@ -36851,7 +36826,7 @@ public class Airavata {
       }
 
       public void start(I iface, revokeSharingOfResourceFromUsers_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
-        iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList,resultHandler);
+        iface.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.userPermissionList,resultHandler);
       }
     }
 
@@ -36929,7 +36904,7 @@ public class Airavata {
       }
 
       public void start(I iface, revokeSharingOfResourceFromGroups_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
-        iface.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.resourceType, args.groupPermissionList,resultHandler);
+        iface.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.groupPermissionList,resultHandler);
       }
     }
 
@@ -37006,7 +36981,7 @@ public class Airavata {
       }
 
       public void start(I iface, getAllAccessibleUsers_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
-        iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.resourceType, args.permissionType,resultHandler);
+        iface.getAllAccessibleUsers(args.authzToken, args.resourceId, args.permissionType,resultHandler);
       }
     }
 
@@ -37083,7 +37058,7 @@ public class Airavata {
       }
 
       public void start(I iface, getAllAccessibleGroups_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<java.lang.String>> resultHandler) throws org.apache.thrift.TException {
-        iface.getAllAccessibleGroups(args.authzToken, args.resourceId, args.resourceType, args.permissionType,resultHandler);
+        iface.getAllAccessibleGroups(args.authzToken, args.resourceId, args.permissionType,resultHandler);
       }
     }
 
@@ -262460,7 +262435,6 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField USER_PERMISSION_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("userPermissionList", org.apache.thrift.protocol.TType.MAP, (short)4);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shareResourceWithUsers_argsStandardSchemeFactory();
@@ -262468,22 +262442,12 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String resourceId; // required
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType resourceType; // required
     public java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
       RESOURCE_ID((short)2, "resourceId"),
-      /**
-       * 
-       * @see org.apache.airavata.model.group.ResourceType
-       */
-      RESOURCE_TYPE((short)3, "resourceType"),
       USER_PERMISSION_LIST((short)4, "userPermissionList");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -262503,8 +262467,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // RESOURCE_ID
             return RESOURCE_ID;
-          case 3: // RESOURCE_TYPE
-            return RESOURCE_TYPE;
           case 4: // USER_PERMISSION_LIST
             return USER_PERMISSION_LIST;
           default:
@@ -262554,8 +262516,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourceType.class)));
       tmpMap.put(_Fields.USER_PERMISSION_LIST, new org.apache.thrift.meta_data.FieldMetaData("userPermissionList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
@@ -262570,13 +262530,11 @@ public class Airavata {
     public shareResourceWithUsers_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String resourceId,
-      org.apache.airavata.model.group.ResourceType resourceType,
       java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList)
     {
       this();
       this.authzToken = authzToken;
       this.resourceId = resourceId;
-      this.resourceType = resourceType;
       this.userPermissionList = userPermissionList;
     }
 
@@ -262590,9 +262548,6 @@ public class Airavata {
       if (other.isSetResourceId()) {
         this.resourceId = other.resourceId;
       }
-      if (other.isSetResourceType()) {
-        this.resourceType = other.resourceType;
-      }
       if (other.isSetUserPermissionList()) {
         java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> __this__userPermissionList = new java.util.HashMap<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType>(other.userPermissionList.size());
         for (java.util.Map.Entry<java.lang.String, org.apache.airavata.model.group.ResourcePermissionType> other_element : other.userPermissionList.entrySet()) {
@@ -262618,7 +262573,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.resourceId = null;
-      this.resourceType = null;
       this.userPermissionList = null;
     }
 
@@ -262670,38 +262624,6 @@ public class Airavata {
       }
     }
 
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType getResourceType() {
-      return this.resourceType;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public shareResourceWithUsers_args setResourceType(org.apache.airavata.model.group.ResourceType resourceType) {
-      this.resourceType = resourceType;
-      return this;
-    }
-
-    public void unsetResourceType() {
-      this.resourceType = null;
-    }
-
-    /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceType() {
-      return this.resourceType != null;
-    }
-
-    public void setResourceTypeIsSet(boolean value) {
-      if (!value) {
-        this.resourceType = null;
-      }
-    }
-
     public int getUserPermissionListSize() {
       return (this.userPermissionList == null) ? 0 : this.userPermissionList.size();
     }
@@ -262755,14 +262677,6 @@ public class Airavata {
         }
         break;
 
-      case RESOURCE_TYPE:
-        if (value == null) {
-          unsetResourceType();
-        } else {
-          setResourceType((org.apache.airavata.model.group.ResourceType)value);
-        }
-        break;
-
       case USER_PERMISSION_LIST:
         if (value == null) {
           unsetUserPermissionList();
@@ -262782,9 +262696,6 @@ public class Airavata {
       case RESOURCE_ID:
         return getResourceId();
 
-      case RESOURCE_TYPE:
-        return getResourceType();
-
       case USER_PERMISSION_LIST:
         return getUserPermissionList();
 
@@ -262803,8 +262714,6 @@ public class Airavata {
         return isSetAuthzToken();
       case RESOURCE_ID:
         return isSetResourceId();
-      case RESOURCE_TYPE:
-        return isSetResourceType();
       case USER_PERMISSION_LIST:
         return isSetUserPermissionList();
       }
@@ -262844,15 +262753,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_resourceType = true && this.isSetResourceType();
-      boolean that_present_resourceType = true && that.isSetResourceType();
-      if (this_present_resourceType || that_present_resourceType) {
-        if (!(this_present_resourceType && that_present_resourceType))
-          return false;
-        if (!this.resourceType.equals(that.resourceType))
-          return false;
-      }
-
       boolean this_present_userPermissionList = true && this.isSetUserPermissionList();
       boolean that_present_userPermissionList = true && that.isSetUserPermissionList();
       if (this_present_userPermissionList || that_present_userPermissionList) {
@@ -262877,10 +262777,6 @@ public class Airavata {
       if (isSetResourceId())
         hashCode = hashCode * 8191 + resourceId.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetResourceType()) ? 131071 : 524287);
-      if (isSetResourceType())
-        hashCode = hashCode * 8191 + resourceType.getValue();
-
       hashCode = hashCode * 8191 + ((isSetUserPermissionList()) ? 131071 : 524287);
       if (isSetUserPermissionList())
         hashCode = hashCode * 8191 + userPermissionList.hashCode();
@@ -262916,16 +262812,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetUserPermissionList()).compareTo(other.isSetUserPermissionList());
       if (lastComparison != 0) {
         return lastComparison;
@@ -262972,14 +262858,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceType:");
-      if (this.resourceType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceType);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("userPermissionList:");
       if (this.userPermissionList == null) {
         sb.append("null");
@@ -262999,9 +262877,6 @@ public class Airavata {
       if (resourceId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
       }
-      if (resourceType == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceType' was not present! Struct: " + toString());
-      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -263059,14 +262934,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // RESOURCE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-                struct.setResourceTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 4: // USER_PERMISSION_LIST
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
@@ -263112,11 +262979,6 @@ public class Airavata {
           oprot.writeString(struct.resourceId);
           oprot.writeFieldEnd();
         }
-        if (struct.resourceType != null) {
-          oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.resourceType.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.userPermissionList != null) {
           oprot.writeFieldBegin(USER_PERMISSION_LIST_FIELD_DESC);
           {
@@ -263149,7 +263011,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.resourceId);
-        oprot.writeI32(struct.resourceType.getValue());
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserPermissionList()) {
           optionals.set(0);
@@ -263175,8 +263036,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.resourceId = iprot.readString();
         struct.setResourceIdIsSet(true);
-        struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
@@ -263990,7 +263849,6 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField GROUP_PERMISSION_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("groupPermissionList", org.apache.thrift.protocol.TType.MAP, (short)4);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new shareResourceWithGroups_argsStandardSchemeFactory();
@@ -263998,22 +263856,12 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String resourceId; // required
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType resourceType; // required
     public java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
       RESOURCE_ID((short)2, "resourceId"),
-      /**
-       * 
-       * @see org.apache.airavata.model.group.ResourceType
-       */
-      RESOURCE_TYPE((short)3, "resourceType"),
       GROUP_PERMISSION_LIST((short)4, "groupPermissionList");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -264033,8 +263881,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // RESOURCE_ID
             return RESOURCE_ID;
-          case 3: // RESOURCE_TYPE
-            return RESOURCE_TYPE;
           case 4: // GROUP_PERMISSION_LIST
             return GROUP_PERMISSION_LIST;
           default:
@@ -264084,8 +263930,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourceType.class)));
       tmpMap.put(_Fields.GROUP_PERMISSION_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupPermissionList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
@@ -264100,13 +263944,11 @@ public class Airavata {
     public shareResourceWithGroups_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String resourceId,
-      org.apache.airavata.model.group.ResourceType resourceType,
       java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList)
     {
       this();
       this.authzToken = authzToken;
       this.resourceId = resourceId;
-      this.resourceType = resourceType;
       this.groupPermissionList = groupPermissionList;
     }
 
@@ -264120,9 +263962,6 @@ public class Airavata {
       if (other.isSetResourceId()) {
         this.resourceId = other.resourceId;
       }
-      if (other.isSetResourceType()) {
-        this.resourceType = other.resourceType;
-      }
       if (other.isSetGroupPermissionList()) {
         java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> __this__groupPermissionList = new java.util.HashMap<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType>(other.groupPermissionList.size());
         for (java.util.Map.Entry<java.lang.String, org.apache.airavata.model.group.ResourcePermissionType> other_element : other.groupPermissionList.entrySet()) {
@@ -264148,7 +263987,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.resourceId = null;
-      this.resourceType = null;
       this.groupPermissionList = null;
     }
 
@@ -264200,38 +264038,6 @@ public class Airavata {
       }
     }
 
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType getResourceType() {
-      return this.resourceType;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public shareResourceWithGroups_args setResourceType(org.apache.airavata.model.group.ResourceType resourceType) {
-      this.resourceType = resourceType;
-      return this;
-    }
-
-    public void unsetResourceType() {
-      this.resourceType = null;
-    }
-
-    /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceType() {
-      return this.resourceType != null;
-    }
-
-    public void setResourceTypeIsSet(boolean value) {
-      if (!value) {
-        this.resourceType = null;
-      }
-    }
-
     public int getGroupPermissionListSize() {
       return (this.groupPermissionList == null) ? 0 : this.groupPermissionList.size();
     }
@@ -264285,14 +264091,6 @@ public class Airavata {
         }
         break;
 
-      case RESOURCE_TYPE:
-        if (value == null) {
-          unsetResourceType();
-        } else {
-          setResourceType((org.apache.airavata.model.group.ResourceType)value);
-        }
-        break;
-
       case GROUP_PERMISSION_LIST:
         if (value == null) {
           unsetGroupPermissionList();
@@ -264312,9 +264110,6 @@ public class Airavata {
       case RESOURCE_ID:
         return getResourceId();
 
-      case RESOURCE_TYPE:
-        return getResourceType();
-
       case GROUP_PERMISSION_LIST:
         return getGroupPermissionList();
 
@@ -264333,8 +264128,6 @@ public class Airavata {
         return isSetAuthzToken();
       case RESOURCE_ID:
         return isSetResourceId();
-      case RESOURCE_TYPE:
-        return isSetResourceType();
       case GROUP_PERMISSION_LIST:
         return isSetGroupPermissionList();
       }
@@ -264374,15 +264167,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_resourceType = true && this.isSetResourceType();
-      boolean that_present_resourceType = true && that.isSetResourceType();
-      if (this_present_resourceType || that_present_resourceType) {
-        if (!(this_present_resourceType && that_present_resourceType))
-          return false;
-        if (!this.resourceType.equals(that.resourceType))
-          return false;
-      }
-
       boolean this_present_groupPermissionList = true && this.isSetGroupPermissionList();
       boolean that_present_groupPermissionList = true && that.isSetGroupPermissionList();
       if (this_present_groupPermissionList || that_present_groupPermissionList) {
@@ -264407,10 +264191,6 @@ public class Airavata {
       if (isSetResourceId())
         hashCode = hashCode * 8191 + resourceId.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetResourceType()) ? 131071 : 524287);
-      if (isSetResourceType())
-        hashCode = hashCode * 8191 + resourceType.getValue();
-
       hashCode = hashCode * 8191 + ((isSetGroupPermissionList()) ? 131071 : 524287);
       if (isSetGroupPermissionList())
         hashCode = hashCode * 8191 + groupPermissionList.hashCode();
@@ -264446,16 +264226,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetGroupPermissionList()).compareTo(other.isSetGroupPermissionList());
       if (lastComparison != 0) {
         return lastComparison;
@@ -264502,14 +264272,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceType:");
-      if (this.resourceType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceType);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("groupPermissionList:");
       if (this.groupPermissionList == null) {
         sb.append("null");
@@ -264529,9 +264291,6 @@ public class Airavata {
       if (resourceId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
       }
-      if (resourceType == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceType' was not present! Struct: " + toString());
-      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -264589,14 +264348,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // RESOURCE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-                struct.setResourceTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 4: // GROUP_PERMISSION_LIST
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
@@ -264642,11 +264393,6 @@ public class Airavata {
           oprot.writeString(struct.resourceId);
           oprot.writeFieldEnd();
         }
-        if (struct.resourceType != null) {
-          oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.resourceType.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.groupPermissionList != null) {
           oprot.writeFieldBegin(GROUP_PERMISSION_LIST_FIELD_DESC);
           {
@@ -264679,7 +264425,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.resourceId);
-        oprot.writeI32(struct.resourceType.getValue());
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetGroupPermissionList()) {
           optionals.set(0);
@@ -264705,8 +264450,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.resourceId = iprot.readString();
         struct.setResourceIdIsSet(true);
-        struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
@@ -265520,7 +265263,6 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField USER_PERMISSION_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("userPermissionList", org.apache.thrift.protocol.TType.MAP, (short)4);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new revokeSharingOfResourceFromUsers_argsStandardSchemeFactory();
@@ -265528,22 +265270,12 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String resourceId; // required
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType resourceType; // required
     public java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
       RESOURCE_ID((short)2, "resourceId"),
-      /**
-       * 
-       * @see org.apache.airavata.model.group.ResourceType
-       */
-      RESOURCE_TYPE((short)3, "resourceType"),
       USER_PERMISSION_LIST((short)4, "userPermissionList");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -265563,8 +265295,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // RESOURCE_ID
             return RESOURCE_ID;
-          case 3: // RESOURCE_TYPE
-            return RESOURCE_TYPE;
           case 4: // USER_PERMISSION_LIST
             return USER_PERMISSION_LIST;
           default:
@@ -265614,8 +265344,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourceType.class)));
       tmpMap.put(_Fields.USER_PERMISSION_LIST, new org.apache.thrift.meta_data.FieldMetaData("userPermissionList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
@@ -265630,13 +265358,11 @@ public class Airavata {
     public revokeSharingOfResourceFromUsers_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String resourceId,
-      org.apache.airavata.model.group.ResourceType resourceType,
       java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> userPermissionList)
     {
       this();
       this.authzToken = authzToken;
       this.resourceId = resourceId;
-      this.resourceType = resourceType;
       this.userPermissionList = userPermissionList;
     }
 
@@ -265650,9 +265376,6 @@ public class Airavata {
       if (other.isSetResourceId()) {
         this.resourceId = other.resourceId;
       }
-      if (other.isSetResourceType()) {
-        this.resourceType = other.resourceType;
-      }
       if (other.isSetUserPermissionList()) {
         java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> __this__userPermissionList = new java.util.HashMap<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType>(other.userPermissionList.size());
         for (java.util.Map.Entry<java.lang.String, org.apache.airavata.model.group.ResourcePermissionType> other_element : other.userPermissionList.entrySet()) {
@@ -265678,7 +265401,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.resourceId = null;
-      this.resourceType = null;
       this.userPermissionList = null;
     }
 
@@ -265730,38 +265452,6 @@ public class Airavata {
       }
     }
 
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType getResourceType() {
-      return this.resourceType;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public revokeSharingOfResourceFromUsers_args setResourceType(org.apache.airavata.model.group.ResourceType resourceType) {
-      this.resourceType = resourceType;
-      return this;
-    }
-
-    public void unsetResourceType() {
-      this.resourceType = null;
-    }
-
-    /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceType() {
-      return this.resourceType != null;
-    }
-
-    public void setResourceTypeIsSet(boolean value) {
-      if (!value) {
-        this.resourceType = null;
-      }
-    }
-
     public int getUserPermissionListSize() {
       return (this.userPermissionList == null) ? 0 : this.userPermissionList.size();
     }
@@ -265815,14 +265505,6 @@ public class Airavata {
         }
         break;
 
-      case RESOURCE_TYPE:
-        if (value == null) {
-          unsetResourceType();
-        } else {
-          setResourceType((org.apache.airavata.model.group.ResourceType)value);
-        }
-        break;
-
       case USER_PERMISSION_LIST:
         if (value == null) {
           unsetUserPermissionList();
@@ -265842,9 +265524,6 @@ public class Airavata {
       case RESOURCE_ID:
         return getResourceId();
 
-      case RESOURCE_TYPE:
-        return getResourceType();
-
       case USER_PERMISSION_LIST:
         return getUserPermissionList();
 
@@ -265863,8 +265542,6 @@ public class Airavata {
         return isSetAuthzToken();
       case RESOURCE_ID:
         return isSetResourceId();
-      case RESOURCE_TYPE:
-        return isSetResourceType();
       case USER_PERMISSION_LIST:
         return isSetUserPermissionList();
       }
@@ -265904,15 +265581,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_resourceType = true && this.isSetResourceType();
-      boolean that_present_resourceType = true && that.isSetResourceType();
-      if (this_present_resourceType || that_present_resourceType) {
-        if (!(this_present_resourceType && that_present_resourceType))
-          return false;
-        if (!this.resourceType.equals(that.resourceType))
-          return false;
-      }
-
       boolean this_present_userPermissionList = true && this.isSetUserPermissionList();
       boolean that_present_userPermissionList = true && that.isSetUserPermissionList();
       if (this_present_userPermissionList || that_present_userPermissionList) {
@@ -265937,10 +265605,6 @@ public class Airavata {
       if (isSetResourceId())
         hashCode = hashCode * 8191 + resourceId.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetResourceType()) ? 131071 : 524287);
-      if (isSetResourceType())
-        hashCode = hashCode * 8191 + resourceType.getValue();
-
       hashCode = hashCode * 8191 + ((isSetUserPermissionList()) ? 131071 : 524287);
       if (isSetUserPermissionList())
         hashCode = hashCode * 8191 + userPermissionList.hashCode();
@@ -265976,16 +265640,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetUserPermissionList()).compareTo(other.isSetUserPermissionList());
       if (lastComparison != 0) {
         return lastComparison;
@@ -266032,14 +265686,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceType:");
-      if (this.resourceType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceType);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("userPermissionList:");
       if (this.userPermissionList == null) {
         sb.append("null");
@@ -266059,9 +265705,6 @@ public class Airavata {
       if (resourceId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
       }
-      if (resourceType == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceType' was not present! Struct: " + toString());
-      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -266119,14 +265762,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // RESOURCE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-                struct.setResourceTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 4: // USER_PERMISSION_LIST
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
@@ -266172,11 +265807,6 @@ public class Airavata {
           oprot.writeString(struct.resourceId);
           oprot.writeFieldEnd();
         }
-        if (struct.resourceType != null) {
-          oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.resourceType.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.userPermissionList != null) {
           oprot.writeFieldBegin(USER_PERMISSION_LIST_FIELD_DESC);
           {
@@ -266209,7 +265839,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.resourceId);
-        oprot.writeI32(struct.resourceType.getValue());
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserPermissionList()) {
           optionals.set(0);
@@ -266235,8 +265864,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.resourceId = iprot.readString();
         struct.setResourceIdIsSet(true);
-        struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
@@ -267050,7 +266677,6 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField GROUP_PERMISSION_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("groupPermissionList", org.apache.thrift.protocol.TType.MAP, (short)4);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new revokeSharingOfResourceFromGroups_argsStandardSchemeFactory();
@@ -267058,22 +266684,12 @@ public class Airavata {
 
     public org.apache.airavata.model.security.AuthzToken authzToken; // required
     public java.lang.String resourceId; // required
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType resourceType; // required
     public java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTHZ_TOKEN((short)1, "authzToken"),
       RESOURCE_ID((short)2, "resourceId"),
-      /**
-       * 
-       * @see org.apache.airavata.model.group.ResourceType
-       */
-      RESOURCE_TYPE((short)3, "resourceType"),
       GROUP_PERMISSION_LIST((short)4, "groupPermissionList");
 
       private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
@@ -267093,8 +266709,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // RESOURCE_ID
             return RESOURCE_ID;
-          case 3: // RESOURCE_TYPE
-            return RESOURCE_TYPE;
           case 4: // GROUP_PERMISSION_LIST
             return GROUP_PERMISSION_LIST;
           default:
@@ -267144,8 +266758,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourceType.class)));
       tmpMap.put(_Fields.GROUP_PERMISSION_LIST, new org.apache.thrift.meta_data.FieldMetaData("groupPermissionList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
@@ -267160,13 +266772,11 @@ public class Airavata {
     public revokeSharingOfResourceFromGroups_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String resourceId,
-      org.apache.airavata.model.group.ResourceType resourceType,
       java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> groupPermissionList)
     {
       this();
       this.authzToken = authzToken;
       this.resourceId = resourceId;
-      this.resourceType = resourceType;
       this.groupPermissionList = groupPermissionList;
     }
 
@@ -267180,9 +266790,6 @@ public class Airavata {
       if (other.isSetResourceId()) {
         this.resourceId = other.resourceId;
       }
-      if (other.isSetResourceType()) {
-        this.resourceType = other.resourceType;
-      }
       if (other.isSetGroupPermissionList()) {
         java.util.Map<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType> __this__groupPermissionList = new java.util.HashMap<java.lang.String,org.apache.airavata.model.group.ResourcePermissionType>(other.groupPermissionList.size());
         for (java.util.Map.Entry<java.lang.String, org.apache.airavata.model.group.ResourcePermissionType> other_element : other.groupPermissionList.entrySet()) {
@@ -267208,7 +266815,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.resourceId = null;
-      this.resourceType = null;
       this.groupPermissionList = null;
     }
 
@@ -267260,38 +266866,6 @@ public class Airavata {
       }
     }
 
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType getResourceType() {
-      return this.resourceType;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public revokeSharingOfResourceFromGroups_args setResourceType(org.apache.airavata.model.group.ResourceType resourceType) {
-      this.resourceType = resourceType;
-      return this;
-    }
-
-    public void unsetResourceType() {
-      this.resourceType = null;
-    }
-
-    /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceType() {
-      return this.resourceType != null;
-    }
-
-    public void setResourceTypeIsSet(boolean value) {
-      if (!value) {
-        this.resourceType = null;
-      }
-    }
-
     public int getGroupPermissionListSize() {
       return (this.groupPermissionList == null) ? 0 : this.groupPermissionList.size();
     }
@@ -267345,14 +266919,6 @@ public class Airavata {
         }
         break;
 
-      case RESOURCE_TYPE:
-        if (value == null) {
-          unsetResourceType();
-        } else {
-          setResourceType((org.apache.airavata.model.group.ResourceType)value);
-        }
-        break;
-
       case GROUP_PERMISSION_LIST:
         if (value == null) {
           unsetGroupPermissionList();
@@ -267372,9 +266938,6 @@ public class Airavata {
       case RESOURCE_ID:
         return getResourceId();
 
-      case RESOURCE_TYPE:
-        return getResourceType();
-
       case GROUP_PERMISSION_LIST:
         return getGroupPermissionList();
 
@@ -267393,8 +266956,6 @@ public class Airavata {
         return isSetAuthzToken();
       case RESOURCE_ID:
         return isSetResourceId();
-      case RESOURCE_TYPE:
-        return isSetResourceType();
       case GROUP_PERMISSION_LIST:
         return isSetGroupPermissionList();
       }
@@ -267434,15 +266995,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_resourceType = true && this.isSetResourceType();
-      boolean that_present_resourceType = true && that.isSetResourceType();
-      if (this_present_resourceType || that_present_resourceType) {
-        if (!(this_present_resourceType && that_present_resourceType))
-          return false;
-        if (!this.resourceType.equals(that.resourceType))
-          return false;
-      }
-
       boolean this_present_groupPermissionList = true && this.isSetGroupPermissionList();
       boolean that_present_groupPermissionList = true && that.isSetGroupPermissionList();
       if (this_present_groupPermissionList || that_present_groupPermissionList) {
@@ -267467,10 +267019,6 @@ public class Airavata {
       if (isSetResourceId())
         hashCode = hashCode * 8191 + resourceId.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetResourceType()) ? 131071 : 524287);
-      if (isSetResourceType())
-        hashCode = hashCode * 8191 + resourceType.getValue();
-
       hashCode = hashCode * 8191 + ((isSetGroupPermissionList()) ? 131071 : 524287);
       if (isSetGroupPermissionList())
         hashCode = hashCode * 8191 + groupPermissionList.hashCode();
@@ -267506,16 +267054,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetGroupPermissionList()).compareTo(other.isSetGroupPermissionList());
       if (lastComparison != 0) {
         return lastComparison;
@@ -267562,14 +267100,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceType:");
-      if (this.resourceType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceType);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("groupPermissionList:");
       if (this.groupPermissionList == null) {
         sb.append("null");
@@ -267589,9 +267119,6 @@ public class Airavata {
       if (resourceId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
       }
-      if (resourceType == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceType' was not present! Struct: " + toString());
-      }
       // check for sub-struct validity
       if (authzToken != null) {
         authzToken.validate();
@@ -267649,14 +267176,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // RESOURCE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-                struct.setResourceTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 4: // GROUP_PERMISSION_LIST
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
@@ -267702,11 +267221,6 @@ public class Airavata {
           oprot.writeString(struct.resourceId);
           oprot.writeFieldEnd();
         }
-        if (struct.resourceType != null) {
-          oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.resourceType.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.groupPermissionList != null) {
           oprot.writeFieldBegin(GROUP_PERMISSION_LIST_FIELD_DESC);
           {
@@ -267739,7 +267253,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.resourceId);
-        oprot.writeI32(struct.resourceType.getValue());
         java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetGroupPermissionList()) {
           optionals.set(0);
@@ -267765,8 +267278,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.resourceId = iprot.readString();
         struct.setResourceIdIsSet(true);
-        struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
         java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
@@ -268580,7 +268091,6 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField PERMISSION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("permissionType", org.apache.thrift.protocol.TType.I32, (short)4);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAllAccessibleUsers_argsStandardSchemeFactory();
@@ -268590,11 +268100,6 @@ public class Airavata {
     public java.lang.String resourceId; // required
     /**
      * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType resourceType; // required
-    /**
-     * 
      * @see org.apache.airavata.model.group.ResourcePermissionType
      */
     public org.apache.airavata.model.group.ResourcePermissionType permissionType; // required
@@ -268605,11 +268110,6 @@ public class Airavata {
       RESOURCE_ID((short)2, "resourceId"),
       /**
        * 
-       * @see org.apache.airavata.model.group.ResourceType
-       */
-      RESOURCE_TYPE((short)3, "resourceType"),
-      /**
-       * 
        * @see org.apache.airavata.model.group.ResourcePermissionType
        */
       PERMISSION_TYPE((short)4, "permissionType");
@@ -268631,8 +268131,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // RESOURCE_ID
             return RESOURCE_ID;
-          case 3: // RESOURCE_TYPE
-            return RESOURCE_TYPE;
           case 4: // PERMISSION_TYPE
             return PERMISSION_TYPE;
           default:
@@ -268682,8 +268180,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourceType.class)));
       tmpMap.put(_Fields.PERMISSION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("permissionType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourcePermissionType.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -268696,13 +268192,11 @@ public class Airavata {
     public getAllAccessibleUsers_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String resourceId,
-      org.apache.airavata.model.group.ResourceType resourceType,
       org.apache.airavata.model.group.ResourcePermissionType permissionType)
     {
       this();
       this.authzToken = authzToken;
       this.resourceId = resourceId;
-      this.resourceType = resourceType;
       this.permissionType = permissionType;
     }
 
@@ -268716,9 +268210,6 @@ public class Airavata {
       if (other.isSetResourceId()) {
         this.resourceId = other.resourceId;
       }
-      if (other.isSetResourceType()) {
-        this.resourceType = other.resourceType;
-      }
       if (other.isSetPermissionType()) {
         this.permissionType = other.permissionType;
       }
@@ -268732,7 +268223,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.resourceId = null;
-      this.resourceType = null;
       this.permissionType = null;
     }
 
@@ -268786,38 +268276,6 @@ public class Airavata {
 
     /**
      * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType getResourceType() {
-      return this.resourceType;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public getAllAccessibleUsers_args setResourceType(org.apache.airavata.model.group.ResourceType resourceType) {
-      this.resourceType = resourceType;
-      return this;
-    }
-
-    public void unsetResourceType() {
-      this.resourceType = null;
-    }
-
-    /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceType() {
-      return this.resourceType != null;
-    }
-
-    public void setResourceTypeIsSet(boolean value) {
-      if (!value) {
-        this.resourceType = null;
-      }
-    }
-
-    /**
-     * 
      * @see org.apache.airavata.model.group.ResourcePermissionType
      */
     public org.apache.airavata.model.group.ResourcePermissionType getPermissionType() {
@@ -268866,14 +268324,6 @@ public class Airavata {
         }
         break;
 
-      case RESOURCE_TYPE:
-        if (value == null) {
-          unsetResourceType();
-        } else {
-          setResourceType((org.apache.airavata.model.group.ResourceType)value);
-        }
-        break;
-
       case PERMISSION_TYPE:
         if (value == null) {
           unsetPermissionType();
@@ -268893,9 +268343,6 @@ public class Airavata {
       case RESOURCE_ID:
         return getResourceId();
 
-      case RESOURCE_TYPE:
-        return getResourceType();
-
       case PERMISSION_TYPE:
         return getPermissionType();
 
@@ -268914,8 +268361,6 @@ public class Airavata {
         return isSetAuthzToken();
       case RESOURCE_ID:
         return isSetResourceId();
-      case RESOURCE_TYPE:
-        return isSetResourceType();
       case PERMISSION_TYPE:
         return isSetPermissionType();
       }
@@ -268955,15 +268400,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_resourceType = true && this.isSetResourceType();
-      boolean that_present_resourceType = true && that.isSetResourceType();
-      if (this_present_resourceType || that_present_resourceType) {
-        if (!(this_present_resourceType && that_present_resourceType))
-          return false;
-        if (!this.resourceType.equals(that.resourceType))
-          return false;
-      }
-
       boolean this_present_permissionType = true && this.isSetPermissionType();
       boolean that_present_permissionType = true && that.isSetPermissionType();
       if (this_present_permissionType || that_present_permissionType) {
@@ -268988,10 +268424,6 @@ public class Airavata {
       if (isSetResourceId())
         hashCode = hashCode * 8191 + resourceId.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetResourceType()) ? 131071 : 524287);
-      if (isSetResourceType())
-        hashCode = hashCode * 8191 + resourceType.getValue();
-
       hashCode = hashCode * 8191 + ((isSetPermissionType()) ? 131071 : 524287);
       if (isSetPermissionType())
         hashCode = hashCode * 8191 + permissionType.getValue();
@@ -269027,16 +268459,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetPermissionType()).compareTo(other.isSetPermissionType());
       if (lastComparison != 0) {
         return lastComparison;
@@ -269083,14 +268505,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceType:");
-      if (this.resourceType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceType);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("permissionType:");
       if (this.permissionType == null) {
         sb.append("null");
@@ -269110,9 +268524,6 @@ public class Airavata {
       if (resourceId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
       }
-      if (resourceType == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceType' was not present! Struct: " + toString());
-      }
       if (permissionType == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'permissionType' was not present! Struct: " + toString());
       }
@@ -269173,14 +268584,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // RESOURCE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-                struct.setResourceTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 4: // PERMISSION_TYPE
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.permissionType = org.apache.airavata.model.group.ResourcePermissionType.findByValue(iprot.readI32());
@@ -269214,11 +268617,6 @@ public class Airavata {
           oprot.writeString(struct.resourceId);
           oprot.writeFieldEnd();
         }
-        if (struct.resourceType != null) {
-          oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.resourceType.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.permissionType != null) {
           oprot.writeFieldBegin(PERMISSION_TYPE_FIELD_DESC);
           oprot.writeI32(struct.permissionType.getValue());
@@ -269243,7 +268641,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.resourceId);
-        oprot.writeI32(struct.resourceType.getValue());
         oprot.writeI32(struct.permissionType.getValue());
       }
 
@@ -269255,8 +268652,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.resourceId = iprot.readString();
         struct.setResourceIdIsSet(true);
-        struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
         struct.permissionType = org.apache.airavata.model.group.ResourcePermissionType.findByValue(iprot.readI32());
         struct.setPermissionTypeIsSet(true);
       }
@@ -270107,7 +269502,6 @@ public class Airavata {
 
     private static final org.apache.thrift.protocol.TField AUTHZ_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authzToken", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField RESOURCE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceId", org.apache.thrift.protocol.TType.STRING, (short)2);
-    private static final org.apache.thrift.protocol.TField RESOURCE_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("resourceType", org.apache.thrift.protocol.TType.I32, (short)3);
     private static final org.apache.thrift.protocol.TField PERMISSION_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("permissionType", org.apache.thrift.protocol.TType.I32, (short)4);
 
     private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAllAccessibleGroups_argsStandardSchemeFactory();
@@ -270117,11 +269511,6 @@ public class Airavata {
     public java.lang.String resourceId; // required
     /**
      * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType resourceType; // required
-    /**
-     * 
      * @see org.apache.airavata.model.group.ResourcePermissionType
      */
     public org.apache.airavata.model.group.ResourcePermissionType permissionType; // required
@@ -270132,11 +269521,6 @@ public class Airavata {
       RESOURCE_ID((short)2, "resourceId"),
       /**
        * 
-       * @see org.apache.airavata.model.group.ResourceType
-       */
-      RESOURCE_TYPE((short)3, "resourceType"),
-      /**
-       * 
        * @see org.apache.airavata.model.group.ResourcePermissionType
        */
       PERMISSION_TYPE((short)4, "permissionType");
@@ -270158,8 +269542,6 @@ public class Airavata {
             return AUTHZ_TOKEN;
           case 2: // RESOURCE_ID
             return RESOURCE_ID;
-          case 3: // RESOURCE_TYPE
-            return RESOURCE_TYPE;
           case 4: // PERMISSION_TYPE
             return PERMISSION_TYPE;
           default:
@@ -270209,8 +269591,6 @@ public class Airavata {
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.airavata.model.security.AuthzToken.class)));
       tmpMap.put(_Fields.RESOURCE_ID, new org.apache.thrift.meta_data.FieldMetaData("resourceId", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.RESOURCE_TYPE, new org.apache.thrift.meta_data.FieldMetaData("resourceType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourceType.class)));
       tmpMap.put(_Fields.PERMISSION_TYPE, new org.apache.thrift.meta_data.FieldMetaData("permissionType", org.apache.thrift.TFieldRequirementType.REQUIRED, 
           new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.group.ResourcePermissionType.class)));
       metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
@@ -270223,13 +269603,11 @@ public class Airavata {
     public getAllAccessibleGroups_args(
       org.apache.airavata.model.security.AuthzToken authzToken,
       java.lang.String resourceId,
-      org.apache.airavata.model.group.ResourceType resourceType,
       org.apache.airavata.model.group.ResourcePermissionType permissionType)
     {
       this();
       this.authzToken = authzToken;
       this.resourceId = resourceId;
-      this.resourceType = resourceType;
       this.permissionType = permissionType;
     }
 
@@ -270243,9 +269621,6 @@ public class Airavata {
       if (other.isSetResourceId()) {
         this.resourceId = other.resourceId;
       }
-      if (other.isSetResourceType()) {
-        this.resourceType = other.resourceType;
-      }
       if (other.isSetPermissionType()) {
         this.permissionType = other.permissionType;
       }
@@ -270259,7 +269634,6 @@ public class Airavata {
     public void clear() {
       this.authzToken = null;
       this.resourceId = null;
-      this.resourceType = null;
       this.permissionType = null;
     }
 
@@ -270313,38 +269687,6 @@ public class Airavata {
 
     /**
      * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public org.apache.airavata.model.group.ResourceType getResourceType() {
-      return this.resourceType;
-    }
-
-    /**
-     * 
-     * @see org.apache.airavata.model.group.ResourceType
-     */
-    public getAllAccessibleGroups_args setResourceType(org.apache.airavata.model.group.ResourceType resourceType) {
-      this.resourceType = resourceType;
-      return this;
-    }
-
-    public void unsetResourceType() {
-      this.resourceType = null;
-    }
-
-    /** Returns true if field resourceType is set (has been assigned a value) and false otherwise */
-    public boolean isSetResourceType() {
-      return this.resourceType != null;
-    }
-
-    public void setResourceTypeIsSet(boolean value) {
-      if (!value) {
-        this.resourceType = null;
-      }
-    }
-
-    /**
-     * 
      * @see org.apache.airavata.model.group.ResourcePermissionType
      */
     public org.apache.airavata.model.group.ResourcePermissionType getPermissionType() {
@@ -270393,14 +269735,6 @@ public class Airavata {
         }
         break;
 
-      case RESOURCE_TYPE:
-        if (value == null) {
-          unsetResourceType();
-        } else {
-          setResourceType((org.apache.airavata.model.group.ResourceType)value);
-        }
-        break;
-
       case PERMISSION_TYPE:
         if (value == null) {
           unsetPermissionType();
@@ -270420,9 +269754,6 @@ public class Airavata {
       case RESOURCE_ID:
         return getResourceId();
 
-      case RESOURCE_TYPE:
-        return getResourceType();
-
       case PERMISSION_TYPE:
         return getPermissionType();
 
@@ -270441,8 +269772,6 @@ public class Airavata {
         return isSetAuthzToken();
       case RESOURCE_ID:
         return isSetResourceId();
-      case RESOURCE_TYPE:
-        return isSetResourceType();
       case PERMISSION_TYPE:
         return isSetPermissionType();
       }
@@ -270482,15 +269811,6 @@ public class Airavata {
           return false;
       }
 
-      boolean this_present_resourceType = true && this.isSetResourceType();
-      boolean that_present_resourceType = true && that.isSetResourceType();
-      if (this_present_resourceType || that_present_resourceType) {
-        if (!(this_present_resourceType && that_present_resourceType))
-          return false;
-        if (!this.resourceType.equals(that.resourceType))
-          return false;
-      }
-
       boolean this_present_permissionType = true && this.isSetPermissionType();
       boolean that_present_permissionType = true && that.isSetPermissionType();
       if (this_present_permissionType || that_present_permissionType) {
@@ -270515,10 +269835,6 @@ public class Airavata {
       if (isSetResourceId())
         hashCode = hashCode * 8191 + resourceId.hashCode();
 
-      hashCode = hashCode * 8191 + ((isSetResourceType()) ? 131071 : 524287);
-      if (isSetResourceType())
-        hashCode = hashCode * 8191 + resourceType.getValue();
-
       hashCode = hashCode * 8191 + ((isSetPermissionType()) ? 131071 : 524287);
       if (isSetPermissionType())
         hashCode = hashCode * 8191 + permissionType.getValue();
@@ -270554,16 +269870,6 @@ public class Airavata {
           return lastComparison;
         }
       }
-      lastComparison = java.lang.Boolean.valueOf(isSetResourceType()).compareTo(other.isSetResourceType());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetResourceType()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.resourceType, other.resourceType);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       lastComparison = java.lang.Boolean.valueOf(isSetPermissionType()).compareTo(other.isSetPermissionType());
       if (lastComparison != 0) {
         return lastComparison;
@@ -270610,14 +269916,6 @@ public class Airavata {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("resourceType:");
-      if (this.resourceType == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.resourceType);
-      }
-      first = false;
-      if (!first) sb.append(", ");
       sb.append("permissionType:");
       if (this.permissionType == null) {
         sb.append("null");
@@ -270637,9 +269935,6 @@ public class Airavata {
       if (resourceId == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceId' was not present! Struct: " + toString());
       }
-      if (resourceType == null) {
-        throw new org.apache.thrift.protocol.TProtocolException("Required field 'resourceType' was not present! Struct: " + toString());
-      }
       if (permissionType == null) {
         throw new org.apache.thrift.protocol.TProtocolException("Required field 'permissionType' was not present! Struct: " + toString());
       }
@@ -270700,14 +269995,6 @@ public class Airavata {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // RESOURCE_TYPE
-              if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-                struct.setResourceTypeIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             case 4: // PERMISSION_TYPE
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
                 struct.permissionType = org.apache.airavata.model.group.ResourcePermissionType.findByValue(iprot.readI32());
@@ -270741,11 +270028,6 @@ public class Airavata {
           oprot.writeString(struct.resourceId);
           oprot.writeFieldEnd();
         }
-        if (struct.resourceType != null) {
-          oprot.writeFieldBegin(RESOURCE_TYPE_FIELD_DESC);
-          oprot.writeI32(struct.resourceType.getValue());
-          oprot.writeFieldEnd();
-        }
         if (struct.permissionType != null) {
           oprot.writeFieldBegin(PERMISSION_TYPE_FIELD_DESC);
           oprot.writeI32(struct.permissionType.getValue());
@@ -270770,7 +270052,6 @@ public class Airavata {
         org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
         struct.authzToken.write(oprot);
         oprot.writeString(struct.resourceId);
-        oprot.writeI32(struct.resourceType.getValue());
         oprot.writeI32(struct.permissionType.getValue());
       }
 
@@ -270782,8 +270063,6 @@ public class Airavata {
         struct.setAuthzTokenIsSet(true);
         struct.resourceId = iprot.readString();
         struct.setResourceIdIsSet(true);
-        struct.resourceType = org.apache.airavata.model.group.ResourceType.findByValue(iprot.readI32());
-        struct.setResourceTypeIsSet(true);
         struct.permissionType = org.apache.airavata.model.group.ResourcePermissionType.findByValue(iprot.readI32());
         struct.setPermissionTypeIsSet(true);
       }
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote
index 7920e08..c66f46f 100755
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata-remote
@@ -191,12 +191,12 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('  string registerReplicaLocation(AuthzToken authzToken, DataReplicaLocationModel replicaLocationModel)')
     print('  DataProductModel getParentDataProduct(AuthzToken authzToken, string productUri)')
     print('   getChildDataProducts(AuthzToken authzToken, string productUri)')
-    print('  bool shareResourceWithUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType,  userPermissionList)')
-    print('  bool shareResourceWithGroups(AuthzToken authzToken, string resourceId, ResourceType resourceType,  groupPermissionList)')
-    print('  bool revokeSharingOfResourceFromUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType,  userPermissionList)')
-    print('  bool revokeSharingOfResourceFromGroups(AuthzToken authzToken, string resourceId, ResourceType resourceType,  groupPermissionList)')
-    print('   getAllAccessibleUsers(AuthzToken authzToken, string resourceId, ResourceType resourceType, ResourcePermissionType permissionType)')
-    print('   getAllAccessibleGroups(AuthzToken authzToken, string resourceId, ResourceType resourceType, ResourcePermissionType permissionType)')
+    print('  bool shareResourceWithUsers(AuthzToken authzToken, string resourceId,  userPermissionList)')
+    print('  bool shareResourceWithGroups(AuthzToken authzToken, string resourceId,  groupPermissionList)')
+    print('  bool revokeSharingOfResourceFromUsers(AuthzToken authzToken, string resourceId,  userPermissionList)')
+    print('  bool revokeSharingOfResourceFromGroups(AuthzToken authzToken, string resourceId,  groupPermissionList)')
+    print('   getAllAccessibleUsers(AuthzToken authzToken, string resourceId, ResourcePermissionType permissionType)')
+    print('   getAllAccessibleGroups(AuthzToken authzToken, string resourceId, ResourcePermissionType permissionType)')
     print('  bool userHasAccess(AuthzToken authzToken, string resourceId, ResourcePermissionType permissionType)')
     print('  string createGroupResourceProfile(AuthzToken authzToken, GroupResourceProfile groupResourceProfile)')
     print('  void updateGroupResourceProfile(AuthzToken authzToken, GroupResourceProfile groupResourceProfile)')
@@ -1295,40 +1295,40 @@ elif cmd == 'getChildDataProducts':
     pp.pprint(client.getChildDataProducts(eval(args[0]), args[1],))
 
 elif cmd == 'shareResourceWithUsers':
-    if len(args) != 4:
-        print('shareResourceWithUsers requires 4 args')
+    if len(args) != 3:
+        print('shareResourceWithUsers requires 3 args')
         sys.exit(1)
-    pp.pprint(client.shareResourceWithUsers(eval(args[0]), args[1], eval(args[2]), eval(args[3]),))
+    pp.pprint(client.shareResourceWithUsers(eval(args[0]), args[1], eval(args[2]),))
 
 elif cmd == 'shareResourceWithGroups':
-    if len(args) != 4:
-        print('shareResourceWithGroups requires 4 args')
+    if len(args) != 3:
+        print('shareResourceWithGroups requires 3 args')
         sys.exit(1)
-    pp.pprint(client.shareResourceWithGroups(eval(args[0]), args[1], eval(args[2]), eval(args[3]),))
+    pp.pprint(client.shareResourceWithGroups(eval(args[0]), args[1], eval(args[2]),))
 
 elif cmd == 'revokeSharingOfResourceFromUsers':
-    if len(args) != 4:
-        print('revokeSharingOfResourceFromUsers requires 4 args')
+    if len(args) != 3:
+        print('revokeSharingOfResourceFromUsers requires 3 args')
         sys.exit(1)
-    pp.pprint(client.revokeSharingOfResourceFromUsers(eval(args[0]), args[1], eval(args[2]), eval(args[3]),))
+    pp.pprint(client.revokeSharingOfResourceFromUsers(eval(args[0]), args[1], eval(args[2]),))
 
 elif cmd == 'revokeSharingOfResourceFromGroups':
-    if len(args) != 4:
-        print('revokeSharingOfResourceFromGroups requires 4 args')
+    if len(args) != 3:
+        print('revokeSharingOfResourceFromGroups requires 3 args')
         sys.exit(1)
-    pp.pprint(client.revokeSharingOfResourceFromGroups(eval(args[0]), args[1], eval(args[2]), eval(args[3]),))
+    pp.pprint(client.revokeSharingOfResourceFromGroups(eval(args[0]), args[1], eval(args[2]),))
 
 elif cmd == 'getAllAccessibleUsers':
-    if len(args) != 4:
-        print('getAllAccessibleUsers requires 4 args')
+    if len(args) != 3:
+        print('getAllAccessibleUsers requires 3 args')
         sys.exit(1)
-    pp.pprint(client.getAllAccessibleUsers(eval(args[0]), args[1], eval(args[2]), eval(args[3]),))
+    pp.pprint(client.getAllAccessibleUsers(eval(args[0]), args[1], eval(args[2]),))
 
 elif cmd == 'getAllAccessibleGroups':
-    if len(args) != 4:
-        print('getAllAccessibleGroups requires 4 args')
+    if len(args) != 3:
+        print('getAllAccessibleGroups requires 3 args')
         sys.exit(1)
-    pp.pprint(client.getAllAccessibleGroups(eval(args[0]), args[1], eval(args[2]), eval(args[3]),))
+    pp.pprint(client.getAllAccessibleGroups(eval(args[0]), args[1], eval(args[2]),))
 
 elif cmd == 'userHasAccess':
     if len(args) != 3:
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py
index 89a38af..0f42d1d 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/api/Airavata.py
@@ -3473,7 +3473,7 @@ class Iface(object):
         """
         pass
 
-    def shareResourceWithUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+    def shareResourceWithUsers(self, authzToken, resourceId, userPermissionList):
         """
         Group Manager and Data Sharing Related API methods
 
@@ -3481,57 +3481,51 @@ class Iface(object):
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - userPermissionList
         """
         pass
 
-    def shareResourceWithGroups(self, authzToken, resourceId, resourceType, groupPermissionList):
+    def shareResourceWithGroups(self, authzToken, resourceId, groupPermissionList):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - groupPermissionList
         """
         pass
 
-    def revokeSharingOfResourceFromUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+    def revokeSharingOfResourceFromUsers(self, authzToken, resourceId, userPermissionList):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - userPermissionList
         """
         pass
 
-    def revokeSharingOfResourceFromGroups(self, authzToken, resourceId, resourceType, groupPermissionList):
+    def revokeSharingOfResourceFromGroups(self, authzToken, resourceId, groupPermissionList):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - groupPermissionList
         """
         pass
 
-    def getAllAccessibleUsers(self, authzToken, resourceId, resourceType, permissionType):
+    def getAllAccessibleUsers(self, authzToken, resourceId, permissionType):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - permissionType
         """
         pass
 
-    def getAllAccessibleGroups(self, authzToken, resourceId, resourceType, permissionType):
+    def getAllAccessibleGroups(self, authzToken, resourceId, permissionType):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - permissionType
         """
         pass
@@ -12774,7 +12768,7 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "getChildDataProducts failed: unknown result")
 
-    def shareResourceWithUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+    def shareResourceWithUsers(self, authzToken, resourceId, userPermissionList):
         """
         Group Manager and Data Sharing Related API methods
 
@@ -12782,18 +12776,16 @@ class Client(Iface):
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - userPermissionList
         """
-        self.send_shareResourceWithUsers(authzToken, resourceId, resourceType, userPermissionList)
+        self.send_shareResourceWithUsers(authzToken, resourceId, userPermissionList)
         return self.recv_shareResourceWithUsers()
 
-    def send_shareResourceWithUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+    def send_shareResourceWithUsers(self, authzToken, resourceId, userPermissionList):
         self._oprot.writeMessageBegin('shareResourceWithUsers', TMessageType.CALL, self._seqid)
         args = shareResourceWithUsers_args()
         args.authzToken = authzToken
         args.resourceId = resourceId
-        args.resourceType = resourceType
         args.userPermissionList = userPermissionList
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -12822,23 +12814,21 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "shareResourceWithUsers failed: unknown result")
 
-    def shareResourceWithGroups(self, authzToken, resourceId, resourceType, groupPermissionList):
+    def shareResourceWithGroups(self, authzToken, resourceId, groupPermissionList):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - groupPermissionList
         """
-        self.send_shareResourceWithGroups(authzToken, resourceId, resourceType, groupPermissionList)
+        self.send_shareResourceWithGroups(authzToken, resourceId, groupPermissionList)
         return self.recv_shareResourceWithGroups()
 
-    def send_shareResourceWithGroups(self, authzToken, resourceId, resourceType, groupPermissionList):
+    def send_shareResourceWithGroups(self, authzToken, resourceId, groupPermissionList):
         self._oprot.writeMessageBegin('shareResourceWithGroups', TMessageType.CALL, self._seqid)
         args = shareResourceWithGroups_args()
         args.authzToken = authzToken
         args.resourceId = resourceId
-        args.resourceType = resourceType
         args.groupPermissionList = groupPermissionList
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -12867,23 +12857,21 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "shareResourceWithGroups failed: unknown result")
 
-    def revokeSharingOfResourceFromUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+    def revokeSharingOfResourceFromUsers(self, authzToken, resourceId, userPermissionList):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - userPermissionList
         """
-        self.send_revokeSharingOfResourceFromUsers(authzToken, resourceId, resourceType, userPermissionList)
+        self.send_revokeSharingOfResourceFromUsers(authzToken, resourceId, userPermissionList)
         return self.recv_revokeSharingOfResourceFromUsers()
 
-    def send_revokeSharingOfResourceFromUsers(self, authzToken, resourceId, resourceType, userPermissionList):
+    def send_revokeSharingOfResourceFromUsers(self, authzToken, resourceId, userPermissionList):
         self._oprot.writeMessageBegin('revokeSharingOfResourceFromUsers', TMessageType.CALL, self._seqid)
         args = revokeSharingOfResourceFromUsers_args()
         args.authzToken = authzToken
         args.resourceId = resourceId
-        args.resourceType = resourceType
         args.userPermissionList = userPermissionList
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -12912,23 +12900,21 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "revokeSharingOfResourceFromUsers failed: unknown result")
 
-    def revokeSharingOfResourceFromGroups(self, authzToken, resourceId, resourceType, groupPermissionList):
+    def revokeSharingOfResourceFromGroups(self, authzToken, resourceId, groupPermissionList):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - groupPermissionList
         """
-        self.send_revokeSharingOfResourceFromGroups(authzToken, resourceId, resourceType, groupPermissionList)
+        self.send_revokeSharingOfResourceFromGroups(authzToken, resourceId, groupPermissionList)
         return self.recv_revokeSharingOfResourceFromGroups()
 
-    def send_revokeSharingOfResourceFromGroups(self, authzToken, resourceId, resourceType, groupPermissionList):
+    def send_revokeSharingOfResourceFromGroups(self, authzToken, resourceId, groupPermissionList):
         self._oprot.writeMessageBegin('revokeSharingOfResourceFromGroups', TMessageType.CALL, self._seqid)
         args = revokeSharingOfResourceFromGroups_args()
         args.authzToken = authzToken
         args.resourceId = resourceId
-        args.resourceType = resourceType
         args.groupPermissionList = groupPermissionList
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -12957,23 +12943,21 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "revokeSharingOfResourceFromGroups failed: unknown result")
 
-    def getAllAccessibleUsers(self, authzToken, resourceId, resourceType, permissionType):
+    def getAllAccessibleUsers(self, authzToken, resourceId, permissionType):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - permissionType
         """
-        self.send_getAllAccessibleUsers(authzToken, resourceId, resourceType, permissionType)
+        self.send_getAllAccessibleUsers(authzToken, resourceId, permissionType)
         return self.recv_getAllAccessibleUsers()
 
-    def send_getAllAccessibleUsers(self, authzToken, resourceId, resourceType, permissionType):
+    def send_getAllAccessibleUsers(self, authzToken, resourceId, permissionType):
         self._oprot.writeMessageBegin('getAllAccessibleUsers', TMessageType.CALL, self._seqid)
         args = getAllAccessibleUsers_args()
         args.authzToken = authzToken
         args.resourceId = resourceId
-        args.resourceType = resourceType
         args.permissionType = permissionType
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -13002,23 +12986,21 @@ class Client(Iface):
             raise result.ae
         raise TApplicationException(TApplicationException.MISSING_RESULT, "getAllAccessibleUsers failed: unknown result")
 
-    def getAllAccessibleGroups(self, authzToken, resourceId, resourceType, permissionType):
+    def getAllAccessibleGroups(self, authzToken, resourceId, permissionType):
         """
         Parameters:
          - authzToken
          - resourceId
-         - resourceType
          - permissionType
         """
-        self.send_getAllAccessibleGroups(authzToken, resourceId, resourceType, permissionType)
+        self.send_getAllAccessibleGroups(authzToken, resourceId, permissionType)
         return self.recv_getAllAccessibleGroups()
 
-    def send_getAllAccessibleGroups(self, authzToken, resourceId, resourceType, permissionType):
+    def send_getAllAccessibleGroups(self, authzToken, resourceId, permissionType):
         self._oprot.writeMessageBegin('getAllAccessibleGroups', TMessageType.CALL, self._seqid)
         args = getAllAccessibleGroups_args()
         args.authzToken = authzToken
         args.resourceId = resourceId
-        args.resourceType = resourceType
         args.permissionType = permissionType
         args.write(self._oprot)
         self._oprot.writeMessageEnd()
@@ -19115,7 +19097,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = shareResourceWithUsers_result()
         try:
-            result.success = self._handler.shareResourceWithUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList)
+            result.success = self._handler.shareResourceWithUsers(args.authzToken, args.resourceId, args.userPermissionList)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -19146,7 +19128,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = shareResourceWithGroups_result()
         try:
-            result.success = self._handler.shareResourceWithGroups(args.authzToken, args.resourceId, args.resourceType, args.groupPermissionList)
+            result.success = self._handler.shareResourceWithGroups(args.authzToken, args.resourceId, args.groupPermissionList)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -19177,7 +19159,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = revokeSharingOfResourceFromUsers_result()
         try:
-            result.success = self._handler.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.resourceType, args.userPermissionList)
+            result.success = self._handler.revokeSharingOfResourceFromUsers(args.authzToken, args.resourceId, args.userPermissionList)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -19208,7 +19190,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = revokeSharingOfResourceFromGroups_result()
         try:
-            result.success = self._handler.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.resourceType, args.groupPermissionList)
+            result.success = self._handler.revokeSharingOfResourceFromGroups(args.authzToken, args.resourceId, args.groupPermissionList)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -19239,7 +19221,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = getAllAccessibleUsers_result()
         try:
-            result.success = self._handler.getAllAccessibleUsers(args.authzToken, args.resourceId, args.resourceType, args.permissionType)
+            result.success = self._handler.getAllAccessibleUsers(args.authzToken, args.resourceId, args.permissionType)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -19270,7 +19252,7 @@ class Processor(Iface, TProcessor):
         iprot.readMessageEnd()
         result = getAllAccessibleGroups_result()
         try:
-            result.success = self._handler.getAllAccessibleGroups(args.authzToken, args.resourceId, args.resourceType, args.permissionType)
+            result.success = self._handler.getAllAccessibleGroups(args.authzToken, args.resourceId, args.permissionType)
             msg_type = TMessageType.REPLY
         except (TTransport.TTransportException, KeyboardInterrupt, SystemExit):
             raise
@@ -53514,7 +53496,6 @@ class shareResourceWithUsers_args(object):
     Attributes:
      - authzToken
      - resourceId
-     - resourceType
      - userPermissionList
     """
 
@@ -53522,14 +53503,13 @@ class shareResourceWithUsers_args(object):
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        None,  # 3
         (4, TType.MAP, 'userPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, userPermissionList=None,):
+    def __init__(self, authzToken=None, resourceId=None, userPermissionList=None,):
         self.authzToken = authzToken
         self.resourceId = resourceId
-        self.resourceType = resourceType
         self.userPermissionList = userPermissionList
 
     def read(self, iprot):
@@ -53552,11 +53532,6 @@ class shareResourceWithUsers_args(object):
                     self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.MAP:
                     self.userPermissionList = {}
@@ -53586,10 +53561,6 @@ class shareResourceWithUsers_args(object):
             oprot.writeFieldBegin('resourceId', TType.STRING, 2)
             oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
             oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
         if self.userPermissionList is not None:
             oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
             oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
@@ -53606,8 +53577,6 @@ class shareResourceWithUsers_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.resourceId is None:
             raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
         return
 
     def __repr__(self):
@@ -53738,7 +53707,6 @@ class shareResourceWithGroups_args(object):
     Attributes:
      - authzToken
      - resourceId
-     - resourceType
      - groupPermissionList
     """
 
@@ -53746,14 +53714,13 @@ class shareResourceWithGroups_args(object):
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        None,  # 3
         (4, TType.MAP, 'groupPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, groupPermissionList=None,):
+    def __init__(self, authzToken=None, resourceId=None, groupPermissionList=None,):
         self.authzToken = authzToken
         self.resourceId = resourceId
-        self.resourceType = resourceType
         self.groupPermissionList = groupPermissionList
 
     def read(self, iprot):
@@ -53776,11 +53743,6 @@ class shareResourceWithGroups_args(object):
                     self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.MAP:
                     self.groupPermissionList = {}
@@ -53810,10 +53772,6 @@ class shareResourceWithGroups_args(object):
             oprot.writeFieldBegin('resourceId', TType.STRING, 2)
             oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
             oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
         if self.groupPermissionList is not None:
             oprot.writeFieldBegin('groupPermissionList', TType.MAP, 4)
             oprot.writeMapBegin(TType.STRING, TType.I32, len(self.groupPermissionList))
@@ -53830,8 +53788,6 @@ class shareResourceWithGroups_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.resourceId is None:
             raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
         return
 
     def __repr__(self):
@@ -53962,7 +53918,6 @@ class revokeSharingOfResourceFromUsers_args(object):
     Attributes:
      - authzToken
      - resourceId
-     - resourceType
      - userPermissionList
     """
 
@@ -53970,14 +53925,13 @@ class revokeSharingOfResourceFromUsers_args(object):
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        None,  # 3
         (4, TType.MAP, 'userPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, userPermissionList=None,):
+    def __init__(self, authzToken=None, resourceId=None, userPermissionList=None,):
         self.authzToken = authzToken
         self.resourceId = resourceId
-        self.resourceType = resourceType
         self.userPermissionList = userPermissionList
 
     def read(self, iprot):
@@ -54000,11 +53954,6 @@ class revokeSharingOfResourceFromUsers_args(object):
                     self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.MAP:
                     self.userPermissionList = {}
@@ -54034,10 +53983,6 @@ class revokeSharingOfResourceFromUsers_args(object):
             oprot.writeFieldBegin('resourceId', TType.STRING, 2)
             oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
             oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
         if self.userPermissionList is not None:
             oprot.writeFieldBegin('userPermissionList', TType.MAP, 4)
             oprot.writeMapBegin(TType.STRING, TType.I32, len(self.userPermissionList))
@@ -54054,8 +53999,6 @@ class revokeSharingOfResourceFromUsers_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.resourceId is None:
             raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
         return
 
     def __repr__(self):
@@ -54186,7 +54129,6 @@ class revokeSharingOfResourceFromGroups_args(object):
     Attributes:
      - authzToken
      - resourceId
-     - resourceType
      - groupPermissionList
     """
 
@@ -54194,14 +54136,13 @@ class revokeSharingOfResourceFromGroups_args(object):
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        None,  # 3
         (4, TType.MAP, 'groupPermissionList', (TType.STRING, 'UTF8', TType.I32, None, False), None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, groupPermissionList=None,):
+    def __init__(self, authzToken=None, resourceId=None, groupPermissionList=None,):
         self.authzToken = authzToken
         self.resourceId = resourceId
-        self.resourceType = resourceType
         self.groupPermissionList = groupPermissionList
 
     def read(self, iprot):
@@ -54224,11 +54165,6 @@ class revokeSharingOfResourceFromGroups_args(object):
                     self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.MAP:
                     self.groupPermissionList = {}
@@ -54258,10 +54194,6 @@ class revokeSharingOfResourceFromGroups_args(object):
             oprot.writeFieldBegin('resourceId', TType.STRING, 2)
             oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
             oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
         if self.groupPermissionList is not None:
             oprot.writeFieldBegin('groupPermissionList', TType.MAP, 4)
             oprot.writeMapBegin(TType.STRING, TType.I32, len(self.groupPermissionList))
@@ -54278,8 +54210,6 @@ class revokeSharingOfResourceFromGroups_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.resourceId is None:
             raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
         return
 
     def __repr__(self):
@@ -54410,7 +54340,6 @@ class getAllAccessibleUsers_args(object):
     Attributes:
      - authzToken
      - resourceId
-     - resourceType
      - permissionType
     """
 
@@ -54418,14 +54347,13 @@ class getAllAccessibleUsers_args(object):
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        None,  # 3
         (4, TType.I32, 'permissionType', None, None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, permissionType=None,):
+    def __init__(self, authzToken=None, resourceId=None, permissionType=None,):
         self.authzToken = authzToken
         self.resourceId = resourceId
-        self.resourceType = resourceType
         self.permissionType = permissionType
 
     def read(self, iprot):
@@ -54448,11 +54376,6 @@ class getAllAccessibleUsers_args(object):
                     self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.I32:
                     self.permissionType = iprot.readI32()
@@ -54476,10 +54399,6 @@ class getAllAccessibleUsers_args(object):
             oprot.writeFieldBegin('resourceId', TType.STRING, 2)
             oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
             oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
         if self.permissionType is not None:
             oprot.writeFieldBegin('permissionType', TType.I32, 4)
             oprot.writeI32(self.permissionType)
@@ -54492,8 +54411,6 @@ class getAllAccessibleUsers_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.resourceId is None:
             raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
         if self.permissionType is None:
             raise TProtocolException(message='Required field permissionType is unset!')
         return
@@ -54634,7 +54551,6 @@ class getAllAccessibleGroups_args(object):
     Attributes:
      - authzToken
      - resourceId
-     - resourceType
      - permissionType
     """
 
@@ -54642,14 +54558,13 @@ class getAllAccessibleGroups_args(object):
         None,  # 0
         (1, TType.STRUCT, 'authzToken', (airavata.model.security.ttypes.AuthzToken, airavata.model.security.ttypes.AuthzToken.thrift_spec), None, ),  # 1
         (2, TType.STRING, 'resourceId', 'UTF8', None, ),  # 2
-        (3, TType.I32, 'resourceType', None, None, ),  # 3
+        None,  # 3
         (4, TType.I32, 'permissionType', None, None, ),  # 4
     )
 
-    def __init__(self, authzToken=None, resourceId=None, resourceType=None, permissionType=None,):
+    def __init__(self, authzToken=None, resourceId=None, permissionType=None,):
         self.authzToken = authzToken
         self.resourceId = resourceId
-        self.resourceType = resourceType
         self.permissionType = permissionType
 
     def read(self, iprot):
@@ -54672,11 +54587,6 @@ class getAllAccessibleGroups_args(object):
                     self.resourceId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString()
                 else:
                     iprot.skip(ftype)
-            elif fid == 3:
-                if ftype == TType.I32:
-                    self.resourceType = iprot.readI32()
-                else:
-                    iprot.skip(ftype)
             elif fid == 4:
                 if ftype == TType.I32:
                     self.permissionType = iprot.readI32()
@@ -54700,10 +54610,6 @@ class getAllAccessibleGroups_args(object):
             oprot.writeFieldBegin('resourceId', TType.STRING, 2)
             oprot.writeString(self.resourceId.encode('utf-8') if sys.version_info[0] == 2 else self.resourceId)
             oprot.writeFieldEnd()
-        if self.resourceType is not None:
-            oprot.writeFieldBegin('resourceType', TType.I32, 3)
-            oprot.writeI32(self.resourceType)
-            oprot.writeFieldEnd()
         if self.permissionType is not None:
             oprot.writeFieldBegin('permissionType', TType.I32, 4)
             oprot.writeI32(self.permissionType)
@@ -54716,8 +54622,6 @@ class getAllAccessibleGroups_args(object):
             raise TProtocolException(message='Required field authzToken is unset!')
         if self.resourceId is None:
             raise TProtocolException(message='Required field resourceId is unset!')
-        if self.resourceType is None:
-            raise TProtocolException(message='Required field resourceType is unset!')
         if self.permissionType is None:
             raise TProtocolException(message='Required field permissionType is unset!')
         return


Mime
View raw message