You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by er...@apache.org on 2018/10/31 15:05:52 UTC

[airavata] branch develop updated (3ba041d -> 9f7fc25)

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

eroma pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.


    from 3ba041d  Adding missing entries for ParserOutputEntity
     new f40f462  Added CILogon to USD gateway
     new b4ab27e  Merge branch 'develop' of https://github.com/apache/airavata into develop
     new 514cf87  Merge branch 'develop' of https://github.com/apache/airavata into develop
     new 9f7fc25  Added CSBG LSU Beta django gateway

The 4 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:
 .../develop/host_vars/{usd => csbglsu}/vars.yml    | 24 +++++++++++-----------
 .../scigap/develop/host_vars/csbglsu/vault.yml     | 12 +++++++++++
 .../scigap/develop/host_vars/usd/vars.yml          |  4 ++--
 3 files changed, 26 insertions(+), 14 deletions(-)
 copy dev-tools/ansible/inventories/scigap/develop/host_vars/{usd => csbglsu}/vars.yml (64%)
 create mode 100644 dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml


[airavata] 02/04: Merge branch 'develop' of https://github.com/apache/airavata into develop

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

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit b4ab27e1ce71538cd561e1c56f677c79fff2d5f1
Merge: f40f462 71518b8
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Tue Oct 30 16:32:16 2018 -0400

    Merge branch 'develop' of https://github.com/apache/airavata into develop

 .../{DagElement.java => ParserDagElement.java}     | 318 +++++++++++++++++----
 ...pping.java => ParserDagInputOutputMapping.java} | 272 +++++++++++++++---
 .../model/appcatalog/parser/ParserInput.java       | 104 ++++++-
 .../model/appcatalog/parser/ParserOutput.java      | 104 ++++++-
 .../model/appcatalog/parser/ParsingTemplate.java   |  40 +--
 .../appcatalog/parser/ParsingTemplateInput.java    | 218 +++++++++++++-
 .../helix/impl/task/parsing/DataParsingTask.java   | 164 ++++++++---
 .../task/parsing/models/ParsingTaskInputs.java     |  16 +-
 .../task/parsing/models/ParsingTaskOutputs.java    |  16 +-
 .../helix/impl/workflow/ParserWorkflowManager.java |  61 ++--
 .../helix/impl/workflow/WorkflowManager.java       |   6 +-
 .../apache/airavata/helix/core/AbstractTask.java   |   2 +-
 .../apache/airavata/helix/core/util/TaskUtil.java  |  13 +-
 .../appcatalog/ParserDagElementEntity.java         | 124 ++++++++
 .../ParserDagInputOutputMappingEntity.java         | 111 +++++++
 .../core/entities/appcatalog/ParserInfoEntity.java | 111 +++++++
 .../entities/appcatalog/ParserInputEntity.java     |  87 ++++++
 .../entities/appcatalog/ParserOutputEntity.java    |  87 ++++++
 .../entities/appcatalog/ParsingTemplateEntity.java |  78 +++++
 .../appcatalog/ParsingTemplateInputEntity.java     |  99 +++++++
 .../appcatalog/ParserDagElementRepository.java     |  11 +
 .../ParserDagInputOutputMappingRepository.java     |  11 +
 .../appcatalog/ParserInfoRepository.java           |  11 +
 .../appcatalog/ParserInputRepository.java          |  11 +
 .../appcatalog/ParserOutputRepository.java         |  11 +
 .../appcatalog/ParsingTemplateInputRepository.java |  11 +
 .../appcatalog/ParsingTemplateRepository.java      |  11 +
 .../src/main/resources/META-INF/persistence.xml    |   7 +
 .../src/main/resources/appcatalog-derby.sql        |  72 +++++
 .../src/main/resources/appcatalog-mysql.sql        |  72 +++++
 .../api/service/handler/RegistryServerHandler.java | 117 +++-----
 .../airavata/registry/api/RegistryService.java     | 146 +++++-----
 .../component-cpis/registry-api.thrift             |   2 +-
 .../app-catalog-models/parser_model.thrift         |  29 +-
 34 files changed, 2200 insertions(+), 353 deletions(-)


[airavata] 01/04: Added CILogon to USD gateway

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

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit f40f462d54de32593b522ab6a09c1b3e59f15085
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Mon Oct 29 15:50:03 2018 -0400

    Added CILogon to USD gateway
---
 dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
index 1551994..509cd7e 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/usd/vars.yml
@@ -37,8 +37,8 @@ auth_options:
   password:
     name: "USD Gateway"
   external:
-  #  - name: "CILogon"
-  #    idp_alias: "cilogon"
+    - name: "CILogon"
+      idp_alias: "cilogon"
 
 gateway_id: "usd"
 experiment_data_dir: "{{ user_data_dir }}/django-usd"


[airavata] 04/04: Added CSBG LSU Beta django gateway

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

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 9f7fc2519b8ff99040161d13aad9804961e1c3fd
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Wed Oct 31 11:05:42 2018 -0400

    Added CSBG LSU Beta django gateway
