Merge branch 'AIRAVATA-2207-admins-cant-see-exp-summary' of https://github.com/machristie/airavata into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/400e24d6 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/400e24d6 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/400e24d6 Branch: refs/heads/develop Commit: 400e24d6331251dea15fa9516d7facb0303a79ff Parents: 93431b1 5f3b778 Author: scnakandala <[email protected]> Authored: Thu Nov 10 15:08:27 2016 -0500 Committer: scnakandala <[email protected]> Committed: Thu Nov 10 15:08:27 2016 -0500 ---------------------------------------------------------------------- .../server/handler/AiravataServerHandler.java | 177 +- .../java/org/apache/airavata/api/Airavata.java | 7160 +++++++++++++----- .../resources/lib/Airavata/API/Airavata.php | 1501 +++- .../resources/airavata-default-xacml-policy.xml | 2 + .../airavata-apis/airavata_api.thrift | 97 + 5 files changed, 6775 insertions(+), 2162 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/400e24d6/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java ----------------------------------------------------------------------
