Merge pull request #1 from machristie/user-profile-service AIRAVATA-2316 Store user profile in User Profile Service
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eed4f7de Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eed4f7de Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eed4f7de Branch: refs/heads/develop Commit: eed4f7de04ca47e5eb07e1f294331acaa51ff086 Parents: 593f2cf bfe1066 Author: Anuj Bhandar <[email protected]> Authored: Tue Feb 28 12:36:17 2017 -0500 Committer: GitHub <[email protected]> Committed: Tue Feb 28 12:36:17 2017 -0500 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 5 + .../server/handler/AiravataServerHandler.java | 145 + .../java/org/apache/airavata/api/Airavata.java | 58435 ++++++++++------- .../resources/lib/Airavata/API/Airavata.php | 12967 ++-- .../resources/airavata-default-xacml-policy.xml | 18 +- .../main/resources/airavata-server.properties | 9 +- .../SharingRegistryServiceClientFactory.java | 1 + .../org/apache/airavata/MigrationManager.java | 2 +- .../UserProfileAiravataThriftClient.java | 8 +- modules/user-profile/user-profile-core/pom.xml | 5 +- .../core/entities/UserProfileEntity.java | 10 +- .../repositories/UserProfileRepository.java | 2 +- .../user/registry/core/utils/JPAConstants.java | 1 + .../src/main/resources/META-INF/persistence.xml | 4 + .../server/UserProfileServiceHandler.java | 1 + .../client/UserProfileServiceClientFactory.java | 2 +- .../airavata-apis/airavata_api.thrift | 46 +- .../user-group-models/user_profile_model.thrift | 1 + 18 files changed, 42609 insertions(+), 29053 deletions(-) ----------------------------------------------------------------------
