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 2019/11/12 23:16:37 UTC
[airavata] branch develop updated (240a55b -> adb4408)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 240a55b Ansible: update dev distantreader domain
add bb15f3b Merge branch 'staging'
add 9c1e364 Merge branch 'master' of https://github.com/apache/airavata
add 0c42596 Added vars.yml and vault.yml for django seagrid portal in production host_vars
add dbc1040 Added vars.yml and vault.yml for django search SRA portal in production host_vars
add 3c36482 Added vars.yml and vault.yml for django SIMCCS portal in production host_vars
add 8f41a09 Added vars.yml and vault.yml for django Testdrive portal in production host_vars
add e2c8114 Adding production django/vars.yml file
add bbb43a6 AIRAVATA-3019 Additional vhost aliases support
add 43453fd Fixing missing libraries in distribution
add fdf5079 AIRAVATA-3250 Link to PGA from Django portal
add f007d55 AIRAVATA-3234 check for null URI/URI_COLLECTION values
add 59b4afd AIRAVATA-3233 Adding missing break statement
add cca4dce AIRAVATA-3186 Return registry client to the pool in all cases
add fdb503b Adding profile service properties
add dc4a55e Adding additional missing properties to data migrator
add 5f9542d Fixing order of arguments
add 0af0fbe Merge remote-tracking branch 'origin/staging'
add 405f9c9 Update staging deploy branch to master
add 7b19478 Moving engine change up to allow FKs to work
add 1cdea6c Wait until event based user replication completes
add bb1e5a8 Load client updates with user authentications
add deaa9a2 Copy oauth details from profile_service
add c9975b2 Create sharing user records for missing users after waiting for event based replication
add 01eda63 ansible: updating staging pga settings
add 9bfc94d Assigning maximum size threshold for archiving task
add b6cf15e Updating asf.yml to support specification
add bd01d9f Updating asf.yml to support specification
add 7ceaad2 AIRAVATA-3234 Fix empty string test to skip staging optional inputs
add 4e10b00 Adding Distant reader django vars.yml
add e0a2f98 Adding Distant reader django vault.yml
add 76157e2 Adding IU Gateway details for Django deployment
add 1ba6392 Adding SSH key for django seagrid
add 5f4937f Added the new doamin for the PGA SEAGrid gateway
add 12594fd Added the new doamin and SSL certificate to PGA SearchSRA gateway
add 76b1af8 Added the new doamin and SSL certificate to PGA SearchSRA gateway
add f4d91dd Added the new doamin and SSL certificate to PGA SearchSRA gateway
add 6cb475f Added the new doamin and SSL certificate to Django SimVascular gateway
add c69f772 Added the new doamin and SSL certificate to Django SimVascular gateway
add a01e8bc Added the new doamin and SSL certificate to Django dREG gateway
add 135c80e Added the new doamin and SSL certificate to Django dREG gateway
add 096c823 Added the new doamin and SSL certificate to Django AMP gateway
add 999f84f Added the new doamin and SSL certificate to PGA Distant reader gateway
add b96efe4 Added the new doamin and SSL certificate to PGA Search SRA gateway
add cb5a042 Added the new doamin and SSL certificate to Django CSBG LSU gateway
add b2e758a Added the new Django gateways to the host file
add 866bc75 Added SSL certificates and .yml for Django EPW gateway
add e9c1699 Added SSL certificates and .yml for Django EPW gateway
add b4d14f0 Added SSL certificates and .yml for Django FutureWater gateway
add 3d19c51 Added SSL certificates and .yml for Django FutureWater gateway
add 1867418 Added SSL certificates and .yml for Django Georgia State gateway
add ae53c6b Added SSL certificates and .yml for Django Georgia State gateway
add 50abaf5 Added SSL certificates and .yml for Django Hubzero gateway
add f6d0c1c Added SSL certificates and .yml for Django Hubzero gateway
add e61d334 Added redirect url for admin dashboard in django
add 00e26da Added redirect url for admin dashboard in django
add 60bc601 Added redirect url for admin dashboard in django
add 12e9033 Added redirect url for admin dashboard in django
add 619445a Added .yml and ssl certificates for Django InterACTWEL gateway
add eb06386 Added .yml and ssl certificates for Django InterACTWEL gateway
add bf77ccf Added .yml and ssl certificates for Django simccs gateway
add b57c7eb Added .yml and ssl certificates for Django simccs gateway
add 4ea1aed Added .yml and ssl certificates for Django Kentucky gateway
add 01ae415 Added .yml and ssl certificates for Django Mines gateway
add 5272e0c Added .yml and ssl certificates for Django Nanoconfinement gateway
add 3734704 Added .yml and ssl certificates for Django Nanoconfinement gateway
add 2fdd134 Added .yml and ssl certificates for Django Nanoshape gateway
add 2602903 Added .yml and ssl certificates for Django NCSA Industry gateway
add 8e802b4 Added .yml and ssl certificates for Django NCSA Industry gateway
add 7db06cc Added .yml and ssl certificates for Django New Mexico State gateway
add 6090d48 Added .yml and ssl certificates for Django Next TDB gateway
add 2b9f739 Added .yml and ssl certificates for Django Next TDB gateway
add d5ef656 Added .yml and ssl certificates for Django OSCER gateway
add a970510 Added .yml and ssl certificates for Django OSCER gateway
add 31797c1 Added .yml and ssl certificates for Django Phasta gateway
add 4cd3a4e Added .yml and ssl certificates for Django R-HPC gateway
add a844594 Added .yml and ssl certificates for Django R-HPC gateway
add 3ff60ca Added .yml and ssl certificates for Django Rutgersgemr gateway
add 33cbb21 Added .yml and ssl certificates for Django Saver-X gateway
add 18d2356 Added .yml and ssl certificates for Django Saver-X gateway
add a28131c Added .yml and ssl certificates for Django SD State gateway
add cec78b0 Added .yml and ssl certificates for Django SD State gateway
add 6f7c7f7 Added .yml and ssl certificates for Django USD gateway
add 3a14bf9 Added .yml and ssl certificates for Django USD gateway
add 9afa3b6 Added .yml and ssl certificates for Django SnowVision gateway
add a6bcd54 Added .yml and ssl certificates for Django SnowVision gateway
add c9e6f9b Added .yml and ssl certificates for Django Testdrive gateway
add 8ce1d60 Added .yml and ssl certificates for Django UAB gateway
add bd933b2 Added .yml and ssl certificates for Django UAB gateway
add ba22c39 Added .yml and ssl certificates for Django WVSU gateway
add 06d8257 Added .yml and ssl certificates for Django WVSU gateway
add 084e54c Updating production vars for 0.19 deployment
add c310860 Updating production inventory for 0.19 release
add 3a00939 setting group_resource_profile_id for pga configs
add 8011fd9 Adding missing pga_reroute_to_django var for prod pgas
add 9858de5 production inventory updates for Django deploys
add f0d94cd Exclude .git directory in built Django code
add fd3d04e Updating dreg inventory
add 449b758 futurewater production inventory
add 6cc2a86 Adding new settings to simvascular pga_config
add 9aa2b2c Ansible: fix handling of unspecified auth options
add 772df3c Ansible: DATASETS_DIR for simccs.org
add 1dd965c Ansible: fix handling of unspecified auth options
add 4817827 Setting max archive size to 20GB and showing friendly logs
add 54dad18 ansible: interactwel not configured for cilogon
add 69cd2e6 Ansible: update simvascular admin emails
add c5e8afd Updated the local data location for staging participant
add bee51db Showing a friendly message when the email is not provided
add 19f5fde Ansible: enable abandoned thrift client removal in prod
add ab4e01c Fixed the university name in the gateway
add 85ca2b2 Merge branch 'master' of https://github.com/apache/airavata
add e5d6c66 Ansible: update nanoconfinement ssh key
add 3ef4916 Ansible: fixing name of host
add 37cdb64 Ansible: fixing typo in host name
add 3523a32 Ansible rename directories
add 03221e6 Ansible: rename directories to lowercase
add 2c54041 Ansible: futurewater - add django link to pga dashboard
add f6911d7 Ansible: Enable tus uploads in production djangos
add 76c6ee4 AIRAVATA-3269 Prevent setting JOB.TASK_ID to null
add 58cf23c AIRAVATA-3270 Return sharing thrift client in launchExperiment
add f88117b AIRAVATA-3262 Fix mapping csv string (db) <-> list<string> (thrift)
add f025f12 Ansible: fix experiment_data_dir
new adb4408 Merge remote-tracking branch 'origin/master' into develop
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 16 ++--
.../api/server/handler/AiravataServerHandler.java | 6 +-
.../scigap/dreg-production/group_vars/all/vars.yml | 30 ++++++++
.../scigap/dreg-production/group_vars/pga/vars.yml | 3 +
.../inventories/scigap/dreg-production/hosts | 16 +---
.../pfec-hydro-production/group_vars/all/vars.yml | 30 ++++++++
.../pfec-hydro-production/group_vars/pga/vars.yml | 3 +
.../inventories/scigap/pfec-hydro-production/hosts | 16 +---
.../scigap/production/group_vars/all/vars.yml | 13 +++-
.../scigap/production/group_vars/django/vars.yml | 40 ++++++++++
.../host_vars/ampgateway}/vars.yml | 28 ++++---
.../production/host_vars/ampgateway/vault.yml | 15 ++++
.../scigap/production/host_vars/csbglsu/vars.yml | 49 ++++++++++++
.../scigap/production/host_vars/csbglsu/vault.yml | 15 ++++
.../distantreader/vars.yml | 44 ++++-------
.../production/host_vars/distantreader/vault.yml | 15 ++++
.../scigap/production/host_vars/dreg/vars.yml | 55 ++++++++++++++
.../host_vars/dreg/vault.yml | 0
.../production/host_vars/epwgateway/vars.yml | 49 ++++++++++++
.../production/host_vars/epwgateway/vault.yml | 15 ++++
.../production/host_vars/futurewater/vars.yml | 55 ++++++++++++++
.../production/host_vars/futurewater/vault.yml | 15 ++++
.../host_vars/georgiastate}/vars.yml | 28 ++++---
.../production/host_vars/georgiastate/vault.yml | 15 ++++
.../host_vars/hubzero}/vars.yml | 28 ++++---
.../scigap/production/host_vars/hubzero/vault.yml | 15 ++++
.../production/host_vars/interactwel/vars.yml | 49 ++++++++++++
.../production/host_vars/interactwel/vault.yml | 15 ++++
.../host_vars/iugateway}/vars.yml | 28 +++----
.../production/host_vars/iugateway/vault.yml | 15 ++++
.../scigap/production/host_vars/kentucky/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/kentucky/vault.yml | 15 ++++
.../host_vars/mines}/vars.yml | 28 ++++---
.../scigap/production/host_vars/mines/vault.yml | 15 ++++
.../production/host_vars/nanoconfinement/vars.yml | 48 ++++++++++++
.../production/host_vars/nanoconfinement/vault.yml | 15 ++++
.../host_vars/nanoshape}/vars.yml | 28 ++++---
.../production/host_vars/nanoshape/vault.yml | 15 ++++
.../host_vars/ncsaindustry}/vars.yml | 28 ++++---
.../production/host_vars/ncsaindustry/vault.yml | 15 ++++
.../host_vars/newmexicostate}/vars.yml | 28 ++++---
.../production/host_vars/newmexicostate/vault.yml | 15 ++++
.../scigap/production/host_vars/nexttdb/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/nexttdb/vault.yml | 15 ++++
.../host_vars/oscer}/vars.yml | 28 ++++---
.../scigap/production/host_vars/oscer/vault.yml | 15 ++++
.../host_vars/phasta}/vars.yml | 28 ++++---
.../scigap/production/host_vars/phasta/vault.yml | 15 ++++
.../scigap/production/host_vars/r-hpc/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/r-hpc/vault.yml | 15 ++++
.../production/host_vars/rutgersgemr/vars.yml | 48 ++++++++++++
.../production/host_vars/rutgersgemr/vault.yml | 15 ++++
.../scigap/production/host_vars/saverx/vars.yml | 50 ++++++++++++
.../scigap/production/host_vars/saverx/vault.yml | 15 ++++
.../scigap/production/host_vars/sdstate/vars.yml | 50 ++++++++++++
.../scigap/production/host_vars/sdstate/vault.yml | 15 ++++
.../host_vars/seagrid/vars.yml | 15 ++--
.../host_vars/seagrid/vault.yml | 0
.../searchingSRA => host_vars/searchsra}/vars.yml | 43 ++++-------
.../host_vars/searchsra/vault.yml | 0
.../simccs/files/django-ssl-vhost.conf.j2 | 0
.../scigap/production/host_vars/simccs/vars.yml | 63 ++++++++++++++++
.../host_vars/simccs/vault.yml | 0
.../production/host_vars/simvascular/vars.yml | 51 +++++++++++++
.../production/host_vars/simvascular/vault.yml | 15 ++++
.../host_vars/snowvision}/vars.yml | 28 ++++---
.../production/host_vars/snowvision/vault.yml | 15 ++++
.../production/host_vars/southdakota/vars.yml | 48 ++++++++++++
.../production/host_vars/southdakota/vault.yml | 15 ++++
.../host_vars/testdrive}/vars.yml | 26 +++----
.../host_vars/testdrive/vault.yml | 0
.../seagrid => production/host_vars/uab}/vars.yml | 26 +++----
.../scigap/production/host_vars/uab/vault.yml | 15 ++++
.../scigap/production/host_vars/wvsu/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/wvsu/vault.yml | 15 ++++
.../ansible/inventories/scigap/production/hosts | 50 ++++++++++--
.../production/pga_config/distantreader/vars.yml | 11 ++-
.../production/pga_config/iugateway/vars.yml | 3 +
.../scigap/production/pga_config/scigap/vars.yml | 9 +--
.../scigap/production/pga_config/seagrid/vars.yml | 13 ++--
.../production/pga_config/searchingSRA/vars.yml | 13 ++--
.../pga_config/simvascular/files/pga_config.php.j2 | 21 +++++-
.../production/pga_config/simvascular/vars.yml | 3 +
.../scigap/staging/group_vars/all/vars.yml | 5 +-
.../scigap/staging/host_vars/seagrid/vars.yml | 4 +
.../scigap/staging/pga_config/scigap/vars.yml | 2 -
.../scigap/staging/pga_config/seagrid/vars.yml | 4 +-
.../scigap/staging/pga_config/testdrive/vars.yml | 4 +-
.../scigap/staging/pga_config/ultrascan/vars.yml | 4 +-
dev-tools/ansible/pga-scigap-prod.yml | 66 ++++++++--------
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 4 +-
.../django/templates/django-ssl-vhost.conf.j2 | 8 ++
.../roles/django/templates/django-vhost.conf.j2 | 8 ++
.../roles/django/templates/settings_local.py.j2 | 8 +-
.../participant/airavata-server.properties.j2 | 2 +-
.../helix/impl/task/staging/ArchiveTask.java | 88 ++++++++++++----------
.../task/submission/config/GroovyMapBuilder.java | 3 +
modules/commons/pom.xml | 1 -
modules/distribution/pom.xml | 6 ++
.../src/main/assembly/controller-bin-assembly.xml | 1 +
.../main/assembly/email-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 1 +
.../src/main/assembly/participant-bin-assembly.xml | 1 +
.../assembly/platform-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/post-wm-bin-assembly.xml | 1 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 1 +
.../assembly/realtime-monitor-bin-assembly.xml | 2 +
.../cpi/impl/SimpleOrchestratorImpl.java | 3 +-
.../server/OrchestratorServerHandler.java | 4 +-
.../core/entities/expcatalog/ExperimentEntity.java | 8 +-
.../core/entities/expcatalog/JobEntity.java | 4 +-
.../core/entities/expcatalog/ProcessEntity.java | 6 +-
.../utils/DozerConverter/CsvStringConverter.java | 56 ++++++++++++++
.../src/main/resources/dozer_mapping.xml | 39 +++++++++-
.../expcatalog/ExperimentRepositoryTest.java | 6 ++
.../expcatalog/ProcessRepositoryTest.java | 5 ++
.../DeltaScripts/appCatalog_schema_delta.sql | 85 +++++++++++----------
.../experimentCatalog_schema_delta.sql | 10 +++
.../migrator/airavata/AiravataDataMigrator.java | 38 ++++++++--
.../resources/airavata-server.properties.sample | 13 ++++
.../messaging/SharingServiceDBEventHandler.java | 4 -
.../registry/utils/ThriftDataModelConversion.java | 7 +-
pom.xml | 6 ++
tools/load-client/pom.xml | 5 ++
.../apache/airavata/tools/load/Authenticator.java | 45 +++++++++++
.../apache/airavata/tools/load/Configuration.java | 43 +++++++++++
.../org/apache/airavata/tools/load/LoadClient.java | 30 +++++---
.../src/main/resources/conf/load-config.yml | 17 +++--
129 files changed, 2126 insertions(+), 505 deletions(-)
create mode 100644 dev-tools/ansible/inventories/scigap/dreg-production/group_vars/all/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/pfec-hydro-production/group_vars/all/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/group_vars/django/vars.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/ampgateway}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/ampgateway/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/csbglsu/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/csbglsu/vault.yml
copy dev-tools/ansible/inventories/scigap/production/{pga_config => host_vars}/distantreader/vars.yml (55%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/distantreader/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/dreg/vars.yml
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/dreg/vault.yml (100%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/epwgateway/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/epwgateway/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/futurewater/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/georgiastate}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/georgiastate/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/hubzero}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/hubzero/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/interactwel/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/interactwel/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/iugateway}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/iugateway/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/kentucky/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/kentucky/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/mines}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/mines/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/nanoconfinement/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/nanoconfinement/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/nanoshape}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/nanoshape/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/ncsaindustry}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/ncsaindustry/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/newmexicostate}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/newmexicostate/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/nexttdb/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/nexttdb/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/oscer}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/oscer/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/phasta}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/phasta/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/r-hpc/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/r-hpc/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/rutgersgemr/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/rutgersgemr/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/saverx/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/saverx/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/sdstate/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/sdstate/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/seagrid/vars.yml (65%)
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/seagrid/vault.yml (100%)
copy dev-tools/ansible/inventories/scigap/production/{pga_config/searchingSRA => host_vars/searchsra}/vars.yml (56%)
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/searchsra/vault.yml (100%)
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/simccs/files/django-ssl-vhost.conf.j2 (100%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/simccs/vars.yml
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/simccs/vault.yml (100%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/simvascular/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/simvascular/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/snowvision}/vars.yml (50%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/snowvision/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/southdakota/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/southdakota/vault.yml
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/testdrive}/vars.yml (51%)
copy dev-tools/ansible/inventories/scigap/{staging => production}/host_vars/testdrive/vault.yml (100%)
copy dev-tools/ansible/inventories/scigap/{staging/host_vars/seagrid => production/host_vars/uab}/vars.yml (51%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/uab/vault.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/wvsu/vars.yml
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/wvsu/vault.yml
create mode 100644 modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/DozerConverter/CsvStringConverter.java
create mode 100644 tools/load-client/src/main/java/org/apache/airavata/tools/load/Authenticator.java
[airavata] 01/01: Merge remote-tracking branch 'origin/master' into
develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit adb440898e5debae4110a5b20ba296c02fa9e0f9
Merge: 240a55b f025f12
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Tue Nov 12 18:16:22 2019 -0500
Merge remote-tracking branch 'origin/master' into develop
.asf.yaml | 16 ++--
.../api/server/handler/AiravataServerHandler.java | 6 +-
.../scigap/dreg-production/group_vars/all/vars.yml | 30 ++++++++
.../scigap/dreg-production/group_vars/pga/vars.yml | 3 +
.../inventories/scigap/dreg-production/hosts | 16 +---
.../pfec-hydro-production/group_vars/all/vars.yml | 30 ++++++++
.../pfec-hydro-production/group_vars/pga/vars.yml | 3 +
.../inventories/scigap/pfec-hydro-production/hosts | 16 +---
.../scigap/production/group_vars/all/vars.yml | 13 +++-
.../scigap/production/group_vars/django/vars.yml | 40 ++++++++++
.../host_vars/ampgateway}/vars.yml | 28 ++++---
.../production/host_vars/ampgateway/vault.yml | 15 ++++
.../scigap/production/host_vars/csbglsu/vars.yml | 49 ++++++++++++
.../scigap/production/host_vars/csbglsu/vault.yml | 15 ++++
.../distantreader/vars.yml | 44 ++++-------
.../production/host_vars/distantreader/vault.yml | 15 ++++
.../scigap/production/host_vars/dreg/vars.yml | 55 ++++++++++++++
.../scigap/production/host_vars/dreg/vault.yml | 15 ++++
.../production/host_vars/epwgateway/vars.yml | 49 ++++++++++++
.../production/host_vars/epwgateway/vault.yml | 15 ++++
.../production/host_vars/futurewater/vars.yml | 55 ++++++++++++++
.../production/host_vars/futurewater/vault.yml | 15 ++++
.../host_vars/georgiastate}/vars.yml | 28 ++++---
.../production/host_vars/georgiastate/vault.yml | 15 ++++
.../host_vars/hubzero}/vars.yml | 28 ++++---
.../scigap/production/host_vars/hubzero/vault.yml | 15 ++++
.../production/host_vars/interactwel/vars.yml | 49 ++++++++++++
.../production/host_vars/interactwel/vault.yml | 15 ++++
.../host_vars/iugateway}/vars.yml | 28 +++----
.../production/host_vars/iugateway/vault.yml | 15 ++++
.../scigap/production/host_vars/kentucky/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/kentucky/vault.yml | 15 ++++
.../host_vars/mines}/vars.yml | 28 ++++---
.../scigap/production/host_vars/mines/vault.yml | 15 ++++
.../production/host_vars/nanoconfinement/vars.yml | 48 ++++++++++++
.../production/host_vars/nanoconfinement/vault.yml | 15 ++++
.../host_vars/nanoshape}/vars.yml | 28 ++++---
.../production/host_vars/nanoshape/vault.yml | 15 ++++
.../host_vars/ncsaindustry}/vars.yml | 28 ++++---
.../production/host_vars/ncsaindustry/vault.yml | 15 ++++
.../host_vars/newmexicostate}/vars.yml | 28 ++++---
.../production/host_vars/newmexicostate/vault.yml | 15 ++++
.../scigap/production/host_vars/nexttdb/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/nexttdb/vault.yml | 15 ++++
.../host_vars/oscer}/vars.yml | 28 ++++---
.../scigap/production/host_vars/oscer/vault.yml | 15 ++++
.../host_vars/phasta}/vars.yml | 28 ++++---
.../scigap/production/host_vars/phasta/vault.yml | 15 ++++
.../scigap/production/host_vars/r-hpc/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/r-hpc/vault.yml | 15 ++++
.../production/host_vars/rutgersgemr/vars.yml | 48 ++++++++++++
.../production/host_vars/rutgersgemr/vault.yml | 15 ++++
.../scigap/production/host_vars/saverx/vars.yml | 50 ++++++++++++
.../scigap/production/host_vars/saverx/vault.yml | 15 ++++
.../scigap/production/host_vars/sdstate/vars.yml | 50 ++++++++++++
.../scigap/production/host_vars/sdstate/vault.yml | 15 ++++
.../host_vars/seagrid/vars.yml | 15 ++--
.../scigap/production/host_vars/seagrid/vault.yml | 15 ++++
.../searchingSRA => host_vars/searchsra}/vars.yml | 43 ++++-------
.../production/host_vars/searchsra/vault.yml | 15 ++++
.../simccs/files}/django-ssl-vhost.conf.j2 | 6 +-
.../scigap/production/host_vars/simccs/vars.yml | 63 ++++++++++++++++
.../scigap/production/host_vars/simccs/vault.yml | 15 ++++
.../production/host_vars/simvascular/vars.yml | 51 +++++++++++++
.../production/host_vars/simvascular/vault.yml | 15 ++++
.../host_vars/snowvision}/vars.yml | 28 ++++---
.../production/host_vars/snowvision/vault.yml | 15 ++++
.../production/host_vars/southdakota/vars.yml | 48 ++++++++++++
.../production/host_vars/southdakota/vault.yml | 15 ++++
.../host_vars/testdrive}/vars.yml | 26 +++----
.../production/host_vars/testdrive/vault.yml | 15 ++++
.../seagrid => production/host_vars/uab}/vars.yml | 26 +++----
.../scigap/production/host_vars/uab/vault.yml | 15 ++++
.../scigap/production/host_vars/wvsu/vars.yml | 48 ++++++++++++
.../scigap/production/host_vars/wvsu/vault.yml | 15 ++++
.../ansible/inventories/scigap/production/hosts | 50 ++++++++++--
.../production/pga_config/distantreader/vars.yml | 11 ++-
.../production/pga_config/iugateway/vars.yml | 3 +
.../scigap/production/pga_config/scigap/vars.yml | 9 +--
.../scigap/production/pga_config/seagrid/vars.yml | 13 ++--
.../production/pga_config/searchingSRA/vars.yml | 13 ++--
.../pga_config/simvascular/files/pga_config.php.j2 | 21 +++++-
.../production/pga_config/simvascular/vars.yml | 3 +
.../scigap/staging/group_vars/all/vars.yml | 5 +-
.../scigap/staging/host_vars/seagrid/vars.yml | 4 +
.../scigap/staging/pga_config/scigap/vars.yml | 2 -
.../scigap/staging/pga_config/seagrid/vars.yml | 4 +-
.../scigap/staging/pga_config/testdrive/vars.yml | 4 +-
.../scigap/staging/pga_config/ultrascan/vars.yml | 4 +-
dev-tools/ansible/pga-scigap-prod.yml | 66 ++++++++--------
dev-tools/ansible/roles/django/defaults/main.yml | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 4 +-
.../django/templates/django-ssl-vhost.conf.j2 | 8 ++
.../roles/django/templates/django-vhost.conf.j2 | 8 ++
.../roles/django/templates/settings_local.py.j2 | 8 +-
.../participant/airavata-server.properties.j2 | 2 +-
.../helix/impl/task/staging/ArchiveTask.java | 88 ++++++++++++----------
.../task/submission/config/GroovyMapBuilder.java | 3 +
modules/commons/pom.xml | 1 -
modules/distribution/pom.xml | 6 ++
.../src/main/assembly/controller-bin-assembly.xml | 1 +
.../main/assembly/email-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/parser-wm-bin-assembly.xml | 1 +
.../src/main/assembly/participant-bin-assembly.xml | 1 +
.../assembly/platform-monitor-bin-assembly.xml | 1 +
.../src/main/assembly/post-wm-bin-assembly.xml | 1 +
.../src/main/assembly/pre-wm-bin-assembly.xml | 1 +
.../assembly/realtime-monitor-bin-assembly.xml | 2 +
.../cpi/impl/SimpleOrchestratorImpl.java | 3 +-
.../server/OrchestratorServerHandler.java | 4 +-
.../core/entities/expcatalog/ExperimentEntity.java | 8 +-
.../core/entities/expcatalog/JobEntity.java | 4 +-
.../core/entities/expcatalog/ProcessEntity.java | 6 +-
.../utils/DozerConverter/CsvStringConverter.java | 56 ++++++++++++++
.../src/main/resources/dozer_mapping.xml | 39 +++++++++-
.../expcatalog/ExperimentRepositoryTest.java | 6 ++
.../expcatalog/ProcessRepositoryTest.java | 5 ++
.../DeltaScripts/appCatalog_schema_delta.sql | 85 +++++++++++----------
.../experimentCatalog_schema_delta.sql | 10 +++
.../migrator/airavata/AiravataDataMigrator.java | 38 ++++++++--
.../resources/airavata-server.properties.sample | 13 ++++
.../messaging/SharingServiceDBEventHandler.java | 4 -
.../registry/utils/ThriftDataModelConversion.java | 7 +-
pom.xml | 6 ++
tools/load-client/pom.xml | 5 ++
.../apache/airavata/tools/load/Authenticator.java | 45 +++++++++++
.../apache/airavata/tools/load/Configuration.java | 43 +++++++++++
.../org/apache/airavata/tools/load/LoadClient.java | 30 +++++---
.../src/main/resources/conf/load-config.yml | 17 +++--
129 files changed, 2206 insertions(+), 506 deletions(-)
diff --cc pom.xml
index 87a44ba,9f28735..e513fac
--- a/pom.xml
+++ b/pom.xml
@@@ -118,11 -118,8 +118,12 @@@
<commons.io.version>2.4</commons.io.version>
<google.guava.version>20.0</google.guava.version>
<jacoco.version>0.8.1</jacoco.version>
- <openjpa.version>2.4.3</openjpa.version>
+ <openjpa.version>3.1.0</openjpa.version>
+ <javax.annotation.version>1.3.2</javax.annotation.version>
+ <jaxb.version>2.4.0-b180830.0359</jaxb.version>
+ <jmockit.version>1.44</jmockit.version>
+ <commons.lang.version>2.6</commons.lang.version>
+ <org.apache.commons.pool2.version>2.7.0</org.apache.commons.pool2.version>
</properties>
<developers>