Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7E9A5200C2A for ; Wed, 1 Mar 2017 21:49:09 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 7D5CD160B70; Wed, 1 Mar 2017 20:49:09 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 300BE160B94 for ; Wed, 1 Mar 2017 21:49:08 +0100 (CET) Received: (qmail 18251 invoked by uid 500); 1 Mar 2017 20:49:07 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 17025 invoked by uid 99); 1 Mar 2017 20:49:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Mar 2017 20:49:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4FE18DFFC0; Wed, 1 Mar 2017 20:49:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: machristie@apache.org To: commits@airavata.apache.org Date: Wed, 01 Mar 2017 20:49:51 -0000 Message-Id: <41917ec4061a43a086dd23366fd2ca99@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [48/48] airavata git commit: Merge branch 'user-profile-service' of https://github.com/anujbhan/airavata into user-profile archived-at: Wed, 01 Mar 2017 20:49:09 -0000 Merge branch 'user-profile-service' of https://github.com/anujbhan/airavata into user-profile This closes #96 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/d1ae2642 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/d1ae2642 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/d1ae2642 Branch: refs/heads/user-profile Commit: d1ae2642a586fed4f8b20c669668218f42f636d5 Parents: e9f14e2 b81bad3 Author: Marcus Christie Authored: Wed Mar 1 15:47:52 2017 -0500 Committer: Marcus Christie Committed: Wed Mar 1 15:47:52 2017 -0500 ---------------------------------------------------------------------- airavata-api/airavata-api-server/pom.xml | 5 + .../server/handler/AiravataServerHandler.java | 179 + .../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 +- 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 | 8 +- .../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 | 1 - .../airavata-apis/airavata_api.thrift | 46 +- .../user-group-models/user_profile_model.thrift | 1 + 54 files changed, 43998 insertions(+), 30982 deletions(-) ----------------------------------------------------------------------