merge
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c73f0b0a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c73f0b0a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c73f0b0a Branch: refs/heads/develop Commit: c73f0b0ae6f0b46fed433976f9be0a8f19868971 Parents: c1c3035 3d5af19 Author: scnakandala <[email protected]> Authored: Thu Jul 28 13:38:58 2016 -0400 Committer: scnakandala <[email protected]> Committed: Thu Jul 28 13:38:58 2016 -0400 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 5 + .../server/handler/AiravataServerHandler.java | 493 +- .../java/org/apache/airavata/api/Airavata.java | 55258 ++++++++++------- .../main/resources/lib/airavata/Airavata.cpp | 27383 ++++---- .../src/main/resources/lib/airavata/Airavata.h | 1554 +- .../lib/airavata/Airavata_server.skeleton.cpp | 49 + .../resources/lib/airavata/airavata_api_types.h | 1 + .../lib/airavata/airavata_data_models_types.h | 1 + .../airavata/group_manager_model_constants.cpp | 34 + .../airavata/group_manager_model_constants.h | 41 + .../lib/airavata/group_manager_model_types.cpp | 253 + .../lib/airavata/group_manager_model_types.h | 144 + .../lib/airavata/workspace_model_types.cpp | 324 +- .../lib/airavata/workspace_model_types.h | 52 +- .../resources/lib/Airavata/API/Airavata.php | 11915 ++-- .../lib/Airavata/Model/Group/Types.php | 235 + .../lib/Airavata/Model/Workspace/Types.php | 197 +- .../lib/apache/airavata/api/Airavata-remote | 56 + .../lib/apache/airavata/api/Airavata.py | 7746 ++- .../resources/lib/apache/airavata/api/ttypes.py | 1 + .../lib/apache/airavata/model/group/__init__.py | 1 + .../apache/airavata/model/group/constants.py | 11 + .../lib/apache/airavata/model/group/ttypes.py | 179 + .../lib/apache/airavata/model/ttypes.py | 1 + .../apache/airavata/model/workspace/ttypes.py | 138 +- .../apache/airavata/model/group/GroupModel.java | 883 + .../model/group/ResourcePermissionType.java | 62 + .../airavata/model/group/ResourceType.java | 68 + .../airavata/model/workspace/Project.java | 141 +- .../apache/airavata/model/workspace/User.java | 618 +- .../resources/airavata-default-xacml-policy.xml | 13 +- .../main/resources/grouper.hibernate.properties | 10 + .../server/src/main/resources/sources.xml | 875 + modules/group-manager/pom.xml | 58 + .../internal/dao/PermissionEntryDAO.java | 286 + .../dao/hib3/Hib3PermissionEntryDAO.java | 1123 + .../grouper/permissions/PermissionFinder.java | 770 + .../airavata/grouper/AiravataGrouperUtil.java | 35 + .../airavata/grouper/GroupManagerCPI.java | 35 + .../airavata/grouper/GroupManagerException.java | 36 + .../airavata/grouper/GroupManagerFactory.java | 42 + .../airavata/grouper/GroupManagerImpl.java | 118 + .../apache/airavata/grouper/SubjectType.java | 14 + .../apache/airavata/grouper/group/Group.java | 108 + .../airavata/grouper/group/GroupMembership.java | 88 + .../grouper/group/GroupMembershipType.java | 12 + .../airavata/grouper/group/GroupService.java | 39 + .../grouper/group/GroupServiceImpl.java | 412 + .../grouper/permission/PermissionAction.java | 15 + .../permission/PermissionServiceImpl.java | 86 + .../airavata/grouper/resource/Resource.java | 145 + .../resource/ResourceNotFoundException.java | 35 + .../grouper/resource/ResourceServiceImpl.java | 343 + .../airavata/grouper/resource/ResourceType.java | 51 + .../airavata/grouper/role/RoleServiceImpl.java | 112 + .../Owasp.CsrfGuard.overlay.properties | 78 + .../main/resources/Owasp.CsrfGuard.properties | 403 + .../group-manager/src/main/resources/README.txt | 21 + .../src/main/resources/ehcache.xml | 1517 + .../resources/grouper-loader.base.properties | 351 + .../main/resources/grouper-loader.properties | 25 + .../src/main/resources/grouper.base.properties | 1017 + .../resources/grouper.client.base.properties | 552 + .../main/resources/grouper.client.properties | 552 + .../resources/grouper.hibernate.base.properties | 120 + .../main/resources/grouper.hibernate.properties | 10 + .../src/main/resources/grouper.properties | 1017 + .../src/main/resources/grouperUtf8.txt | 1 + .../src/main/resources/log4j.properties | 154 + .../src/main/resources/morphString.properties | 21 + .../src/main/resources/server.properties | 26 + .../src/main/resources/sources.xml | 875 + .../src/main/resources/spy.properties | 54 + .../group-manager/src/main/resources/sqltool.rc | 6 + .../src/main/resources/subject.base.properties | 46 + .../src/main/resources/subject.properties | 27 + .../experiment/catalog/ExpCatResourceUtils.java | 4 +- .../catalog/impl/ExperimentCatalogImpl.java | 45 + .../catalog/impl/ExperimentRegistry.java | 56 +- .../catalog/impl/ProjectRegistry.java | 47 + .../catalog/resources/GatewayResource.java | 1 + .../catalog/resources/WorkerResource.java | 19 +- .../utils/ThriftDataModelConversion.java | 1 + .../registry/cpi/ExperimentCatalog.java | 16 + pom.xml | 1 + .../airavata-apis/airavata_api.thrift | 56 + .../data-models/airavata_data_models.thrift | 1 + .../workspace_model.thrift | 19 +- .../group_manager_model.thrift | 55 +- 89 files changed, 79654 insertions(+), 40245 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c73f0b0a/airavata-api/airavata-api-server/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c73f0b0a/pom.xml ----------------------------------------------------------------------
