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 2017/04/05 19:11:08 UTC
[44/50] [abbrv] airavata git commit: Merge pull request #1 from
apache/develop
Merge pull request #1 from apache/develop
Merge airavata/develop into gouravshenoy/develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/db000411
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/db000411
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/db000411
Branch: refs/heads/develop
Commit: db000411a5abb3ec1eb91ffcc7f1265a182b9787
Parents: af39d44 30ab06f
Author: Gourav Shenoy <sh...@gmail.com>
Authored: Wed Apr 5 12:23:34 2017 -0400
Committer: GitHub <no...@github.com>
Committed: Wed Apr 5 12:23:34 2017 -0400
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 25 +-
.../security/KeyCloakSecurityManager.java | 281 +
.../airavata/compute_resource_model_types.cpp | 8 +-
.../lib/airavata/compute_resource_model_types.h | 3 +-
.../Model/AppCatalog/ComputeResource/Types.php | 2 +
.../model/appcatalog/computeresource/ttypes.py | 3 +
.../computeresource/ResourceJobManagerType.java | 9 +-
.../application/io/InputDataObjectType.java | 2 +-
dev-tools/ansible/.gitignore | 2 +
dev-tools/ansible/README.md | 9 +-
dev-tools/ansible/airavata.yml | 39 +
dev-tools/ansible/ansible.cfg | 2 +
dev-tools/ansible/group_vars/.gitignore | 1 -
dev-tools/ansible/group_vars/all.yml | 91 -
dev-tools/ansible/group_vars/dev-airavata.yml | 2 -
dev-tools/ansible/group_vars/dev-pga.yml | 3 -
dev-tools/ansible/group_vars/local.yml.template | 4 -
dev-tools/ansible/hosts | 35 -
.../inventories/develop/group_vars/.gitignore | 1 +
.../inventories/develop/group_vars/all.yml | 94 +
.../develop/group_vars/dev-airavata.yml | 2 +
.../inventories/develop/group_vars/dev-pga.yml | 3 +
.../develop/group_vars/local.yml.template | 4 +
dev-tools/ansible/inventories/develop/hosts | 35 +
.../geogateway-dev/group_vars/pga/vars.yml | 33 +
.../geogateway-dev/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/geogateway-dev/hosts | 2 +
.../testing-0.17-scigap/group_vars/all/vars.yml | 91 +
.../group_vars/all/vault.yml | 7 +
.../testing-0.17-scigap/group_vars/pga/vars.yml | 32 +
.../group_vars/pga/vault.yml | 18 +
.../inventories/testing-0.17-scigap/hosts | 23 +
.../group_vars/all/vars.yml | 91 +
.../group_vars/all/vault.yml | 7 +
.../group_vars/pga/vars.yml | 32 +
.../group_vars/pga/vault.yml | 18 +
.../inventories/testing-0.17-testdrive/hosts | 23 +
.../inventories/testing-0.17/files/airavata.jks | 76 +
.../testing-0.17/files/airavata_sym.jks | 30 +
.../testing-0.17/group_vars/all/vars.yml | 90 +
.../testing-0.17/group_vars/all/vault.yml | 7 +
.../testing-0.17/group_vars/pga/vars.yml | 31 +
.../testing-0.17/group_vars/pga/vault.yml | 18 +
.../ansible/inventories/testing-0.17/hosts | 23 +
dev-tools/ansible/pga.yml | 8 +
.../ansible/roles/api-orch/defaults/main.yml | 1 +
.../templates/airavata-server.properties.j2 | 18 +-
.../ansible/roles/common/defaults/main.yml | 3 +
dev-tools/ansible/roles/common/tasks/main.yml | 12 +-
.../database/files/MariaDB_yum_CentOS_7.repo | 7 +
dev-tools/ansible/roles/database/tasks/main.yml | 13 +-
dev-tools/ansible/roles/database/vars/main.yml | 6 +-
.../ansible/roles/env_setup/tasks/main.yml | 10 +-
.../templates/airavata-server.properties.j2 | 6 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 38 +
dev-tools/ansible/roles/pga/handlers/main.yml | 4 +-
.../roles/pga/tasks/install_deps_CentOS_7.yml | 33 +
.../roles/pga/tasks/install_deps_Ubuntu_14.yml | 48 +
.../roles/pga/tasks/install_deps_Ubuntu_16.yml | 61 +
dev-tools/ansible/roles/pga/tasks/main.yml | 87 +-
.../ansible/roles/pga/templates/httpd.conf.j2 | 353 -
.../roles/pga/templates/pga-vhost.conf.j2 | 11 +
.../roles/pga/templates/pga_config.php.j2 | 8 +
dev-tools/ansible/roles/pga/vars/main.yml | 30 -
.../apache/airavata/common/utils/Constants.java | 2 +
.../airavata/common/utils/ServerSettings.java | 9 +
.../main/resources/airavata-server.properties | 5 +
.../src/main/resources/client_truststore.jks | Bin 2423 -> 3740 bytes
.../server/src/main/resources/gfac-config.yaml | 3 +-
.../store/store/impl/db/CredentialsDAO.java | 2 +-
.../gfac/core/context/ProcessContext.java | 49 +-
.../org/apache/airavata/gfac/impl/SSHUtils.java | 13 +-
.../job/AiravataCustomCommandOutputParser.java | 59 +
.../gfac/impl/task/SCPDataStageTask.java | 2 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 11 +-
.../monitor/email/parser/LSFEmailParser.java | 1 -
.../catalog/impl/UsrResourceProfileImpl.java | 4 +-
.../model/UserComputeResourcePreference.java | 6 +-
.../model/UserComputeResourcePreferencePK.java | 24 +-
.../catalog/model/UserStoragePreference.java | 6 +-
.../catalog/model/UserStoragePreferencePK.java | 22 +-
.../UserComputeHostPreferenceResource.java | 10 +-
.../UserStoragePreferenceResource.java | 14 +-
.../catalog/impl/ExperimentRegistry.java | 10 +-
.../catalog/impl/ProjectRegistry.java | 44 +-
.../main/resources/workflowcatalog-mysql.sql | 3 +-
.../registry/cpi/CompositeIdentifier.java | 12 +-
.../service/handler/RegistryServerHandler.java | 2 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 64 +
.../credentialStore_schema_delta.sql | 17 +
.../DeltaScripts/expCatalog_schema_delta.sql | 34 +
.../replicaCatalog_schema_delta.sql | 12 +
.../DeltaScripts/workFlow_schema_delta.sql | 11 +
.../0.16-0.17/migration-notes.md | 10 +
.../migrator/airavata/AiravataDataMigrator.java | 30 +-
.../registry/db/entities/EntityEntity.java | 11 +
.../db/repositories/EntityRepository.java | 13 +-
.../db/repositories/SharingRepository.java | 11 +
.../sharing/registry/db/utils/DBConstants.java | 1 +
.../server/SharingRegistryServerHandler.java | 145 +-
.../main/resources/sharing-registry-derby.sql | 1 +
.../main/resources/sharing-registry-mysql.sql | 1 +
.../registry/SharingRegistryServiceTest.java | 28 +-
.../sharing/registry/models/Entity.java | 160 +-
.../registry/models/EntitySearchField.java | 6 +-
.../registry/models/SearchCondition.java | 4 +-
.../service/cpi/SharingRegistryService.java | 19547 +++++++++++------
.../sharing-service-docs/api-docs/index.html | 6 +
.../api-docs/sharing_cpi.html | 35 +
.../api-docs/sharing_models.html | 48 +-
.../thrift_models/sharing_cpi.thrift | 24 +
.../thrift_models/sharing_models.thrift | 15 +-
sandbox/job-status-rest-server/README.MD | 2 +-
sandbox/job-status-rest-server/app.py | 8 +-
.../compute_resource_model.thrift | 3 +-
115 files changed, 15251 insertions(+), 7396 deletions(-)
----------------------------------------------------------------------