You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2015/07/29 19:49:22 UTC
[50/50] [abbrv] airavata-php-gateway git commit: Merge branch
'0.15-release-branch' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Merge branch '0.15-release-branch' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway
Conflicts:
app/controllers/ExperimentController.php
app/libraries/Airavata/Model/Workspace/Experiment/Types.php
app/libraries/ExperimentUtilities.php
app/views/partials/experiment-info.blade.php
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/6a84103e
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6a84103e
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6a84103e
Branch: refs/heads/master
Commit: 6a84103eeea9ac9c6a68cc76cff27c798f408e25
Parents: 14665d0 3680d3b
Author: Supun Nakandala <sc...@apache.org>
Authored: Wed Jul 29 23:13:30 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Wed Jul 29 23:13:30 2015 +0530
----------------------------------------------------------------------
app/config/pga_config.php.template | 19 +-
app/controllers/AccountController.php | 131 +-
app/controllers/AdminController.php | 32 +-
app/controllers/ApplicationController.php | 30 +-
app/controllers/ComputeResource.php | 258 -
app/controllers/ComputeResourceController.php | 261 +
app/controllers/ExperimentController.php | 28 +-
app/controllers/HomeController.php | 1 +
app/filters.php | 11 +
app/libraries/AdminUtilities.php | 13 +-
app/libraries/Airavata/API/Airavata.php | 8407 ++++++++++++++++--
.../Airavata/Model/Experiment/Types.php | 184 +-
app/libraries/AppUtilities.php | 36 +-
app/libraries/CRUtilities.php | 100 +-
app/libraries/CommonUtilities.php | 36 +-
app/libraries/ExperimentUtilities.php | 78 +-
app/libraries/ProjectUtilities.php | 47 +-
app/libraries/Wsis/Stubs/TenantManager.php | 2 +-
.../Stubs/UserInformationRecoveryManager.php | 91 +
.../Wsis/Stubs/UserInformationRecoveryStub.php | 443 +
app/libraries/Wsis/Stubs/UserProfileManager.php | 82 +
.../Wsis/Stubs/UserProfileManagerStub.php | 365 +
app/libraries/Wsis/Stubs/UserStoreManager.php | 17 +-
app/libraries/Wsis/Wsis.php | 89 +-
app/routes.php | 32 +-
app/views/account/create.blade.php | 86 +-
app/views/account/forgot-password.blade.php | 14 +-
app/views/account/reset-password.blade.php | 39 +
app/views/admin/experiment-statistics.blade.php | 161 +-
app/views/admin/manage-credentials.blade.php | 4 +
app/views/admin/manage-experiments.blade.php | 2 +
app/views/admin/manage-gateway.blade.php | 10 +-
app/views/admin/manage-roles.blade.php | 7 +-
app/views/admin/manage-users.blade.php | 24 +-
app/views/application/deployment.blade.php | 25 +-
app/views/application/interface.blade.php | 24 +-
app/views/application/module.blade.php | 36 +-
app/views/experiment/create-complete.blade.php | 20 +-
app/views/home.blade.php | 8 +-
app/views/layout/basic.blade.php | 16 +
app/views/partials/dashboard-block.blade.php | 65 +-
app/views/partials/deployment-block.blade.php | 1 +
app/views/partials/experiment-info.blade.php | 46 +-
.../partials/experiment-queue-block.blade.php | 1 -
.../partials/gateway-preferences.blade.php | 2 +
app/views/partials/interface-block.blade.php | 9 +-
.../partials/interface-input-block.blade.php | 2 +
.../partials/interface-output-block.blade.php | 2 +
app/views/project/summary.blade.php | 2 +-
app/views/resource/browse.blade.php | 74 +-
app/views/resource/create-step3.blade.php | 33 -
app/views/resource/create.blade.php | 12 +-
app/views/resource/edit.blade.php | 47 +-
app/views/resource/view.blade.php | 14 +-
54 files changed, 10054 insertions(+), 1525 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6a84103e/app/controllers/AdminController.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6a84103e/app/controllers/ExperimentController.php
----------------------------------------------------------------------
diff --cc app/controllers/ExperimentController.php
index d1391aa,d8ff45d..3f2fe95
--- a/app/controllers/ExperimentController.php
+++ b/app/controllers/ExperimentController.php
@@@ -137,24 -137,14 +137,14 @@@ class ExperimentController extends Base
{
$updatedExperiment = CommonUtilities::apply_changes_to_experiment($experiment);
- CommonUtilities::update_experiment($experiment->experimentID, $updatedExperiment);
+ CommonUtilities::update_experiment($experiment->experimentId, $updatedExperiment);
}*/
if (isset($_POST['launch'])) {
- ExperimentUtilities::launch_experiment($experiment->experimentId);
- return Redirect::to('experiment/summary?expId=' . $experiment->experimentId);
- } elseif (isset($_POST['clone'])) {
- $cloneId = ExperimentUtilities::clone_experiment($experiment->experimentId);
- $experiment = ExperimentUtilities::get_experiment($cloneId);
- $project = ProjectUtilities::get_project($experiment->projectId);
-
- $expVal = ExperimentUtilities::get_experiment_values($experiment, $project);
- $expVal["jobState"] = ExperimentUtilities::get_job_status($experiment);
-
- return Redirect::to('experiment/edit?expId=' . $experiment->experimentId);
-
+ ExperimentUtilities::launch_experiment($experiment->experimentID);
+ return Redirect::to('experiment/summary?expId=' . $experiment->experimentID);
} elseif (isset($_POST['cancel'])) {
- ExperimentUtilities::cancel_experiment($experiment->experimentID);
- return Redirect::to('experiment/summary?expId=' . $experiment->experimentID);
+ ExperimentUtilities::cancel_experiment($experiment->experimentId);
+ return Redirect::to('experiment/summary?expId=' . $experiment->experimentId);
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6a84103e/app/filters.php
----------------------------------------------------------------------
diff --cc app/filters.php
index eeea00c,2fb6c3c..80336ab
--- a/app/filters.php
+++ b/app/filters.php
@@@ -12,11 -12,9 +12,13 @@@
*/
App::before(function ($request) {
- $apiVersion = Airavata::getAPIVersion();
+ $authzToken = new Airavata\Model\Security\AuthzToken();
+ $authzToken->accessToken = "emptyToken";
+ $apiVersion = Airavata::getAPIVersion($authzToken);
if (empty($apiVersion))
return View::make("server-down");
++ else
++ Session::put('authz-token',$authzToken);
});
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6a84103e/app/libraries/AdminUtilities.php
----------------------------------------------------------------------
diff --cc app/libraries/AdminUtilities.php
index 95a8c42,8cc1a0f..73f5d5d
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@@ -17,18 -17,18 +17,19 @@@ class AdminUtilitie
$gateway->domain = $input["domain"];
$gateway->gatewayName = $input["gatewayName"];
$gateway->emailAddress = $input["admin-email"];
-- return Airavata::addGateway($gateway);
++ return Airavata::addGateway(Session::get('authz-token'), $gateway);
}
/**
* Method to get experiment execution statistics object
* @param $fromTime
* @param $toTime
-- * @return \Airavata\Model\Workspace\Experiment\ExperimentStatistics
++ * @return \Airavata\Model\Experiment\ExperimentStatistics
*/
public static function get_experiment_execution_statistics($fromTime, $toTime)
{
-- return Airavata::getExperimentStatistics(Config::get('pga_config.airavata')['gateway-id'], $fromTime, $toTime);
++ return Airavata::getExperimentStatistics(Session::get('authz-token'),
++ Config::get('pga_config.airavata')['gateway-id'], $fromTime, $toTime);
}
/**