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 2017/09/26 19:10:09 UTC
[40/40] airavata git commit: Merge branch 'AIRAVATA-2500' into develop
Merge branch 'AIRAVATA-2500' into develop
I regenerated thrift stubs to deal with some conflicts
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ebdf8977
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ebdf8977
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ebdf8977
Branch: refs/heads/develop
Commit: ebdf8977f90d82572186a8944b9b7cdddac5db6a
Parents: 666bcdf 50d7bb6
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Sep 26 15:08:05 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Sep 26 15:08:05 2017 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 5 +
.../server/handler/AiravataServerHandler.java | 84 +
.../java/org/apache/airavata/api/Airavata.java | 34970 ++++++++++-------
.../resources/lib/Airavata/API/Airavata.php | 4066 +-
.../Model/AppCatalog/GatewayProfile/Types.php | 143 +-
.../AppCatalog/UserResourceProfile/Types.php | 28 +
.../SSHAccountProvisioner.java | 722 +
.../SSHAccountProvisionerConfigParam.java | 702 +
.../SSHAccountProvisionerConfigParamType.java | 62 +
.../ComputeResourcePreference.java | 375 +-
.../gatewayprofile/GatewayResourceProfile.java | 72 +-
.../UserComputeResourcePreference.java | 113 +-
modules/compute-account-provisioning/pom.xml | 73 +
.../accountprovisioning/ConfigParam.java | 89 +
.../InvalidSetupException.java | 43 +
.../InvalidUsernameException.java | 43 +
.../accountprovisioning/SSHAccountManager.java | 296 +
.../SSHAccountProvisioner.java | 77 +
.../SSHAccountProvisionerFactory.java | 63 +
.../SSHAccountProvisionerProvider.java | 60 +
.../airavata/accountprovisioning/SSHUtil.java | 154 +
.../IULdapSSHAccountProvisioner.java | 190 +
.../IULdapSSHAccountProvisionerProvider.java | 80 +
...ntprovisioning.SSHAccountProvisionerProvider | 22 +
.../SSHAccountProvisionerFactoryTest.java | 77 +
.../provisioner/TestSSHAccountProvisioner.java | 65 +
.../TestSSHAccountProvisionerProvider.java | 80 +
...ntprovisioning.SSHAccountProvisionerProvider | 21 +
.../catalog/impl/GwyResourceProfileImpl.java | 12 +
.../catalog/impl/UsrResourceProfileImpl.java | 2 +
.../model/ComputeResourcePreference.java | 41 +-
.../SSHAccountProvisionerConfiguration.java | 98 +
.../SSHAccountProvisionerConfigurationPK.java | 57 +
.../model/UserComputeResourcePreference.java | 10 +
.../ComputeHostPreferenceResource.java | 62 +-
.../UserComputeHostPreferenceResource.java | 11 +
.../app/catalog/util/AppCatalogJPAUtils.java | 10 +
.../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 +-
47 files changed, 26586 insertions(+), 16727 deletions(-)
----------------------------------------------------------------------