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 2016/01/14 18:24:09 UTC
[1/5] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master 88f7e7c17 -> 6c04ff385
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/b3adcfe8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b3adcfe8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b3adcfe8
Branch: refs/heads/master
Commit: b3adcfe8884a7d752cc28527896aa98c0a94ec61
Parents: 3aeb344 afc639a
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Thu Dec 10 11:48:33 2015 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Thu Dec 10 11:48:33 2015 -0500
----------------------------------------------------------------------
app/config/packages/teepluss/theme/config.php | 2 +-
app/controllers/StorageResourceController.php | 191 ++++++++++++++++++++
app/controllers/StorageresourceController.php | 191 --------------------
app/libraries/AppUtilities.php | 2 +
app/libraries/SRUtilities.php | 2 +-
app/views/project/summary.blade.php | 4 +-
public/themes/base/layouts/default.blade.php | 1 +
public/themes/base/partials/footer.blade.php | 0
public/themes/base/partials/header.php | 0
public/themes/base/partials/template.blade.php | 0
public/themes/base/views/index.blade.php | 0
public/themes/base/views/test.blade.php | 1 +
themes/base/layouts/default.blade.php | 1 -
themes/base/partials/footer.blade.php | 0
themes/base/partials/header.php | 0
themes/base/partials/template.blade.php | 0
themes/base/views/index.blade.php | 0
themes/base/views/test.blade.php | 1 -
18 files changed, 199 insertions(+), 197 deletions(-)
----------------------------------------------------------------------
[2/5] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sc...@apache.org.
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 <su...@gmail.com>
Authored: Thu Jan 14 10:42:21 2016 -0500
Committer: scnakandala <su...@gmail.com>
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(-)
----------------------------------------------------------------------
[4/5] airavata-php-gateway git commit: fixing Airavata AIRAVATA-1886
Posted by sc...@apache.org.
fixing Airavata AIRAVATA-1886
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/97f9598d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/97f9598d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/97f9598d
Branch: refs/heads/master
Commit: 97f9598d4981fcb87b2fdd6fa3c58652da616e9e
Parents: 9d975f7
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 14 11:58:17 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 14 11:58:17 2016 -0500
----------------------------------------------------------------------
app/routes.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/97f9598d/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index c32dd48..faa27c052 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -150,7 +150,7 @@ Route::post("sr/delete-jsi", "StorageResourceController@deleteActions");
Route::post("sr/delete-dmi", "StorageResourceController@deleteActions");
-Route::post("sr/delete-cr", "StorageResourceController@deleteActions");
+Route::post("sr/delete-sr", "StorageResourceController@deleteActions");
/*
* Application Catalog Routes
[3/5] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sc...@apache.org.
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/9d975f75
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/9d975f75
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/9d975f75
Branch: refs/heads/master
Commit: 9d975f75c4dbc8acbbbb098dcb64a87dac530d69
Parents: 2b0a860 88f7e7c
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 14 11:32:20 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 14 11:32:20 2016 -0500
----------------------------------------------------------------------
app/controllers/ExperimentController.php | 9 +++++++--
app/views/experiment/summary.blade.php | 13 +++++++++++--
app/views/partials/experiment-info.blade.php | 11 ++++++++---
3 files changed, 26 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[5/5] airavata-php-gateway git commit: fixing AIRAVATA-1801
Posted by sc...@apache.org.
fixing AIRAVATA-1801
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/6c04ff38
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6c04ff38
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6c04ff38
Branch: refs/heads/master
Commit: 6c04ff38540dc53329222f2ef08a5048366828c2
Parents: 97f9598
Author: scnakandala <su...@gmail.com>
Authored: Thu Jan 14 12:22:34 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Jan 14 12:22:34 2016 -0500
----------------------------------------------------------------------
app/views/partials/experiment-container.blade.php | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6c04ff38/app/views/partials/experiment-container.blade.php
----------------------------------------------------------------------
diff --git a/app/views/partials/experiment-container.blade.php b/app/views/partials/experiment-container.blade.php
index 24b1df1..71d6454 100644
--- a/app/views/partials/experiment-container.blade.php
+++ b/app/views/partials/experiment-container.blade.php
@@ -38,7 +38,11 @@
@endif
</td>
<!-- Application Name -->
+ @if(isset($experiment['expValue']['applicationInterface']))
<td>{{ $experiment['expValue']['applicationInterface']->applicationName }}</td>
+ @else
+ <td></td>
+ @endif
<!-- User Names visible to admin -->
@if( isset($dashboard))
<td>{{$experiment['experiment']->userName}}</td>