merging pull request from Gaurav

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

Branch: refs/heads/develop
Commit: 6c9a0cedb1599b40989cc1e1a20672241835bf79
Parents: d6944a7 f113d16
Author: scnakandala <[email protected]>
Authored: Tue Mar 7 17:04:24 2017 -0500
Committer: scnakandala <[email protected]>
Committed: Tue Mar 7 17:04:24 2017 -0500

----------------------------------------------------------------------
 README                                          |     3 -
 airavata-api/airavata-api-server/pom.xml        |    10 +
 .../server/handler/AiravataServerHandler.java   |   179 +
 .../java/org/apache/airavata/api/Airavata.java  | 58435 ++++++++++-------
 .../resources/lib/Airavata/API/Airavata.php     | 12967 ++--
 airavata-services/pom.xml                       |    55 +
 airavata-services/profile-service/pom.xml       |    27 +
 .../profile-service-server/pom.xml              |    35 +
 .../handlers/TenantProfileServiceHandler.java   |   130 +
 .../handlers/UserProfileServiceHandler.java     |   141 +
 .../profile/server/ProfileServiceServer.java    |   173 +
 .../profile-service-stubs/pom.xml               |    28 +
 .../client/ProfileServiceClientFactory.java     |    46 +
 .../gateway/cpi/GatewayProfileService.java      |  6865 ++
 .../GatewayProfileServiceException.java         |   407 +
 .../cpi/profile_gateway_cpiConstants.java       |    59 +
 .../profile/user/cpi/UserProfileService.java    |  7504 +++
 .../exception/UserProfileServiceException.java  |   407 +
 .../user/cpi/profile_user_cpiConstants.java     |    59 +
 .../profile-service/profile-tenant-core/pom.xml |    61 +
 .../profile/tenant/core/entities/Gateway.java   |   224 +
 .../tenant/core/entities/GatewayProfile.java    |   100 +
 .../tenant/core/impl/GatewayRegistry.java       |   137 +
 .../tenant/core/resources/GatewayResource.java  |   278 +
 .../profile/tenant/core/util/GatewayUtils.java  |   265 +
 .../profile/tenant/core/util/JPAConstants.java  |    33 +
 .../profile/tenant/core/util/JPAUtils.java      |    50 +
 .../tenant/core/util/QueryConstants.java        |    15 +
 .../service/profile/tenant/core/util/Utils.java |   155 +
 .../src/main/resources/META-INF/persistence.xml |    32 +
 .../profile-service/profile-user-core/pom.xml   |   115 +
 .../user/core/UserProfileRegistryException.java |    28 +
 .../core/entities/NSFDemographicsEntity.java    |    94 +
 .../user/core/entities/UserProfileEntity.java   |   247 +
 .../core/repositories/AbstractRepository.java   |    98 +
 .../repositories/UserProfileRepository.java     |    87 +
 .../profile/user/core/utils/Committer.java      |    27 +
 .../profile/user/core/utils/JPAConstants.java   |    33 +
 .../profile/user/core/utils/JPAUtils.java       |    83 +
 .../user/core/utils/ObjectMapperSingleton.java  |    39 +
 .../profile/user/core/utils/QueryConstants.java |    22 +
 .../service/profile/user/core/utils/Utils.java  |   155 +
 .../src/main/resources/META-INF/persistence.xml |    33 +
 .../src/main/resources/user_profile_catalog.sql |    84 +
 .../repositories/WorkspaceRepositoryTest.java   |   176 +
 .../common/utils/ApplicationSettings.java       |     8 +
 .../airavata/common/utils/ServerSettings.java   |     4 +
 .../resources/airavata-default-xacml-policy.xml |    18 +-
 .../main/resources/airavata-server.properties   |    16 +-
 modules/registry-refactoring/pom.xml            |   132 -
 .../registry/core/RegistryException.java        |    28 -
 .../workspacecatalog/GatewayEntity.java         |   221 -
 .../workspacecatalog/NSFDemographicsEntity.java |    94 -
 .../workspacecatalog/NotificationEntity.java    |   110 -
 .../workspacecatalog/ProjectEntity.java         |    92 -
 .../workspacecatalog/UserProfileEntity.java     |   247 -
 .../core/repositories/AbstractRepository.java   |    98 -
 .../workspacecatalog/GatewayRepository.java     |    36 -
 .../NotificationRepository.java                 |    35 -
 .../workspacecatalog/ProjectRepository.java     |    35 -
 .../workspacecatalog/UserProfileRepository.java |    88 -
 .../airavata/registry/core/utils/Committer.java |    27 -
 .../registry/core/utils/JPAConstants.java       |    32 -
 .../airavata/registry/core/utils/JPAUtils.java  |    83 -
 .../core/utils/ObjectMapperSingleton.java       |    39 -
 .../registry/core/utils/QueryConstants.java     |    22 -
 .../airavata/registry/core/utils/Utils.java     |   156 -
 .../src/main/resources/META-INF/persistence.xml |    32 -
 .../src/main/resources/workspace_catalog.sql    |   125 -
 .../repositories/WorkspaceRepositoryTest.java   |   197 -
 .../org/apache/airavata/server/ServerMain.java  |    10 +-
 .../SharingRegistryServiceClientFactory.java    |     1 +
 .../main/resources/airavata-server.properties   |    21 +-
 .../org/apache/airavata/MigrationManager.java   |     2 +-
 .../UserProfileAiravataThriftClient.java        |     8 +-
 modules/user-profile/pom.xml                    |     1 +
 modules/user-profile/user-profile-core/pom.xml  |   131 +
 .../core/UserProfileRegistryException.java      |    28 +
 .../core/entities/NSFDemographicsEntity.java    |    94 +
 .../core/entities/UserProfileEntity.java        |   247 +
 .../core/repositories/AbstractRepository.java   |    98 +
 .../repositories/UserProfileRepository.java     |    87 +
 .../user/registry/core/utils/Committer.java     |    27 +
 .../user/registry/core/utils/JPAConstants.java  |    33 +
 .../user/registry/core/utils/JPAUtils.java      |    83 +
 .../core/utils/ObjectMapperSingleton.java       |    39 +
 .../registry/core/utils/QueryConstants.java     |    22 +
 .../user/registry/core/utils/Utils.java         |   155 +
 .../src/main/resources/META-INF/persistence.xml |    33 +
 .../src/main/resources/user_profile_catalog.sql |    84 +
 .../repositories/WorkspaceRepositoryTest.java   |   176 +
 .../user-profile/user-profile-service/pom.xml   |     5 +
 .../server/UserProfileServiceHandler.java       |     5 +-
 .../client/UserProfileServiceClientFactory.java |     2 +-
 pom.xml                                         |     5 +-
 .../airavata-apis/airavata_api.thrift           |    46 +-
 .../user-group-models/user_profile_model.thrift |     1 +
 .../service-cpis/generate-service-cpi-stubs.sh  |   181 +
 .../profile-gateway/profile-gateway-cpi.thrift  |    56 +
 .../profile_gateway_cpi_errors.thrift           |    32 +
 .../profile-service/profile-service-cpi.thrift  |    33 +
 .../profile-user/profile-user-cpi.thrift        |    58 +
 .../profile-user/profile_user_cpi_errors.thrift |    32 +
 103 files changed, 63027 insertions(+), 30985 deletions(-)
----------------------------------------------------------------------


Reply via email to