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/07/13 15:16:38 UTC
[1/9] airavata-php-gateway git commit: Request Gateway form UI
Repository: airavata-php-gateway
Updated Branches:
refs/heads/grouper-integration b7e5563a3 -> 305afea17
Request Gateway form UI
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/6c4358a2
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/6c4358a2
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/6c4358a2
Branch: refs/heads/grouper-integration
Commit: 6c4358a236b79007733074d3ef8ba9e99b9a0eaf
Parents: 1496ebe
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jul 12 19:11:53 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jul 12 19:11:53 2016 -0700
----------------------------------------------------------------------
app/views/account/dashboard.blade.php | 36 +++++++++++++++++++++++++-----
1 file changed, 31 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/6c4358a2/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 58c2d69..1bc1704 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -24,12 +24,38 @@
<div class="col-md-offset-2 col-md-8">
<form id="add-tenant-form" action="{{ URL::to("/") }}/provider/add-gateway">
<div class="col-md-12 text-center" style="margin-top:50px;">
- <h3>Register your gateway now!</h3>
- <button type="button" class="btn btn-default toggle-add-tenant"><span
- class="glyphicon glyphicon-plus"></span>Add a new gateway
- </button>
+ <h3>Request your gateway now!</h3>
</div>
- @include('partials/add-gateway-block', $userInfo)
+ <div class="form-group required">
+ <label class="control-label">Gateway Name</label>
+ <input type="text" name="domain" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Gateway Acronym <i>(optional)</i></label>
+ <input type="text" name="domain" class="form-control"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Gateway Admin Username</label>
+ <input type="text" name="domain" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Gateway Admin Password</label>
+ <input type="text" name="domain" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Gateway Email</label>
+ <input type="text" name="domain" class="form-control" required="required"/>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Project Details</label>
+ <textarea type="text" name="domain" class="form-control" required="required"></textarea>
+ </div>
+ <div class="form-group required">
+ <label class="control-label">Public Project Description</label>
+ <textarea type="text" name="domain" class="form-control" required="required"></textarea>
+ </div>
+ <input type="submit" value="Send Request" class="btn btn-primary"/>
+ <input type="reset" value="Reset" class="btn">
</form>
</div>
</div>
[4/9] airavata-php-gateway git commit: Changes for Gateway Request
Posted by sc...@apache.org.
Changes for Gateway Request
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/13003068
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/13003068
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/13003068
Branch: refs/heads/grouper-integration
Commit: 130030687bdbc56440ba256a0c5ca3c4335b503d
Parents: 769ccd6
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jul 12 23:00:21 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jul 12 23:00:21 2016 -0700
----------------------------------------------------------------------
app/controllers/GatewayController.php | 46 ++++++++++++++++++++++++++++++
app/libraries/AdminUtilities.php | 15 ++++++++++
app/routes.php | 2 ++
app/views/account/dashboard.blade.php | 12 ++++----
4 files changed, 69 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/13003068/app/controllers/GatewayController.php
----------------------------------------------------------------------
diff --git a/app/controllers/GatewayController.php b/app/controllers/GatewayController.php
new file mode 100644
index 0000000..bd0e298
--- /dev/null
+++ b/app/controllers/GatewayController.php
@@ -0,0 +1,46 @@
+<?php
+
+class GatewayController extends BaseController {
+
+ public function requestGateway(){
+ $inputs = Input::all();
+
+ $rules = array(
+ "username" => "required|min:6",
+ "password" => "required|min:6|max:48|regex:/^.*(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[@!$#*]).*$/",
+ "confirm_password" => "required|same:password",
+ "email" => "required|email",
+ );
+
+ $messages = array(
+ 'password.regex' => 'Password needs to contain at least (a) One lower case letter (b) One Upper case letter and (c) One number (d) One of the following special characters - !@#$&*',
+ );
+
+ $checkValidation = array();
+ $checkValidation["username"] = $inputs["admin-username"];
+ $checkValidation["password"] = $inputs["admin-password"];
+ $checkValidation["confirm_password"] = $inputs["admin-password-confirm"];
+ $checkValidation["email"] = $inputs["admin-email"];
+
+ $validator = Validator::make( $checkValidation, $rules, $messages);
+ if ($validator->fails()) {
+ return Response::json( $validator->messages() );
+ }
+ else{
+ $gateway = AdminUtilities::add_gateway(Input::all());
+
+ //$tm = WSIS::createTenant(1, $inputs["admin-username"] . "@" . $inputs["domain"], $inputs["admin-password"], inputs["admin-email"], $inputs["admin-firstname"], $inputs["admin-lastname"], $inputs["domain"]);
+
+ Session::put("message", "Gateway " . $inputs["gatewayName"] . " has been added.");
+
+ return Response::json( array( "gateway" =>$gateway, "tm" => $tm ) );
+ if( $gateway == $inputs["gatewayName"] && is_object( $tm ) )
+ return Response::json( array( "gateway" =>$gateway, "tm" => $tm ) );
+ else
+ return 0;
+ //return Redirect::to("admin/dashboard/gateway")->with("message", "Gateway has been successfully added.");
+ }
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/13003068/app/libraries/AdminUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index edb095f..46d0e55 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -22,6 +22,21 @@ class AdminUtilities
return Airavata::addGateway(Session::get('authz-token'), $gateway);
}
+ public static function request_gateway( $inputs)
+ {
+ $gateway = new Gateway( $input);
+ $gateway->gatewayId = $input["gateway-name"];
+ $gateway->GatewayApprovalStatus = GatewayApprovalStatus::REQUESTED;
+ $gateway->domain = $input["domain"];
+ $gateway->gatewayName = $input["gateway-name"];
+ $gateway->emailAddress = $input["admin-email"];
+ $gateway->gatewayAcronym = $input["gateway-acronym"];
+ $gateway->gatewayURL = $input["gateway-url"];
+ $gateway->reviewProposalDescription = $input["project-description"];
+ $gateway->gatewayPublicAbstract - $input["public-project-description"]
+ return Airavata::addGateway(Session::get('authz-token'), $gateway);
+ }
+
/**
* Method to get experiment execution statistics object
* @param $fromTime
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/13003068/app/routes.php
----------------------------------------------------------------------
diff --git a/app/routes.php b/app/routes.php
index cd0b20f..f9e55d6 100644
--- a/app/routes.php
+++ b/app/routes.php
@@ -312,6 +312,8 @@ Route::post("admin/create-pwd-token", "AdminController@createPWD");
Route::post("admin/remove-pwd-token", "AdminController@removePWD");
+//GatewayProviders
+Route::post("provider/request-gateway", "GatewayController@requestGateway");
//notices
Route::get("admin/dashboard/notices", "AdminController@noticesView");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/13003068/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 1bc1704..04321e5 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -22,29 +22,29 @@
@if( Session::has('new-gateway-provider') )
<div class="row">
<div class="col-md-offset-2 col-md-8">
- <form id="add-tenant-form" action="{{ URL::to("/") }}/provider/add-gateway">
+ <form id="add-tenant-form" action="{{ URL::to("/") }}/provider/request-gateway">
<div class="col-md-12 text-center" style="margin-top:50px;">
<h3>Request your gateway now!</h3>
</div>
<div class="form-group required">
<label class="control-label">Gateway Name</label>
- <input type="text" name="domain" class="form-control" required="required"/>
+ <input type="text" name="gateway-name" class="form-control" required="required"/>
</div>
<div class="form-group required">
<label class="control-label">Gateway Acronym <i>(optional)</i></label>
- <input type="text" name="domain" class="form-control"/>
+ <input type="text" name="gateway-acronym" class="form-control"/>
</div>
<div class="form-group required">
<label class="control-label">Gateway Admin Username</label>
- <input type="text" name="domain" class="form-control" required="required"/>
+ <input type="text" name="admin-username" class="form-control" required="required"/>
</div>
<div class="form-group required">
<label class="control-label">Gateway Admin Password</label>
- <input type="text" name="domain" class="form-control" required="required"/>
+ <input type="text" name="admin-password" class="form-control" required="required"/>
</div>
<div class="form-group required">
<label class="control-label">Gateway Email</label>
- <input type="text" name="domain" class="form-control" required="required"/>
+ <input type="text" name="email-address" class="form-control" required="required"/>
</div>
<div class="form-group required">
<label class="control-label">Project Details</label>
[9/9] airavata-php-gateway git commit: merge
Posted by sc...@apache.org.
merge
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/305afea1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/305afea1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/305afea1
Branch: refs/heads/grouper-integration
Commit: 305afea17cc66ca75affe5b1af798f1e280d232b
Parents: b7e5563 a6700f6
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 13 11:15:41 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 13 11:15:41 2016 -0400
----------------------------------------------------------------------
app/config/pga_config_default_template.php | 243 ------------------------
app/controllers/AccountController.php | 20 +-
app/controllers/GatewayController.php | 45 +++++
app/libraries/AdminUtilities.php | 20 ++
app/libraries/ProjectUtilities.php | 1 +
app/routes.php | 2 +
app/views/account/dashboard.blade.php | 38 +++-
app/views/admin/manage-gateway.blade.php | 22 +++
8 files changed, 135 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/305afea1/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/305afea1/app/routes.php
----------------------------------------------------------------------
[7/9] airavata-php-gateway git commit: setting gateway Id in project
Posted by sc...@apache.org.
setting gateway Id in project
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/d5599e47
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/d5599e47
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/d5599e47
Branch: refs/heads/grouper-integration
Commit: d5599e474a6431b4e1db809e90988b13742316b2
Parents: 3d591e2
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 13 11:14:01 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 13 11:14:01 2016 -0400
----------------------------------------------------------------------
app/libraries/ProjectUtilities.php | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/d5599e47/app/libraries/ProjectUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ProjectUtilities.php b/app/libraries/ProjectUtilities.php
index 6a8a242..23c4f86 100644
--- a/app/libraries/ProjectUtilities.php
+++ b/app/libraries/ProjectUtilities.php
@@ -132,6 +132,7 @@ class ProjectUtilities
$project->owner = $username;
$project->name = "Default Project";
$project->description = "This is the default project for user " . $project->owner;
+ $project->gatewayId = Config::get('pga_config.airavata')['gateway-id'];
$projectId = null;
[8/9] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sc...@apache.org.
Merge remote-tracking branch 'origin/develop' 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/a6700f6a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a6700f6a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a6700f6a
Branch: refs/heads/grouper-integration
Commit: a6700f6a4079f80c4f5e5121de13572313e3bf27
Parents: d5599e4 28649af
Author: scnakandala <su...@gmail.com>
Authored: Wed Jul 13 11:14:07 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jul 13 11:14:07 2016 -0400
----------------------------------------------------------------------
app/config/pga_config_default_template.php | 243 -------------------
app/controllers/AccountController.php | 20 +-
app/controllers/GatewayController.php | 45 ++++
app/libraries/AdminUtilities.php | 20 ++
.../Airavata/Model/Workspace/Types.php | 115 +++++++++
app/routes.php | 2 +
app/views/account/dashboard.blade.php | 38 ++-
app/views/admin/manage-gateway.blade.php | 22 ++
8 files changed, 249 insertions(+), 256 deletions(-)
----------------------------------------------------------------------
[6/9] airavata-php-gateway git commit: Ongoing changes for
scigap-portal gateway request - UNSTABLE - do not merge with master
Posted by sc...@apache.org.
Ongoing changes for scigap-portal gateway request - UNSTABLE - do not merge with master
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/28649af1
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/28649af1
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/28649af1
Branch: refs/heads/grouper-integration
Commit: 28649af14d57e97365da4e79746db692141b068f
Parents: f8a61cb
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jul 12 23:52:50 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jul 12 23:52:50 2016 -0700
----------------------------------------------------------------------
app/controllers/AccountController.php | 20 +++++++++++++-------
app/controllers/GatewayController.php | 7 +++----
app/libraries/AdminUtilities.php | 9 +++++++--
app/views/account/dashboard.blade.php | 6 +++---
4 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28649af1/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index d41bc2f..32ae4b0 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -78,7 +78,7 @@ class AccountController extends BaseController
if(! in_array( "gateway-provider", $allRoles)){
WSIS::addRole( "gateway-provider");
}
- $userRoles["new"] = array("gateway-provider");
+ $userRoles["new"] = array("gateway-provider", "admin");
}
$userRoles["deleted"] = array();
WSIS::updateUserRoles( $username, $userRoles);
@@ -292,24 +292,30 @@ class AccountController extends BaseController
}
public function dashboard(){
- if( Session::has("gateway-provider")){
+
+ $userProfile = Session::get("user-profile");
+
+ if( in_array( "gateway-provider", $userProfile["roles"]) ){
$gatewayOfUser = "";
- //var_dump( Session::get("authz-token")->accessToken); exit;
- $userProfile = Session::get("user-profile");
$gatewaysInfo = CRUtilities::getAllGateways();
foreach( $gatewaysInfo as $index => $gateway){
if( $gateway->emailAddress == $userProfile["email"]){
Session::set("gateway_id", $gateway->gatewayId);
$gatewayOfUser = $gateway->gatewayId;
+ Session::forget("super-admin");
break;
}
}
if( $gatewayOfUser == ""){
- Session::put("new-gateway-provider");
+ $userInfo["username"] = $userProfile["username"];
+ $userInfo["email"] = $userProfile["email"];
+ Session::put("new-gateway-provider", true);
}
- }
- return View::make("account/dashboard");
+ $errors = array();
+ if( Session::has("errors"))
+ $errors = Session::get("errors");
+ return View::make("account/dashboard",array("message"=> implode( "," , $errors)));
}
public function resetPassword()
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28649af1/app/controllers/GatewayController.php
----------------------------------------------------------------------
diff --git a/app/controllers/GatewayController.php b/app/controllers/GatewayController.php
index bd0e298..4f13c57 100644
--- a/app/controllers/GatewayController.php
+++ b/app/controllers/GatewayController.php
@@ -24,21 +24,20 @@ class GatewayController extends BaseController {
$validator = Validator::make( $checkValidation, $rules, $messages);
if ($validator->fails()) {
- return Response::json( $validator->messages() );
+ return Redirect::to("account/dashboard", array( "errors"=>$validator->messages() );
}
else{
- $gateway = AdminUtilities::add_gateway(Input::all());
+ $gateway = AdminUtilities::request_gateway(Input::all());
//$tm = WSIS::createTenant(1, $inputs["admin-username"] . "@" . $inputs["domain"], $inputs["admin-password"], inputs["admin-email"], $inputs["admin-firstname"], $inputs["admin-lastname"], $inputs["domain"]);
- Session::put("message", "Gateway " . $inputs["gatewayName"] . " has been added.");
+ Session::put("message", "Your request for Gateway " . $inputs["gatewayName"] . " has been created.");
return Response::json( array( "gateway" =>$gateway, "tm" => $tm ) );
if( $gateway == $inputs["gatewayName"] && is_object( $tm ) )
return Response::json( array( "gateway" =>$gateway, "tm" => $tm ) );
else
return 0;
- //return Redirect::to("admin/dashboard/gateway")->with("message", "Gateway has been successfully added.");
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28649af1/app/libraries/AdminUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index 46d0e55..16fca27 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -32,8 +32,13 @@ class AdminUtilities
$gateway->emailAddress = $input["admin-email"];
$gateway->gatewayAcronym = $input["gateway-acronym"];
$gateway->gatewayURL = $input["gateway-url"];
- $gateway->reviewProposalDescription = $input["project-description"];
- $gateway->gatewayPublicAbstract - $input["public-project-description"]
+ $gateway->gatewayAdminFirstName = $input["admin-firstname"];
+ $gateway->gatewayAdminLastName = $input["admin-lastname"];
+ $gateway->identityServerUserName = $input["admin-username"];
+ $gateway->identityServerPasswordToken = $input["admin-password"];
+ $gateway->reviewProposalDescription = $input["project-details"];
+ $gateway->gatewayPublicAbstract - $input["public-project-description"];
+
return Airavata::addGateway(Session::get('authz-token'), $gateway);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/28649af1/app/views/account/dashboard.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/dashboard.blade.php b/app/views/account/dashboard.blade.php
index 04321e5..c7a9340 100644
--- a/app/views/account/dashboard.blade.php
+++ b/app/views/account/dashboard.blade.php
@@ -22,7 +22,7 @@
@if( Session::has('new-gateway-provider') )
<div class="row">
<div class="col-md-offset-2 col-md-8">
- <form id="add-tenant-form" action="{{ URL::to("/") }}/provider/request-gateway">
+ <form id="add-tenant-form" action="{{ URL::to('/') }}/provider/request-gateway">
<div class="col-md-12 text-center" style="margin-top:50px;">
<h3>Request your gateway now!</h3>
</div>
@@ -48,11 +48,11 @@
</div>
<div class="form-group required">
<label class="control-label">Project Details</label>
- <textarea type="text" name="domain" class="form-control" required="required"></textarea>
+ <textarea type="text" name="project-details" class="form-control" required="required"></textarea>
</div>
<div class="form-group required">
<label class="control-label">Public Project Description</label>
- <textarea type="text" name="domain" class="form-control" required="required"></textarea>
+ <textarea type="text" name="public-project-description" class="form-control" required="required"></textarea>
</div>
<input type="submit" value="Send Request" class="btn btn-primary"/>
<input type="reset" value="Reset" class="btn">
[2/9] airavata-php-gateway git commit: Manage Gateway Requests Table
- Super Admin Side
Posted by sc...@apache.org.
Manage Gateway Requests Table - Super Admin Side
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/95e575c0
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/95e575c0
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/95e575c0
Branch: refs/heads/grouper-integration
Commit: 95e575c073acf6339686e38df239a9105b305028
Parents: 6c4358a
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jul 12 19:48:58 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jul 12 19:48:58 2016 -0700
----------------------------------------------------------------------
app/views/admin/manage-gateway.blade.php | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/95e575c0/app/views/admin/manage-gateway.blade.php
----------------------------------------------------------------------
diff --git a/app/views/admin/manage-gateway.blade.php b/app/views/admin/manage-gateway.blade.php
index 3fb69da..28b7a79 100644
--- a/app/views/admin/manage-gateway.blade.php
+++ b/app/views/admin/manage-gateway.blade.php
@@ -62,6 +62,28 @@
@include('partials/add-gateway-block')
</form>
</div>
+ <div class="row">
+ <div class="col-md-12">
+ <h3>Gateway Requests</h3>
+ <table class="table table-striped table-bordered">
+ <th>
+ <tr>
+ <td>Gateway Name</td>
+ <td>Admin Name</td>
+ <td>Gateway URL</td>
+ <td>Project Details</td>
+ <td>Status</td>
+ </tr>
+ </th>
+ <tbody>
+ <!-- foreach code -->
+ <tr>
+ </tr>
+ <!-- foreach code ends -->
+ </tbody>
+ </table>
+ </div>
+ </div>
<div class="panel-group super-admin-gateways-view" id="accordion1">
@foreach( $gateways as $indexGP => $gp )
[3/9] airavata-php-gateway git commit: Removing accidental pga_config
commit
Posted by sc...@apache.org.
Removing accidental pga_config commit
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/769ccd6a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/769ccd6a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/769ccd6a
Branch: refs/heads/grouper-integration
Commit: 769ccd6a766eee5405cc5a41bd7d6c5a3e5115cf
Parents: 95e575c
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jul 12 19:50:25 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jul 12 19:50:25 2016 -0700
----------------------------------------------------------------------
app/config/pga_config_default_template.php | 243 ------------------------
1 file changed, 243 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/769ccd6a/app/config/pga_config_default_template.php
----------------------------------------------------------------------
diff --git a/app/config/pga_config_default_template.php b/app/config/pga_config_default_template.php
deleted file mode 100644
index 9d6be07..0000000
--- a/app/config/pga_config_default_template.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<?php
-return array(
- /**
- * *****************************************************************
- * These are WSO2 Identity Server Related Configurations
- * *****************************************************************
- */
-
- 'wsis' => [
-
- /**
- * Admin Role Name
- */
- 'admin-role-name' => 'admin',
-
- /**
- * Read only Admin Role Name
- */
- 'read-only-admin-role-name' => 'admin-read-only',
-
- /**
- * Gateway user role
- */
- 'user-role-name' => 'airavata-user',
-
- /**
- * Tenant Domain
- */
- 'tenant-domain' => '',
-
- /**
- * Tenant admin's username
- */
- 'admin-username' => 'scigap_admin',
-
- /**
- * Tenant admin's password
- */
- 'admin-password' => 'sci9067@min',
-
- /**
- * OAuth client key
- */
- 'oauth-client-key' => 'fI0fo8luZYsDMPqfIYH8fN6wtfMa',
-
- /**
- * OAuth client secret
- */
- 'oauth-client-secret' => 'cRKUjG8jPUgWj7NxUNT5Tf5621Aa',
-
- /**
- * Identity server domain
- */
- 'server' => 'idp.scigap.org',
-
- /**
- * Identity server url
- */
- 'service-url' => 'https://idp.scigap.org:9443/',
-
- /**
- * Enable HTTPS server verification
- */
- 'verify-peer' => true,
-
- /**
- * Path to the server certificate file
- */
- 'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
-
- /**
- * Allow self signed server certificates
- */
- 'allow-self-signed-cert' => false
- ],
-
-
- /**
- * *****************************************************************
- * These are Airavata Related Configurations
- * *****************************************************************
- */
- 'airavata' => [
-
- /**
- * Airavata API server location. Use tls:// as the protocol to
- * connect TLS enabled Airavata
- */
- 'airavata-server' => 'gw56.iu.xsede.org',
-
- /**
- * Airavata API server port
- */
- 'airavata-port' => '8930',
-
- /**
- * Airavata API server thrift communication timeout
- */
- 'airavata-timeout' => '1000000',
-
- /**
- * PGA Gateway ID
- */
- 'gateway-id' => 'scigap',
-
- /**
- * Maximum size of a file which is allowed to upload to the server
- */
- 'server-allowed-file-size' => 64,
-
- /**
- * directory in the web server where experiment data is staged. (relative to the PGA documents root)
- */
- 'experiment-data-dir' => '/../experimentData',
-
- /**
- * absolute path of the data dir
- */
- 'experiment-data-absolute-path' => 'C:\wamp\www\experimentData',
-
- /**
- * username for the user for accessing the experiment data over ssh
- */
- 'ssh-user' => 'root',
-
- /**
- * Advanced experiments options
- */
- 'advanced-experiment-options' => '',
-
- /**
- * Default queue name
- */
- 'queue-name' => 'long',
-
- /**
- * Default node count
- */
- 'node-count' => '1',
-
- /**
- * Default total core count
- */
- 'total-cpu-count' => '16',
-
- /**
- * Default wall time limit
- */
- 'wall-time-limit' => '30',
-
- /**
- * Enable app-catalog cache
- */
- 'enable-app-catalog-cache' => true,
-
- /**
- * Life time of app catalog data cache in minutes
- */
- 'app-catalog-cache-duration' => 5
- ],
-
- /**
- * *****************************************************************
- * Portal Related Configurations
- * *****************************************************************
- */
- 'portal' => [
- /**
- * Whether this portal is the SciGaP admin portal
- */
- 'super-admin-portal' => true,
-
- /**
- * Set the name of theme in use here
- */
- 'theme' => 'base',
-
- /**
- * Portal title
- */
- 'portal-title' => 'SciGaP Admin Portal',
-
- /**
- * Email address of the portal admin. Portal admin well get email notifications for events
- * such as new user creation
- */
- 'admin-emails' => ['sgg@iu.edu','eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com'],
-
- /**
- * Email account that the portal should login to send emails
- */
- 'portal-email-username' => 'pga.airavata@gmail.com',
-
- /**
- * Password for the portal's email account
- */
- 'portal-email-password' => 'airavata12',
-
- /**
- * SMTP server on which the portal should connect
- */
- 'portal-smtp-server-host' => 'smtp.gmail.com',
-
- /**
- * SMTP server port on which the portal should connect
- */
- 'portal-smtp-server-port' => '587',
-
- /**
- * Set JIRA Issue Collector scripts here.
- */
- 'jira-help' =>
- [
- /**
- * Report Issue Script issued for your app by Atlassian JIRA
- */
- 'report-issue-script' => '',
- /**
- * Collector id at the end of the above script
- */
- 'report-issue-collector-id' => '',
- /**
- * Create Report Script issued for your app by Atlassian JIRA
- */
- 'request-feature-script' => '',
- /**
- * Collector id at the end of the above script
- */
- 'request-feature-collector-id' => ''
- ],
-
- /**
- * Set Google Analytics Id here. ID format that generates from
- * creating tracker object should be
- *
- * UA-XXXXX-Y
- *
- * for it to be working correctly. Currently it is only set for
- * sending pageviews.
- */
- 'google-analytics-id' => ''
- ]
-);
\ No newline at end of file
[5/9] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sc...@apache.org.
Merge branch 'develop' 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/f8a61cb4
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f8a61cb4
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f8a61cb4
Branch: refs/heads/grouper-integration
Commit: f8a61cb44c0a1c031ba8869dab0679f6b057ec61
Parents: 1300306 f00c69d
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Tue Jul 12 23:00:51 2016 -0700
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Tue Jul 12 23:00:51 2016 -0700
----------------------------------------------------------------------
.../Airavata/Model/Workspace/Types.php | 115 +++++++++++++++++++
1 file changed, 115 insertions(+)
----------------------------------------------------------------------