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:38 UTC
[airavata] 01/01: Merge remote-tracking branch 'origin/master' into
develop
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>