Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EF639187D5 for ; Thu, 14 Jan 2016 17:24:18 +0000 (UTC) Received: (qmail 13649 invoked by uid 500); 14 Jan 2016 17:24:09 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 13556 invoked by uid 500); 14 Jan 2016 17:24:09 -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 13481 invoked by uid 99); 14 Jan 2016 17:24:09 -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; Thu, 14 Jan 2016 17:24:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 196FBE3887; Thu, 14 Jan 2016 17:24:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: scnakandala@apache.org To: commits@airavata.apache.org Date: Thu, 14 Jan 2016 17:24:10 -0000 Message-Id: In-Reply-To: <95fd5c98336d4f179492c626a4ba4249@git.apache.org> References: <95fd5c98336d4f179492c626a4ba4249@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] airavata-php-gateway git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/2b0a8601 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2b0a8601 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2b0a8601 Branch: refs/heads/master Commit: 2b0a8601bfc20ea7c83d962907be6edcc7110de4 Parents: b3adcfe 430bf48 Author: scnakandala Authored: Thu Jan 14 10:42:21 2016 -0500 Committer: scnakandala Committed: Thu Jan 14 10:42:21 2016 -0500 ---------------------------------------------------------------------- .gitignore | 3 +- app/config/pga_config.php.template | 26 +- app/controllers/AccountController.php | 54 +- app/controllers/AdminController.php | 71 +- app/controllers/GatewayprofileController.php | 16 +- app/libraries/AdminUtilities.php | 26 +- app/libraries/Airavata/API/Airavata.php | 12814 +++++++++++------ app/libraries/Airavata/API/Error/Types.php | 4 +- app/libraries/Airavata/API/Types.php | 4 +- .../Model/AppCatalog/AppDeployment/Types.php | 2 +- .../Model/AppCatalog/AppInterface/Types.php | 2 +- .../Model/AppCatalog/ComputeResource/Types.php | 11 +- .../Model/AppCatalog/GatewayProfile/Types.php | 2 +- .../Model/AppCatalog/StorageResource/Types.php | 2 +- .../Airavata/Model/Application/Io/Types.php | 2 +- app/libraries/Airavata/Model/Commons/Types.php | 2 +- .../Airavata/Model/Data/Movement/Types.php | 4 +- .../Airavata/Model/Data/Resource/Types.php | 854 ++ .../Airavata/Model/Experiment/Types.php | 25 +- app/libraries/Airavata/Model/Job/Types.php | 2 +- .../Airavata/Model/Messaging/Event/Types.php | 2 +- app/libraries/Airavata/Model/Process/Types.php | 71 +- .../Airavata/Model/Scheduling/Types.php | 2 +- app/libraries/Airavata/Model/Security/Types.php | 2 +- app/libraries/Airavata/Model/Status/Types.php | 2 +- app/libraries/Airavata/Model/Task/Types.php | 2 +- app/libraries/Airavata/Model/Types.php | 2 +- .../Airavata/Model/Workspace/Types.php | 2 +- app/libraries/CRUtilities.php | 17 +- app/libraries/ExperimentUtilities.php | 43 +- app/libraries/ProjectUtilities.php | 1 - app/libraries/SRUtilities.php | 18 +- .../Thrift/Exception/TProtocolException.php | 2 - .../Protocol/TBinaryProtocolAccelerated.php | 17 +- .../Thrift/Protocol/TCompactProtocol.php | 12 +- app/libraries/Thrift/Protocol/TJSONProtocol.php | 4 +- .../Thrift/Serializer/TBinarySerializer.php | 8 +- app/libraries/Thrift/Thrift.php | 789 + .../Thrift/Transport/TBufferedTransport.php | 7 +- app/libraries/Thrift/Transport/TSocket.php | 6 +- app/libraries/Thrift/autoload.php | 51 + app/libraries/Wsis/Wsis.php | 8 +- app/libraries/Wsis/WsisServiceProvider.php | 19 +- app/routes.php | 22 +- app/views/account/create.blade.php | 6 +- app/views/admin/manage-credentials.blade.php | 83 +- app/views/admin/manage-gateway.blade.php | 287 +- app/views/application/deployment.blade.php | 4 +- app/views/application/module.blade.php | 4 +- app/views/experiment/summary.blade.php | 22 +- .../compute-resource-preferences.blade.php | 111 + app/views/partials/dashboard-block.blade.php | 8 +- .../partials/experiment-container.blade.php | 2 +- app/views/partials/experiment-info.blade.php | 19 +- .../partials/experiment-queue-block.blade.php | 14 +- .../partials/gateway-preferences.blade.php | 110 - .../partials/interface-input-block.blade.php | 5 +- .../storage-resource-preferences.blade.php | 64 + app/views/resource/browse.blade.php | 42 +- app/views/resource/edit.blade.php | 2 +- app/views/scigap-admin/manage-gateway.blade.php | 22 +- app/views/storage-resource/browse.blade.php | 8 +- app/views/storage-resource/edit.blade.php | 27 - public/js/gateway.js | 20 +- 64 files changed, 10658 insertions(+), 5237 deletions(-) ----------------------------------------------------------------------