airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject [36/37] airavata git commit: merging develop
Date Tue, 30 May 2017 19:02:56 GMT
merging develop


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/495cfca8
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/495cfca8
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/495cfca8

Branch: refs/heads/registry-refactoring
Commit: 495cfca8c7692399d87127a1f93f8c5e96550225
Parents: a98d7fc 84c2fdc
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Tue May 30 14:57:49 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Tue May 30 14:57:49 2017 -0400

----------------------------------------------------------------------
 airavata-api/airavata-api-server/pom.xml        |    5 -
 .../airavata/compute_resource_model_types.cpp   |   70 +-
 .../lib/airavata/compute_resource_model_types.h |   34 +-
 .../Model/AppCatalog/ComputeResource/Types.php  |   64 +-
 .../model/appcatalog/computeresource/ttypes.py  |   50 +-
 .../appcatalog/computeresource/BatchQueue.java  |  223 +-
 .../ComputeResourceDescription.java             |  112 +-
 .../iam-admin-services-core/pom.xml             |   11 +-
 .../core/impl/TenantManagementKeycloakImpl.java |   67 +-
 .../handlers/IamAdminServicesHandler.java       |    8 +-
 dev-tools/ansible/.gitignore                    |    1 +
 dev-tools/ansible/README.md                     |   21 +
 .../dreg-production/files/pga-ssl-vhost.conf.j2 |    2 +
 .../dreg-production/group_vars/pga/vars.yml     |    2 +-
 .../cornell-dnasequence/pga-ssl-vhost.conf.j2   |   31 -
 .../pga_config/cornell-dnasequence/vars.yml     |   63 -
 .../pga_config/cornell-dnasequence/vault.yml    |   18 -
 .../pga_config/nanoconfinement/vars.yml         |   55 +
 .../pga_config/nanoconfinement/vault.yml        |   18 +
 .../production/pga_config/ultrascan/vars.yml    |    5 +-
 .../testing-0.17/group_vars/pga/vars.yml        |    3 +-
 dev-tools/ansible/pga-scigap-prod.yml           |    2 +-
 dev-tools/ansible/requirements.txt              |    1 +
 dev-tools/ansible/roles/java/vars/main.yml      |    8 +-
 dev-tools/ansible/roles/pga/defaults/main.yml   |    5 +
 dev-tools/ansible/roles/pga/files/ssl.conf      |  217 +
 dev-tools/ansible/roles/pga/tasks/main.yml      |    8 +
 .../roles/pga/templates/pga-ssl-vhost.conf.j2   |    2 +
 .../roles/pga/templates/pga_config.php.j2       |    5 +
 modules/commons/pom.xml                         |    6 -
 modules/distribution/pom.xml                    |   61 +-
 .../core/app/catalog/model/BatchQueue.java      |   24 +-
 .../catalog/resources/BatchQueueResource.java   |   20 +
 .../app/catalog/util/AppCatalogJPAUtils.java    |    4 +-
 .../util/AppCatalogThriftConversion.java        |    8 +-
 .../src/main/resources/appcatalog-derby.sql     |    2 +
 .../src/main/resources/appcatalog-mysql.sql     |    2 +
 .../repositories/GroupMembershipRepository.java |   13 +
 .../server/SharingRegistryServerHandler.java    |   12 +-
 .../SharingRegistryServerHandlerTest.java       |    4 +
 .../sharing/registry/models/Domain.java         |   19 -
 .../models/DuplicateEntryException.java         |  398 ++
 .../sharing/registry/models/Entity.java         |   19 -
 .../registry/models/EntitySearchField.java      |   19 -
 .../sharing/registry/models/EntityType.java     |   19 -
 .../registry/models/GroupCardinality.java       |   19 -
 .../sharing/registry/models/GroupChildType.java |   23 -
 .../registry/models/GroupMembership.java        |   19 -
 .../sharing/registry/models/GroupType.java      |   19 -
 .../sharing/registry/models/PermissionType.java |   19 -
 .../registry/models/SearchCondition.java        |   19 -
 .../sharing/registry/models/SearchCriteria.java |   19 -
 .../sharing/registry/models/Sharing.java        |   19 -
 .../models/SharingRegistryException.java        |   19 -
 .../sharing/registry/models/SharingType.java    |   19 -
 .../airavata/sharing/registry/models/User.java  |   19 -
 .../sharing/registry/models/UserGroup.java      |   19 -
 .../models/sharing_modelsConstants.java         |   19 -
 .../service/cpi/SharingRegistryService.java     | 4721 +++++++++++-------
 .../sharing-service-docs/api-docs/index.html    |  142 +-
 .../api-docs/sharing_cpi.html                   |   36 +-
 .../api-docs/sharing_models.html                |   30 +-
 .../sharing-service-docs/api-docs/style.css     |   22 +-
 .../thrift_models/sharing_cpi.thrift            |   11 +-
 .../thrift_models/sharing_models.thrift         |   10 +
 modules/user-profile-migration/pom.xml          |    2 +-
 .../org/apache/airavata/MigrationManager.java   |    8 +-
 .../UserProfileAiravataThriftClient.java        |   11 +-
 .../compute_resource_model.thrift               |    6 +-
 69 files changed, 4319 insertions(+), 2672 deletions(-)
----------------------------------------------------------------------



Mime
View raw message