You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2018/03/12 15:09:08 UTC

[airavata] branch helix-integration updated (ab8435b -> 07e8984)

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

dimuthuupe pushed a change to branch helix-integration
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from ab8435b  Restructuring property files
     add 6c1478c  Fixing AIRAVATA-2621
     add dc6ea56  Fixing AIRAVATA-2624 Sampede2 cluster SSH connectivity issue
     add 61b9684  Validating port value before overriding
     add c13c0c2  AIRAVATA-2608 Upgrade logback to latest
     add 766cbd8  AIRAVATA-2645 Add profile services to Python thrift stubs
     add 0d77ff5  AIRAVATA-2645 Generate Python thrift stubs
     add c43640f  Adding Searching SRA gateway
     add 87d323c  Log error when failing to execute groovy template
     add d70f9af  Updating email addresses in gfac-config.yaml
     add 274da25  Merge remote-tracking branch 'origin/master'
     add 807e1e7  Adding Searching SRA gateway record to the file
     add acf3a49  Added the public key generated by the gateway to the data store
     add 1d69f66  Added google analytics traching ID for USD gateway
     add 625732d  Added google analytics tracking ID for testdrive gateway
     add e9d64b8  Added google analytics tracking ID for dREG sequencing gateway
     add a73ba7b  changing dev email address to devjobs
     add 15cc7fe  added SSC gateway URL
     add 1044189  added SSC gateway details
     add bcdd119  Merge branch 'AIRAVATA-2571-email-verified'
     add 44dd8f1  added Rodeo VM details
     add bd4c6d8  airavata PGA gateway installation parameters updated
     add 5aec2a8  added google analytics ID
     add 80da347  added google analytics ID
     add 08f09bc  added google analytics ID for SIU gateway
     add 5a33b09  added google analytics ID for SimVascular gateway
     add ac7330b  added google analytics ID for SimCCS gateway
     add e101d43  added google analytics ID for IU Cyber gateway
     add f13c17f  Fixing AIRAVATA-2621
     add 0237909  Fixing AIRAVATA-2624 Sampede2 cluster SSH connectivity issue
     add 53888e1  Validating port value before overriding
     add 0f25c2f  Merge branch 'AIRAVATA-2621-bugfix' into develop
     add a24cf52  AIRAVATA-2594 Allow gateway-users to call getGatewayResourceProfile
     add 964aaab  Merge branch 'AIRAVATA-2500' into develop
     add bc22d0d  Set ownerId when creating group
     add 6f4ae17  Fix for setting ownerId on new group
     add f4814b8  Implemented getAllGroupsUserBelongs
     add 3ecbd3a  Merge pull request #163 from sachinkariyattin/develop
     add 649bb66  Removed dependencies
     add 4f4cbd6  Added new methods to registry api
     add 0e58134  Changes to pom and exceptions
     add 179ad80  Fix unit test to read escaped keystore file path
     add aff441a  Merge branch 'develop' of github.com:apache/airavata into develop
     add feff039  Merge branch 'develop' of https://github.com/apache/airavata into develop
     add f5aaf33  Changes to throw Runtimeexception
     add b74c1c5  AIRAVATA-2590 Only add processPerNode if there is a jobSubmitterCommand
     add 211691d  Merge branch 'AIRAVATA-2590-uge_groovy-template-fixes' into develop
     add ccfecab  Merge branch 'develop' of https://github.com/apache/airavata into develop
     add 3aee824  Merge pull request #164 from sachinkariyattin/develop
     add a049148  lastUpdateTime is required on TaskModel
     add a123fc0  AIRAVATA-2663 Include root cause when throwing new exception
     add 4c80791  AIRAVATA-2664 Thrift client not thread safe; new one for each request
     add 14ae202  AIRAVATA-2663 Fix NPE in createProcesses
     add 73d52c9  AIRAVATA-2667 Throw error if JobModel not found
     add 5091d6f  AIRAVATA-2667 Remove global Registry service client in ProcessContext
     add b26717b  AIRAVATA-2667 Add isJobExist method to Registry API
     add 0e2918a  IRAVATA-2668 Using addExperimentProcessOutputs to update outputs
     add 715bcae  AIRAVATA-2665 Allow admin-read-only for getAllCredentialSummaryForGateway
     add 665bed8  FIxing maven warnings
     add 7477deb  Travis: clone full repo for git-describe to work
     add 1f39ac6  derbynet needed in compile scope (CredentialStoreInitUtil)
     add e271719  Regenerate GroupManagerService Python stubs
     add 298fadf  Added Stampede2 email for job monitoring
     add 4a3ba81  Added Searching SRA Jetstream cluster email for job monitoring
     add 1692d9b  Merge branch 'AIRAVATA-2590-uge_groovy-template-fixes'
     add 6a600d0  Fixing Airavata-2143 : Experiments with overridden resource allocation details tries to use qos and reservation from community user
     add 49c5b5b  Providing high priority for process level queue name
     add a44fa60  Merge pull request #166 from DImuthuUpe/AIRAVATA-2143
     add 210cf43  Added GSU cluster email for monitoring.
     add a09ed5e  Added USD SLURM cluster email for monitoring.
     add 5e793c5  AIRAVATA-2672 Start Zookeeper as unprivileged user
     add 9991e44  AIRAVATA-2672 Setting Zookeeper log directory
     add e67ed30  Merge branch 'AIRAVATA-2672' into develop
     add 86a2908  Removing TestApplication
     add 8d4a65e  Ansible changes for Airavata Standalone Server
     add bf6ef8b  fixing database transaction issue in creating password credential and improving ansible scripts
     add 4da2c5f  fixing minor issues
     add 4f429ef  Updating cloning url to original airavata repo
     add 5f1e81f  Reverting back to https urls
     add 3a2e1be  Adding missing placeholder
     add d6fa1cf  Removing admin email value
     add 7eae3f9  Moving default gateway initialization code to api server
     add 9f06e0f  Minor improvement
     add 1f5066a  Reverting back to http urls as ansible does not trust mariadb ssl certificates
     add 882722c  Merge branch 'ansible-standalone' of https://github.com/DImuthuUpe/airavata into DImuthuUpe-ansible-standalone
     add 37b06e2  Merge branch 'DImuthuUpe-ansible-standalone' into develop
     add a544455  Use 'become' to open port 22 in firewall
     add 49ff096  Remove registry client from credential store
     add 04724f0  Merge branch 'DImuthuUpe-ansible-standalone' into develop
     add 3c3345d  Setting default pga_git_branch
     add cce75c8  Merge branch 'DImuthuUpe-ansible-standalone' into develop
     add 5144f67  Merge remote-tracking branch 'upstream/develop' into develop
     add 508b895  Improving exception handling of GfacServerHandler
     add b6c2e13  Merge pull request #175 from DImuthuUpe/develop
     add 4338008  Fixing incorrect assignment
     add 85c222b  Merge pull request #177 from DImuthuUpe/develop
     add 7124801  Removing some unnecessary RuntimeExceptions
     new 07e8984  Merge branch 'develop' into helix-integration

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:
 .travis.yml                                        |     1 -
 airavata-api/airavata-api-server/pom.xml           |    10 -
 .../api/server/handler/AiravataServerHandler.java  |    55 +
 .../resources/lib/airavata/api/Airavata-remote     |    35 -
 .../main/resources/lib/airavata/api/Airavata.py    | 10106 ++--
 .../api/sharing/SharingRegistryService-remote      |    35 +
 .../airavata/api/sharing/SharingRegistryService.py |  1695 +-
 .../resources/lib/airavata/model/sharing/ttypes.py |    84 +
 .../resources/lib/airavata/model/user/ttypes.py    |   369 +-
 .../{model/messaging => service}/__init__.py       |     0
 .../workspace => service/profile}/__init__.py      |     0
 .../workspace => service/profile}/constants.py     |     0
 .../profile/groupmanager}/__init__.py              |     0
 .../groupmanager/cpi/GroupManagerService-remote    |   187 +
 .../groupmanager/cpi/GroupManagerService.py        |  2733 ++
 .../service/profile/groupmanager/cpi/__init__.py   |     1 +
 .../profile/groupmanager/cpi}/constants.py         |     3 +-
 .../profile/groupmanager/cpi/error}/__init__.py    |     0
 .../profile/groupmanager/cpi/error}/constants.py   |     0
 .../profile/groupmanager/cpi/error/ttypes.py       |    78 +
 .../profile/groupmanager/cpi}/ttypes.py            |     5 +-
 .../messaging => service/profile/iam}/__init__.py  |     0
 .../profile/iam/admin}/__init__.py                 |     0
 .../profile/iam/admin/services}/__init__.py        |     0
 .../iam/admin/services/cpi/IamAdminServices-remote |   180 +
 .../iam/admin/services/cpi/IamAdminServices.py     |  2505 +
 .../profile/iam/admin/services/cpi/__init__.py     |     1 +
 .../profile/iam/admin/services/cpi}/constants.py   |     3 +-
 .../iam/admin/services/cpi/error}/__init__.py      |     0
 .../iam/admin/services/cpi/error}/constants.py     |     0
 .../profile/iam/admin/services/cpi/error/ttypes.py |    78 +
 .../profile/iam/admin/services/cpi}/ttypes.py      |     7 +-
 .../profile/tenant}/__init__.py                    |     0
 .../profile/tenant/cpi/TenantProfileService-remote |   166 +
 .../profile/tenant/cpi/TenantProfileService.py     |  1920 +
 .../service/profile/tenant/cpi/__init__.py         |     1 +
 .../profile/tenant/cpi}/constants.py               |     3 +-
 .../profile/tenant/cpi/error}/__init__.py          |     0
 .../profile/tenant/cpi/error}/constants.py         |     0
 .../service/profile/tenant/cpi/error/ttypes.py     |    78 +
 .../profile/tenant/cpi}/ttypes.py                  |     5 +-
 .../{api/sharing => service/profile}/ttypes.py     |     5 +-
 .../messaging => service/profile/user}/__init__.py |     0
 .../profile/user/cpi/UserProfileService-remote     |   152 +
 .../service/profile/user/cpi/UserProfileService.py |  1543 +
 .../airavata/service/profile/user/cpi/__init__.py  |     1 +
 .../{api => service/profile/user/cpi}/constants.py |     3 +-
 .../profile/user/cpi/error}/__init__.py            |     0
 .../profile/user/cpi/error}/constants.py           |     0
 .../service/profile/user/cpi/error/ttypes.py       |    78 +
 .../sharing => service/profile/user/cpi}/ttypes.py |     5 +-
 .../handlers/GroupManagerServiceHandler.java       |    26 +-
 .../service/security/KeyCloakSecurityManager.java  |     7 +-
 .../group_vars/pga/vars.yml                        |    39 +-
 .../scigap/{dreg-production => SGCI-SSC}/hosts     |     4 +-
 .../scigap/develop/group_vars/all/vars.yml         |     1 +
 .../develop/pga_config/TestApplication/vars.yml    |    66 -
 .../develop/pga_config/TestApplication/vault.yml   |    18 -
 .../scigap/develop/pga_config/scigap/vars.yml      |     2 +-
 .../scigap/develop/pga_config/seagrid/vars.yml     |     2 +-
 .../scigap/develop/pga_config/testdrive/vars.yml   |     2 +-
 .../scigap/dreg-production/group_vars/pga/vars.yml |     3 +-
 .../scigap/production/pga_config/csbglsu/vars.yml  |     1 +
 .../production/pga_config/iugateway/vars.yml       |     1 +
 .../production/pga_config/iugeosurvey/vars.yml     |     1 +
 .../scigap/production/pga_config/scigap/vars.yml   |     1 +
 .../{NCSAIndustry => searchingSRA}/vars.yml        |    28 +-
 .../production/pga_config/searchingSRA/vault.yml   |    18 +
 .../production/pga_config/simvascular/vars.yml     |     1 +
 .../production/pga_config/southdakota/vars.yml     |     1 +
 .../pga_config/southernillinois/vars.yml           |     1 +
 .../production/pga_config/testdrive/vars.yml       |     1 +
 .../group_vars/all/vars.yml                        |    60 +-
 .../group_vars/pga/vars.yml                        |    30 +-
 dev-tools/ansible/inventories/standalone/hosts     |    24 +
 .../inventories/template/group_vars/all/vars.yml   |    11 +-
 dev-tools/ansible/pga-scigap-dev.yml               |     1 -
 dev-tools/ansible/pga-scigap-prod.yml              |     1 +
 dev-tools/ansible/roles/api-orch/defaults/main.yml |    13 +-
 dev-tools/ansible/roles/api-orch/tasks/main.yml    |    12 +-
 .../templates/airavata-server.properties.j2        |     6 +-
 dev-tools/ansible/roles/common/tasks/main.yml      |     4 +-
 .../ansible/roles/database/tasks/keycloak.yml      |     2 +-
 dev-tools/ansible/roles/database/tasks/main.yml    |     2 +-
 dev-tools/ansible/roles/env_setup/tasks/main.yml   |     4 +
 dev-tools/ansible/roles/gfac/defaults/main.yml     |     5 +-
 .../gfac/templates/airavata-server.properties.j2   |     6 +-
 .../roles/gfac/templates/gfac-config.yaml.j2       |    11 +-
 dev-tools/ansible/roles/pga/defaults/main.yml      |    13 +-
 dev-tools/ansible/roles/pga/tasks/main.yml         |    16 +-
 .../default.conf => templates/default.conf.j2}     |     3 +-
 .../roles/pga/templates/pga-ssl-vhost.conf.j2      |     4 +-
 .../ansible/roles/pga/templates/pga-vhost.conf.j2  |     2 +-
 .../pga/{files/ssl.conf => templates/ssl.conf.j2}  |     4 +-
 dev-tools/ansible/roles/rabbitmq/tasks/main.yml    |     8 +-
 .../templates/airavata-server.properties.j2        |     2 +-
 dev-tools/ansible/roles/zookeeper/tasks/main.yml   |     6 +
 .../ansible/roles/zookeeper/templates/java.env.j2  |     1 +
 .../roles/zookeeper/templates/zookeeper.service.j2 |     1 +
 dev-tools/ansible/roles/zookeeper/vars/main.yml    |     2 +-
 .../roles/zookeeper/vars/main.yml                  |     2 +-
 .../apache/airavata/common/utils/ThriftUtils.java  |    14 +-
 .../airavata/common/utils/SecurityUtilTest.java    |    23 +-
 .../server/src/main/resources/UGE_Groovy.template  |     6 +-
 .../credential-store-service/pom.xml               |     6 -
 .../store/impl/util/CredentialStoreInitUtil.java   |     1 +
 .../store/store/impl/db/CredentialsDAOTest.java    |    10 +-
 modules/distribution/pom.xml                       |     5 -
 modules/gfac/gfac-core/pom.xml                     |    15 +-
 .../java/org/apache/airavata/gfac/core/GFac.java   |     6 +-
 .../apache/airavata/gfac/core/GFacConstants.java   |     8 +
 .../org/apache/airavata/gfac/core/GFacEngine.java  |     3 +-
 .../org/apache/airavata/gfac/core/GFacUtils.java   |   368 +-
 .../airavata/gfac/core/context/ProcessContext.java |   100 +-
 .../org/apache/airavata/gfac/impl/Factory.java     |    51 +-
 .../apache/airavata/gfac/impl/GFacEngineImpl.java  |   467 +-
 .../org/apache/airavata/gfac/impl/GFacWorker.java  |    50 +-
 .../airavata/gfac/impl/task/ArchiveTask.java       |    11 +-
 .../gfac/impl/task/AuroraJobSubmissionTask.java    |   144 +-
 .../gfac/impl/task/BESJobSubmissionTask.java       |   298 +-
 .../airavata/gfac/impl/task/DataStageTask.java     |     1 -
 .../gfac/impl/task/DefaultJobSubmissionTask.java   |   450 +-
 .../gfac/impl/task/ForkJobSubmissionTask.java      |    42 +-
 .../gfac/impl/task/LocalJobSubmissionTask.java     |    35 +-
 .../airavata/gfac/impl/task/SCPDataStageTask.java  |    45 +-
 .../airavata/gfac/impl/task/utils/StreamData.java  |    24 +-
 .../gfac/impl/task/utils/bes/DataTransferrer.java  |    35 +-
 .../task/utils/bes/UNICORESecurityContext.java     |     1 -
 .../gfac/monitor/cloud/AuroraJobMonitor.java       |    82 +-
 .../gfac/monitor/email/EmailBasedMonitor.java      |    51 +-
 modules/gfac/gfac-service/pom.xml                  |    10 -
 .../airavata/gfac/server/GfacServerHandler.java    |   144 +-
 .../gfac/client/GfacClientFactoryTest.java         |     2 -
 .../airavata/gfac/client/util/Initialize.java      |   101 -
 .../sample/OrchestratorClientSample.java           |     2 +-
 modules/orchestrator/orchestrator-core/pom.xml     |    15 +-
 .../core/context/OrchestratorContext.java          |     9 -
 .../core/utils/OrchestratorConstants.java          |     4 +
 .../orchestrator/core/utils/OrchestratorUtils.java |   306 +-
 .../core/validator/impl/BatchQueueValidator.java   |   243 +-
 .../cpi/impl/AbstractOrchestrator.java             |    13 +-
 .../cpi/impl/SimpleOrchestratorImpl.java           |   288 +-
 .../orchestrator/core/util/Initialize.java         |   171 +-
 modules/orchestrator/orchestrator-service/pom.xml  |    10 -
 .../server/OrchestratorServerHandler.java          |   206 +-
 .../orchestrator/util/OrchestratorUtils.java       |    33 +-
 .../orchestrator/client/util/Initialize.java       |   133 +-
 .../registry-server/registry-api-service/pom.xml   |     2 +-
 .../api/service/handler/RegistryServerHandler.java |   354 +-
 .../airavata/registry/api/RegistryService.java     | 47720 +++++++++++++------
 .../sharing-registry/sharing-data-migrator/pom.xml |     5 -
 .../sharing-registry-distribution/pom.xml          |     5 -
 .../workflow/core/WorkflowInterpreter.java         |    29 +-
 pom.xml                                            |    31 +-
 .../component-cpis/registry-api.thrift             |    94 +-
 .../generate-thrift-stubs.sh                       |     2 +
 .../group-manager/group-manager-cpi.thrift         |     1 +
 .../group-manager/group_manager_cpi_errors.thrift  |     1 +
 .../iam-admin-services-cpi.thrift                  |     1 +
 .../iam_admin_services_cpi_errors.thrift           |     1 +
 .../profile-tenant/profile-tenant-cpi.thrift       |     1 +
 .../profile_tenant_cpi_errors.thrift               |     1 +
 .../profile-user/profile-user-cpi.thrift           |     1 +
 .../profile-user/profile_user_cpi_errors.thrift    |     1 +
 164 files changed, 52951 insertions(+), 21952 deletions(-)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile}/constants.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service/profile/groupmanager}/__init__.py (100%)
 create mode 100755 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/groupmanager/cpi/GroupManagerService-remote
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/groupmanager/cpi/GroupManagerService.py
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/groupmanager/cpi/__init__.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api => service/profile/groupmanager/cpi}/constants.py (79%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/groupmanager/cpi/error}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/groupmanager/cpi/error}/constants.py (100%)
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/groupmanager/cpi/error/ttypes.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api/sharing => service/profile/groupmanager/cpi}/ttypes.py (67%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service/profile/iam}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service/profile/iam/admin}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service/profile/iam/admin/services}/__init__.py (100%)
 create mode 100755 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/iam/admin/services/cpi/IamAdminServices-remote
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/iam/admin/services/cpi/IamAdminServices.py
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/iam/admin/services/cpi/__init__.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api => service/profile/iam/admin/services/cpi}/constants.py (78%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/iam/admin/services/cpi/error}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/iam/admin/services/cpi/error}/constants.py (100%)
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/iam/admin/services/cpi/error/ttypes.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api/sharing => service/profile/iam/admin/services/cpi}/ttypes.py (57%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service/profile/tenant}/__init__.py (100%)
 create mode 100755 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/tenant/cpi/TenantProfileService-remote
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/tenant/cpi/TenantProfileService.py
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/tenant/cpi/__init__.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api => service/profile/tenant/cpi}/constants.py (79%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/tenant/cpi/error}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/tenant/cpi/error}/constants.py (100%)
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/tenant/cpi/error/ttypes.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api/sharing => service/profile/tenant/cpi}/ttypes.py (67%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api/sharing => service/profile}/ttypes.py (61%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/messaging => service/profile/user}/__init__.py (100%)
 create mode 100755 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/user/cpi/UserProfileService-remote
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/user/cpi/UserProfileService.py
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/user/cpi/__init__.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api => service/profile/user/cpi}/constants.py (80%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/user/cpi/error}/__init__.py (100%)
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{model/workspace => service/profile/user/cpi/error}/constants.py (100%)
 create mode 100644 airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/service/profile/user/cpi/error/ttypes.py
 copy airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/airavata/{api/sharing => service/profile/user/cpi}/ttypes.py (68%)
 copy dev-tools/ansible/inventories/scigap/{PICKSC-Production => SGCI-SSC}/group_vars/pga/vars.yml (56%)
 copy dev-tools/ansible/inventories/scigap/{dreg-production => SGCI-SSC}/hosts (82%)
 delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/TestApplication/vars.yml
 delete mode 100644 dev-tools/ansible/inventories/scigap/develop/pga_config/TestApplication/vault.yml
 copy dev-tools/ansible/inventories/scigap/production/pga_config/{NCSAIndustry => searchingSRA}/vars.yml (65%)
 create mode 100644 dev-tools/ansible/inventories/scigap/production/pga_config/searchingSRA/vault.yml
 copy dev-tools/ansible/inventories/{scigap/production => standalone}/group_vars/all/vars.yml (71%)
 copy dev-tools/ansible/inventories/{template => standalone}/group_vars/pga/vars.yml (68%)
 create mode 100644 dev-tools/ansible/inventories/standalone/hosts
 rename dev-tools/ansible/roles/pga/{files/default.conf => templates/default.conf.j2} (73%)
 rename dev-tools/ansible/roles/pga/{files/ssl.conf => templates/ssl.conf.j2} (99%)
 create mode 100644 dev-tools/ansible/roles/zookeeper/templates/java.env.j2

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