---
 .../scigap/develop/host_vars/csbglsu/vars.yml      | 46 ++++++++++++++++++++++
 .../scigap/develop/host_vars/csbglsu/vault.yml     | 12 ++++++
 2 files changed, 58 insertions(+)

diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
new file mode 100644
index 0000000..2c2a87b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vars.yml
@@ -0,0 +1,46 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+#airavata_django_git_branch: "simccs"
+doc_root_dir: "/data/portals/django-csbglsu"
+vhost_servername: "beta-sciencegateway.brylinski.org"
+vhost_ssl: false
+# sudo certbot --apache certonly -d django.simccs.scigap.org
+#ssl_certificate_file: "/etc/letsencrypt/live/beta.sciencegateway.usd.edu/cert.pem"
+#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.sciencegateway.usd.edu/fullchain.pem"
+#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.sciencegateway.usd.edu/privkey.pem"
+
+## Keycloak related variables
+tenant_domain: "csbglsu"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+auth_options:
+  password:
+    name: "Computational Sys Biology Gateway"
+  external:
+#    - name: "CILogon"
+#      idp_alias: "cilogon"
+
+gateway_id: "csbglsu"
+experiment_data_dir: "{{ user_data_dir }}/django-csbglsu"
+
+...
diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml
new file mode 100644
index 0000000..9f04e1b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/csbglsu/vault.yml
@@ -0,0 +1,12 @@
+$ANSIBLE_VAULT;1.1;AES256
+30316563313436363137616461623664656230623431326139663663386237393362373330633031
+3461336334613633343835303433633365643734316435310a633364356264376264346232366664
+64616161396235383438383962323262663938643034633463356261353436613130646635663932
+3331643232643639310a373963376165333039323933396638353639343532626365343062613933
+39326465393461346564373239636230363434316537313836373537343637326533636438313736
+30313435633934383233653763333837653261643236663435323938333135643131303935363665
+63363831356637636466646162323330303237666361613532323333346434653239323061633833
+37663635376239393765633633393930343634396561363066346638373066616137303236653965
+65356163333432323035373835336231393030653362303965303962656137393036643530343264
+31363231633837393262303331346264363731326463626238663262323034616633323834663537
+643034646333633464346464333962636665


[airavata] 03/04: Merge branch 'develop' of https://github.com/apache/airavata into develop

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

eroma pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git

commit 514cf87f5c1c96b515ee2f0c07cc91831eb1eafe
Merge: b4ab27e 3ba041d
Author: Eroma Abeysinghe <er...@gmail.com>
AuthorDate: Wed Oct 31 10:20:57 2018 -0400

    Merge branch 'develop' of https://github.com/apache/airavata into develop

 .../airavata/model/appcatalog/parser/IOType.java   |  62 ++++
 .../parser/{ParserInfo.java => Parser.java}        |  54 +--
 ...{ParserDagElement.java => ParserConnector.java} | 202 +++++------
 ...emplateInput.java => ParserConnectorInput.java} | 383 +++++++++++++--------
 ...tputMapping.java => ParserDagInputMapping.java} | 283 ++++++++++-----
 .../model/appcatalog/parser/ParserInput.java       | 326 ++++++++++++------
 .../model/appcatalog/parser/ParserOutput.java      | 326 ++++++++++++------
 .../model/appcatalog/parser/ParsingTemplate.java   | 148 ++++----
 .../appcatalog/parser/ParsingTemplateInput.java    | 229 ++++++++----
 .../helix/impl/task/parsing/DataParsingTask.java   |  39 +--
 .../helix/impl/workflow/ParserWorkflowManager.java |  58 ++--
 ...ementEntity.java => ParserConnectorEntity.java} |  60 ++--
 ...Entity.java => ParserConnectorInputEntity.java} |  55 +--
 .../{ParserInfoEntity.java => ParserEntity.java}   |  10 +-
 .../entities/appcatalog/ParserInputEntity.java     |  47 ++-
 .../entities/appcatalog/ParserOutputEntity.java    |  47 ++-
 .../entities/appcatalog/ParsingTemplateEntity.java |  12 +-
 .../appcatalog/ParsingTemplateInputEntity.java     |  23 +-
 .../appcatalog/ParserDagElementRepository.java     |  11 -
 .../ParserDagInputOutputMappingRepository.java     |  11 -
 .../appcatalog/ParserInfoRepository.java           |  11 -
 .../appcatalog/ParserInputRepository.java          |  11 -
 .../appcatalog/ParserOutputRepository.java         |  11 -
 .../repositories/appcatalog/ParserRepository.java  |  11 +
 .../appcatalog/ParsingTemplateInputRepository.java |  11 -
 .../src/main/resources/META-INF/persistence.xml    |   6 +-
 .../src/main/resources/appcatalog-derby.sql        |  46 +--
 .../src/main/resources/appcatalog-mysql.sql        |  46 +--
 .../api/service/handler/RegistryServerHandler.java |  15 +-
 .../airavata/registry/api/RegistryService.java     |  76 ++--
 .../component-cpis/registry-api.thrift             |   4 +-
 .../app-catalog-models/parser_model.thrift         |  35 +-
 32 files changed, 1640 insertions(+), 1029 deletions(-)