You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/03/26 20:51:17 UTC

[airavata] 01/01: Merge remote-tracking branch 'origin/AIRAVATA-2500'

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit b0987c550b27841e56ffc06122d1ac5bef444ea9
Merge: afe33c8 a24cf52
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Mar 26 16:50:27 2018 -0400

    Merge remote-tracking branch 'origin/AIRAVATA-2500'
    
    Merge LDAP based SSH account provisioning into master.

 airavata-api/airavata-api-server/pom.xml           |     5 +
 .../api/server/handler/AiravataServerHandler.java  |    84 +
 .../java/org/apache/airavata/api/Airavata.java     | 35208 +++++++++++--------
 .../main/resources/lib/Airavata/API/Airavata.php   |  4066 ++-
 .../Model/AppCatalog/GatewayProfile/Types.php      |   143 +-
 .../Model/AppCatalog/UserResourceProfile/Types.php |    28 +
 .../accountprovisioning/SSHAccountProvisioner.java |   755 +
 .../SSHAccountProvisionerConfigParam.java          |   733 +
 .../SSHAccountProvisionerConfigParamType.java      |    62 +
 .../gatewayprofile/ComputeResourcePreference.java  |   378 +-
 .../gatewayprofile/GatewayResourceProfile.java     |    72 +-
 .../UserComputeResourcePreference.java             |   114 +-
 .../service/security/KeyCloakSecurityManager.java  |    10 +-
 modules/compute-account-provisioning/pom.xml       |    73 +
 .../airavata/accountprovisioning/ConfigParam.java  |    89 +
 .../accountprovisioning/InvalidSetupException.java |    43 +
 .../InvalidUsernameException.java                  |    43 +
 .../accountprovisioning/SSHAccountManager.java     |   296 +
 .../accountprovisioning/SSHAccountProvisioner.java |    77 +
 .../SSHAccountProvisionerFactory.java              |    63 +
 .../SSHAccountProvisionerProvider.java             |    60 +
 .../airavata/accountprovisioning/SSHUtil.java      |   154 +
 .../provisioner/IULdapSSHAccountProvisioner.java   |   192 +
 .../IULdapSSHAccountProvisionerProvider.java       |    80 +
 ...countprovisioning.SSHAccountProvisionerProvider |    22 +
 .../SSHAccountProvisionerFactoryTest.java          |    77 +
 .../provisioner/TestSSHAccountProvisioner.java     |    65 +
 .../TestSSHAccountProvisionerProvider.java         |    80 +
 ...countprovisioning.SSHAccountProvisionerProvider |    21 +
 .../app/catalog/impl/GwyResourceProfileImpl.java   |    12 +
 .../app/catalog/impl/UsrResourceProfileImpl.java   |     2 +
 .../catalog/model/ComputeResourcePreference.java   |    41 +-
 .../model/SSHAccountProvisionerConfiguration.java  |    98 +
 .../SSHAccountProvisionerConfigurationPK.java      |    57 +
 .../model/UserComputeResourcePreference.java       |    10 +
 .../resources/ComputeHostPreferenceResource.java   |    62 +-
 .../UserComputeHostPreferenceResource.java         |    11 +
 .../core/app/catalog/util/AppCatalogJPAUtils.java  |    10 +
 .../catalog/util/AppCatalogThriftConversion.java   |    10 +-
 .../src/main/resources/META-INF/persistence.xml    |     1 +
 .../src/main/resources/appcatalog-derby.sql        |    50 +-
 .../src/main/resources/appcatalog-mysql.sql        |    52 +-
 .../DeltaScripts/appCatalog_schema_delta.sql       |    36 +
 pom.xml                                            |     1 +
 .../airavata-apis/airavata_api.thrift              |    27 +
 .../account_provisioning_model.thrift              |    44 +
 .../gateway_resource_profile_model.thrift          |     6 +-
 .../user_resource_profile_model.thrift             |     8 +-
 48 files changed, 26782 insertions(+), 16849 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
machristie@apache.org.