[airavata] 01/01: Merge branch 'develop' into helix-integration

Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

dimuthuupe pushed a commit to branch helix-integration
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 07e898432fe9e9252609d438f9429a8e12662392
Merge: ab8435b 7124801
Author: dimuthu <di...@gmail.com>
AuthorDate: Mon Mar 12 11:03:28 2018 -0400

    Merge branch 'develop' into helix-integration

 .travis.yml                                        |     1 -
 airavata-api/airavata-api-server/pom.xml           |    10 -
 .../api/server/handler/AiravataServerHandler.java  |    55 +
 .../resources/lib/airavata/api/Airavata-remote     |    35 -
 .../main/resources/lib/airavata/api/Airavata.py    | 10106 ++--
 .../api/sharing/SharingRegistryService-remote      |    35 +
 .../airavata/api/sharing/SharingRegistryService.py |  1695 +-
 .../resources/lib/airavata/model/sharing/ttypes.py |    84 +
 .../resources/lib/airavata/model/user/ttypes.py    |   369 +-
 .../resources/lib/airavata/service/__init__.py     |     0
 .../lib/airavata/service/profile/__init__.py       |     1 +
 .../lib/airavata/service/profile/constants.py      |    12 +
 .../service/profile/groupmanager/__init__.py       |     0
 .../groupmanager/cpi/GroupManagerService-remote    |   187 +
 .../groupmanager/cpi/GroupManagerService.py        |  2733 ++
 .../service/profile/groupmanager/cpi/__init__.py   |     1 +
 .../service/profile/groupmanager/cpi/constants.py  |    14 +
 .../profile/groupmanager/cpi/error/__init__.py     |     1 +
 .../profile/groupmanager/cpi/error/constants.py    |    12 +
 .../profile/groupmanager/cpi/error/ttypes.py       |    78 +
 .../service/profile/groupmanager/cpi/ttypes.py     |    17 +
 .../lib/airavata/service/profile/iam/__init__.py   |     0
 .../airavata/service/profile/iam/admin/__init__.py |     0
 .../service/profile/iam/admin/services/__init__.py |     0
 .../iam/admin/services/cpi/IamAdminServices-remote |   180 +
 .../iam/admin/services/cpi/IamAdminServices.py     |  2505 +
 .../profile/iam/admin/services/cpi/__init__.py     |     1 +
 .../profile/iam/admin/services/cpi/constants.py    |    14 +
 .../iam/admin/services/cpi/error/__init__.py       |     1 +
 .../iam/admin/services/cpi/error/constants.py      |    12 +
 .../profile/iam/admin/services/cpi/error/ttypes.py |    78 +
 .../profile/iam/admin/services/cpi/ttypes.py       |    19 +
 .../airavata/service/profile/tenant/__init__.py    |     0
 .../profile/tenant/cpi/TenantProfileService-remote |   166 +
 .../profile/tenant/cpi/TenantProfileService.py     |  1920 +
 .../service/profile/tenant/cpi/__init__.py         |     1 +
 .../service/profile/tenant/cpi/constants.py        |    14 +
 .../service/profile/tenant/cpi/error/__init__.py   |     1 +
 .../service/profile/tenant/cpi/error/constants.py  |    12 +
 .../service/profile/tenant/cpi/error/ttypes.py     |    78 +
 .../airavata/service/profile/tenant/cpi/ttypes.py  |    17 +
 .../lib/airavata/service/profile/ttypes.py         |    17 +
 .../lib/airavata/service/profile/user/__init__.py  |     0
 .../profile/user/cpi/UserProfileService-remote     |   152 +
 .../service/profile/user/cpi/UserProfileService.py |  1543 +
 .../airavata/service/profile/user/cpi/__init__.py  |     1 +
 .../airavata/service/profile/user/cpi/constants.py |    14 +
 .../service/profile/user/cpi/error/__init__.py     |     1 +
 .../service/profile/user/cpi/error/constants.py    |    12 +
 .../service/profile/user/cpi/error/ttypes.py       |    78 +
 .../airavata/service/profile/user/cpi/ttypes.py    |    17 +
 .../handlers/GroupManagerServiceHandler.java       |    26 +-
 .../service/security/KeyCloakSecurityManager.java  |     7 +-
 .../csbglsu => SGCI-SSC/group_vars/pga}/vars.yml   |    51 +-
 .../ansible/inventories/scigap/SGCI-SSC/hosts      |    21 +
 .../scigap/develop/group_vars/all/vars.yml         |     1 +
 .../develop/pga_config/TestApplication/vars.yml    |    66 -
 .../develop/pga_config/TestApplication/vault.yml   |    18 -
 .../scigap/develop/pga_config/scigap/vars.yml      |     2 +-
 .../scigap/develop/pga_config/seagrid/vars.yml     |     2 +-
 .../scigap/develop/pga_config/testdrive/vars.yml   |     2 +-
 .../scigap/dreg-production/group_vars/pga/vars.yml |     3 +-
 .../scigap/production/pga_config/csbglsu/vars.yml  |     1 +
 .../production/pga_config/iugateway/vars.yml       |     1 +
 .../production/pga_config/iugeosurvey/vars.yml     |     1 +
 .../scigap/production/pga_config/scigap/vars.yml   |     1 +
 .../pga_config/{csbglsu => searchingSRA}/vars.yml  |    26 +-
 .../production/pga_config/searchingSRA/vault.yml   |    18 +
 .../production/pga_config/simvascular/vars.yml     |     1 +
 .../production/pga_config/southdakota/vars.yml     |     1 +
 .../pga_config/southernillinois/vars.yml           |     1 +
 .../production/pga_config/testdrive/vars.yml       |     1 +
 .../group_vars/all/vars.yml                        |    63 +-
 .../inventories/standalone/group_vars/pga/vars.yml |    70 +
 dev-tools/ansible/inventories/standalone/hosts     |    24 +
 .../inventories/template/group_vars/all/vars.yml   |    11 +-
 dev-tools/ansible/pga-scigap-dev.yml               |     1 -
 dev-tools/ansible/pga-scigap-prod.yml              |     1 +
 dev-tools/ansible/roles/api-orch/defaults/main.yml |    13 +-
 dev-tools/ansible/roles/api-orch/tasks/main.yml    |    12 +-
 .../templates/airavata-server.properties.j2        |     6 +-
 dev-tools/ansible/roles/common/tasks/main.yml      |     4 +-
 .../ansible/roles/database/tasks/keycloak.yml      |     2 +-
 dev-tools/ansible/roles/database/tasks/main.yml    |     2 +-
 dev-tools/ansible/roles/env_setup/tasks/main.yml   |     4 +
 dev-tools/ansible/roles/gfac/defaults/main.yml     |     5 +-
 .../gfac/templates/airavata-server.properties.j2   |     6 +-
 .../roles/gfac/templates/gfac-config.yaml.j2       |    11 +-
 dev-tools/ansible/roles/pga/defaults/main.yml      |    13 +-
 dev-tools/ansible/roles/pga/tasks/main.yml         |    16 +-
 .../default.conf => templates/default.conf.j2}     |     3 +-
 .../roles/pga/templates/pga-ssl-vhost.conf.j2      |     4 +-
 .../ansible/roles/pga/templates/pga-vhost.conf.j2  |     2 +-
 .../pga/{files/ssl.conf => templates/ssl.conf.j2}  |     4 +-
 dev-tools/ansible/roles/rabbitmq/tasks/main.yml    |     8 +-
 .../templates/airavata-server.properties.j2        |     2 +-
 dev-tools/ansible/roles/zookeeper/tasks/main.yml   |     6 +
 .../ansible/roles/zookeeper/templates/java.env.j2  |     1 +
 .../roles/zookeeper/templates/zookeeper.service.j2 |     1 +
 dev-tools/ansible/roles/zookeeper/vars/main.yml    |     2 +-
 .../roles/zookeeper/vars/main.yml                  |     2 +-
 .../apache/airavata/common/utils/ThriftUtils.java  |    14 +-
 .../airavata/common/utils/SecurityUtilTest.java    |    23 +-
 .../server/src/main/resources/UGE_Groovy.template  |     6 +-
 .../credential-store-service/pom.xml               |     6 -
 .../store/impl/util/CredentialStoreInitUtil.java   |     1 +
 .../store/store/impl/db/CredentialsDAOTest.java    |    10 +-
 modules/distribution/pom.xml                       |     5 -
 modules/gfac/gfac-core/pom.xml                     |    15 +-
 .../java/org/apache/airavata/gfac/core/GFac.java   |     6 +-
 .../apache/airavata/gfac/core/GFacConstants.java   |     8 +
 .../org/apache/airavata/gfac/core/GFacEngine.java  |     3 +-
 .../org/apache/airavata/gfac/core/GFacUtils.java   |   368 +-
 .../airavata/gfac/core/context/ProcessContext.java |   100 +-
 .../org/apache/airavata/gfac/impl/Factory.java     |    51 +-
 .../apache/airavata/gfac/impl/GFacEngineImpl.java  |   467 +-
 .../org/apache/airavata/gfac/impl/GFacWorker.java  |    50 +-
 .../airavata/gfac/impl/task/ArchiveTask.java       |    11 +-
 .../gfac/impl/task/AuroraJobSubmissionTask.java    |   144 +-
 .../gfac/impl/task/BESJobSubmissionTask.java       |   298 +-
 .../airavata/gfac/impl/task/DataStageTask.java     |     1 -
 .../gfac/impl/task/DefaultJobSubmissionTask.java   |   450 +-
 .../gfac/impl/task/ForkJobSubmissionTask.java      |    42 +-
 .../gfac/impl/task/LocalJobSubmissionTask.java     |    35 +-
 .../airavata/gfac/impl/task/SCPDataStageTask.java  |    45 +-
 .../airavata/gfac/impl/task/utils/StreamData.java  |    24 +-
 .../gfac/impl/task/utils/bes/DataTransferrer.java  |    35 +-
 .../task/utils/bes/UNICORESecurityContext.java     |     1 -
 .../gfac/monitor/cloud/AuroraJobMonitor.java       |    82 +-
 .../gfac/monitor/email/EmailBasedMonitor.java      |    51 +-
 modules/gfac/gfac-service/pom.xml                  |    10 -
 .../airavata/gfac/server/GfacServerHandler.java    |   144 +-
 .../gfac/client/GfacClientFactoryTest.java         |     2 -
 .../airavata/gfac/client/util/Initialize.java      |   101 -
 .../sample/OrchestratorClientSample.java           |     2 +-
 modules/orchestrator/orchestrator-core/pom.xml     |    15 +-
 .../core/context/OrchestratorContext.java          |     9 -
 .../core/utils/OrchestratorConstants.java          |     4 +
 .../orchestrator/core/utils/OrchestratorUtils.java |   306 +-
 .../core/validator/impl/BatchQueueValidator.java   |   243 +-
 .../cpi/impl/AbstractOrchestrator.java             |    13 +-
 .../cpi/impl/SimpleOrchestratorImpl.java           |   288 +-
 .../orchestrator/core/util/Initialize.java         |   171 +-
 modules/orchestrator/orchestrator-service/pom.xml  |    10 -
 .../server/OrchestratorServerHandler.java          |   206 +-
 .../orchestrator/util/OrchestratorUtils.java       |    33 +-
 .../orchestrator/client/util/Initialize.java       |   133 +-
 .../registry-server/registry-api-service/pom.xml   |     2 +-
 .../api/service/handler/RegistryServerHandler.java |   354 +-
 .../airavata/registry/api/RegistryService.java     | 47720 +++++++++++++------
 .../sharing-registry/sharing-data-migrator/pom.xml |     5 -
 .../sharing-registry-distribution/pom.xml          |     5 -
 .../workflow/core/WorkflowInterpreter.java         |    29 +-
 pom.xml                                            |    31 +-
 .../component-cpis/registry-api.thrift             |    94 +-
 .../generate-thrift-stubs.sh                       |     2 +
 .../group-manager/group-manager-cpi.thrift         |     1 +
 .../group-manager/group_manager_cpi_errors.thrift  |     1 +
 .../iam-admin-services-cpi.thrift                  |     1 +
 .../iam_admin_services_cpi_errors.thrift           |     1 +
 .../profile-tenant/profile-tenant-cpi.thrift       |     1 +
 .../profile_tenant_cpi_errors.thrift               |     1 +
 .../profile-user/profile-user-cpi.thrift           |     1 +
 .../profile-user/profile_user_cpi_errors.thrift    |     1 +
 164 files changed, 53219 insertions(+), 21923 deletions(-)

diff --cc pom.xml
index 8ccb992,ec7997e..83ce20c
--- a/pom.xml
+++ b/pom.xml
@@@ -116,8 -108,8 +108,8 @@@
          <snakeyaml.version>1.15</snakeyaml.version>
          <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
          <maven.replacer.plugin.version>1.5.3</maven.replacer.plugin.version>
 -        <kafka-clients.version>0.8.2.2</kafka-clients.version>
 +        <kafka-clients.version>1.0.0</kafka-clients.version>
-         <logback.version>1.1.6</logback.version>
+         <logback.version>1.2.3</logback.version>
          <json.version>20160212</json.version>
          <commons.io.version>2.4</commons.io.version>
          <google.guava.version>20.0</google.guava.version>
@@@ -700,8 -692,6 +692,9 @@@
                  <module>modules/distribution</module>
                  <!--<module>modules/test-suite</module>-->
                  <module>modules/compute-account-provisioning</module>
 +                <module>modules/airavata-helix</module>
 +                <module>modules/airavata-helix-distribution</module>
++                <module>modules/job-monitor</module>
              </modules>
          </profile>
          <profile>

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