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 2017/04/28 15:22:42 UTC
[01/50] [abbrv] airavata git commit: excluding thrift generated code
Repository: airavata
Updated Branches:
refs/heads/develop b37882a43 -> 7a779933e
excluding thrift generated code
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/83ea6306
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/83ea6306
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/83ea6306
Branch: refs/heads/develop
Commit: 83ea630684431b88ef6ba2e952140316f3dce56c
Parents: d82842d
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Apr 4 08:18:27 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 4 08:18:27 2017 -0400
----------------------------------------------------------------------
pom.xml | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/83ea6306/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9f188ba..7d213d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -725,6 +725,8 @@
<exclude>**/*.jks</exclude>
<exclude>**/*.pem</exclude>
<exclude>**/*.pk8</exclude>
+ <exclude>**/.idea/**/*</exclude>
+ <exclude>airavata-api/airavata-client-sdks/**/*</exclude>
</excludes>
</configuration>
<executions>
[45/50] [abbrv] airavata git commit: merging upstream
Posted by ma...@apache.org.
merging upstream
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e48a02ea
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e48a02ea
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e48a02ea
Branch: refs/heads/develop
Commit: e48a02eaf8e81f209ae7291c3e01d30fd445e5b1
Parents: be5ef40 b6312d9
Author: scnakandala <su...@gmail.com>
Authored: Thu Apr 27 14:52:38 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Apr 27 14:52:38 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/ansible.cfg | 2 +-
.../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 ++++++++++
.../pga_config/cornell-dnasequence/vars.yml | 63 +++++++++++++++++++
.../pga_config/cornell-dnasequence/vault.yml | 18 ++++++
.../production/pga_config/simvascular/vars.yml | 10 ++-
.../production/pga_config/ultrascan/vars.yml | 64 ++++++++++++++++++++
.../production/pga_config/ultrascan/vault.yml | 18 ++++++
.../scigap/production/pga_config/utah/vars.yml | 4 +-
dev-tools/ansible/pga-scigap-prod.yml | 2 +
.../roles/gfac/templates/gfac-config.yaml.j2 | 1 +
dev-tools/ansible/roles/pga/defaults/main.yml | 4 ++
dev-tools/ansible/roles/pga/tasks/main.yml | 10 +--
.../roles/pga/templates/pga_config.php.j2 | 2 +-
13 files changed, 217 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[33/50] [abbrv] airavata git commit: Updating database names for
scigap production
Posted by ma...@apache.org.
Updating database names for scigap production
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2cf1e9a6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2cf1e9a6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2cf1e9a6
Branch: refs/heads/develop
Commit: 2cf1e9a6984c1a728d643ac3d656f21bfb3ed7cd
Parents: 00efec7
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 13:07:23 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/group_vars/all/vars.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2cf1e9a6/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index da3a545..33950d6 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -42,10 +42,10 @@ db_user: "airavata"
db_password: "{{ vault_db_password }}"
mysql_root_password: "{{ vault_mysql_root_password }}"
app_catalog: "app_catalog"
-exp_catalog: "exp_catalog"
+exp_catalog: "experiment_catalog"
replica_catalog: "replica_catalog"
sharing_catalog: "sharing_catalog"
-workflow_catalog: "wf_catalog"
+workflow_catalog: "workflow_catalog"
credential_store: "credential_store"
mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
[25/50] [abbrv] airavata git commit: AIRAVATA-2352 Log error when
RabbitMQ client connection is shut down
Posted by ma...@apache.org.
AIRAVATA-2352 Log error when RabbitMQ client connection is shut down
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eadbdba5
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eadbdba5
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eadbdba5
Branch: refs/heads/develop
Commit: eadbdba5be540557efd67645d109eded756054d0
Parents: 64fb9df
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Apr 21 12:10:42 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Apr 21 12:10:42 2017 -0400
----------------------------------------------------------------------
.../org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/eadbdba5/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
----------------------------------------------------------------------
diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
index 3eb4d33..4a4413b 100644
--- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
+++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQSubscriber.java
@@ -149,6 +149,7 @@ public class RabbitMQSubscriber implements Subscriber {
private void addShutdownListener() {
connection.addShutdownListener(new ShutdownListener() {
public void shutdownCompleted(ShutdownSignalException cause) {
+ log.error("RabbitMQ connection " + connection + " for " + properties.getExchangeName() + " has been shut down", cause);
}
});
}
[22/50] [abbrv] airavata git commit: Allow user_data_dir to be symlink
Posted by ma...@apache.org.
Allow user_data_dir to be symlink
Using symlink to keep gateway data store paths the same as they were on
gw75 for SciGaP production deploys. This is kind of a quick fix hack,
ideally I think we would update the replica catalog entries.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/82e39d8f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/82e39d8f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/82e39d8f
Branch: refs/heads/develop
Commit: 82e39d8f954fea56f2fe2f7a987959f2cadc21be
Parents: dd5e9c1
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 19 11:53:02 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 19 11:53:02 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/scigap/production/group_vars/all/vars.yml | 2 +-
dev-tools/ansible/roles/pga/tasks/main.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/82e39d8f/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index 8069ff5..3984024 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -110,7 +110,7 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user_data_dir: "/data/gateway-user-data"
+user_data_dir: "/var/www/portals/gateway-user-data"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "tls://{{ groups['api-orch'][0] }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/82e39d8f/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index cb3bb7b..76461df 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -35,7 +35,7 @@
become: yes
- name: Create user data dir {{ user_data_dir }}
- file: path="{{ user_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes
+ file: path="{{ user_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes follow=yes
become: yes
# SELinux configuration
[35/50] [abbrv] airavata git commit: Make portal files owned by
unprivileged user
Posted by ma...@apache.org.
Make portal files owned by unprivileged user
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/15658819
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/15658819
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/15658819
Branch: refs/heads/develop
Commit: 156588192a0d9cf1f40c26801d08ce0456f98148
Parents: cad8418
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 16:02:18 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 16:02:18 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/pga/tasks/main.yml | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/15658819/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 76461df..384ef25 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -20,7 +20,7 @@
---
- name: Create root directory
- file: path="{{ doc_root_dir }}" state=directory
+ file: path="{{ doc_root_dir }}" state=directory owner="{{user}}" group="{{group}}"
become: yes
- include: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
@@ -33,6 +33,7 @@
update: yes
force: yes
become: yes
+ become_user: "{{user}}"
- name: Create user data dir {{ user_data_dir }}
file: path="{{ user_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes follow=yes
@@ -87,10 +88,11 @@
- name: Run composer update
composer: command=update working_dir="{{ doc_root_dir }}"
become: yes
+ become_user: "{{user}}"
# step 6: Change pga configurations
- name: Copy pga config file
- template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php"
+ template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php" owner="{{user}}" group="{{group}}"
become: yes
- name: Checkout the portal theme (if a custom theme is defined)
@@ -100,9 +102,11 @@
version: "master"
update: yes
when: portal_theme != "base"
+ become: yes
+ become_user: "{{user}}"
- name: give read permissions to doc root
- file: path="{{ doc_root_dir }}" state=directory mode=a+rX recurse=yes
+ file: path="{{ doc_root_dir }}" state=directory mode=a+rX owner="{{user}}" group="{{group}}" recurse=yes
become: yes
- name: give write permissions to storage dir
[34/50] [abbrv] airavata git commit: Creating log files directory
Posted by ma...@apache.org.
Creating log files directory
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/950309c9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/950309c9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/950309c9
Branch: refs/heads/develop
Commit: 950309c9f2a81371a5b2d9e64f9917dd4e02d317
Parents: 2cf1e9a
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 13:21:18 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/api-orch/tasks/main.yml | 3 +++
dev-tools/ansible/roles/gfac/tasks/main.yml | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/950309c9/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index da8e313..4793a82 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -73,6 +73,9 @@
group={{ group }}
mode="u=rw,g=r,o=r"
+- name: create logs directory
+ file: path="{{ api_orch_log_dir }}" state=directory owner={{ user }} group={{ group }}
+
- name: Copy Mysql jar to lib
copy: src={{ mysql_connector_jar }}
dest="{{ api_orch_dir }}/{{ airavata_dist }}/lib/{{ mysql_connector_jar }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/950309c9/dev-tools/ansible/roles/gfac/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/tasks/main.yml b/dev-tools/ansible/roles/gfac/tasks/main.yml
index 31e486a..16cc55f 100644
--- a/dev-tools/ansible/roles/gfac/tasks/main.yml
+++ b/dev-tools/ansible/roles/gfac/tasks/main.yml
@@ -69,6 +69,9 @@
group={{ group }}
mode="u=rw,g=r,o=r"
+- name: create logs directory
+ file: path="{{ gfac_log_dir }}" state=directory owner={{ user }} group={{ group }}
+
- name: Copy Mysql jar to lib
copy: src="{{ mysql_connector_jar }}"
dest="{{ gfac_dir }}/{{ airavata_dist }}/lib/{{ mysql_connector_jar }}"
[27/50] [abbrv] airavata git commit: removing the NULL file
Posted by ma...@apache.org.
removing the NULL file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/05d39e52
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/05d39e52
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/05d39e52
Branch: refs/heads/develop
Commit: 05d39e522a35baa2b3b760fd058ca355c572101c
Parents: e3009f5
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Apr 6 15:09:53 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 25 13:00:15 2017 -0400
----------------------------------------------------------------------
modules/orchestrator/NULL | 1 -
pom.xml | 4 ++++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/05d39e52/modules/orchestrator/NULL
----------------------------------------------------------------------
diff --git a/modules/orchestrator/NULL b/modules/orchestrator/NULL
deleted file mode 100644
index 6c7ca83..0000000
--- a/modules/orchestrator/NULL
+++ /dev/null
@@ -1 +0,0 @@
-Device 0 (VID=18d1 and PID=4ee1) is a Google Inc (for LG Electronics/Samsung) Nexus 4/10 (MTP).
http://git-wip-us.apache.org/repos/asf/airavata/blob/05d39e52/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e3e93be..77ae954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -745,6 +745,7 @@
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/logo.txt</exclude>
+ <exclude>**/*.j2</exclude>
<exclude>**/*.jks</exclude>
<exclude>**/*.pem</exclude>
<exclude>**/*.pk8</exclude>
@@ -752,6 +753,9 @@
<exclude>airavata-api/airavata-client-sdks/**/*</exclude>
<exclude>**/src/main/resources/**/*</exclude>
<exclude>**/src/test/resources/**/*</exclude>
+ <exclude>sandbox/**/*</exclude>
+ <exclude>**/vault.yml</exclude>
+ <exclude>**/hosts</exclude>
</excludes>
</configuration>
<executions>
[02/50] [abbrv] airavata git commit: Temporary fix for mysql-selinux
issue
Posted by ma...@apache.org.
Temporary fix for mysql-selinux issue
Tmp fix for this issue: https://jira.mariadb.org/browse/MDEV-12231
Adds selinux policy module to allow mysql to set uid/gid. Also
checks for .pp file which should be incuded in future releases
of MariaDB.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/defbad39
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/defbad39
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/defbad39
Branch: refs/heads/develop
Commit: defbad3986acd769a3356bbf4448407a8f61aaa1
Parents: 83ea630
Author: jecoulte <je...@iu.edu>
Authored: Mon Apr 3 17:52:16 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 4 09:41:47 2017 -0400
----------------------------------------------------------------------
.../ansible/roles/database/files/mysql-tmp.te | 9 ++++
dev-tools/ansible/roles/database/tasks/main.yml | 48 +++++++++++++++++++-
2 files changed, 56 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/defbad39/dev-tools/ansible/roles/database/files/mysql-tmp.te
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/files/mysql-tmp.te b/dev-tools/ansible/roles/database/files/mysql-tmp.te
new file mode 100644
index 0000000..2303b0c
--- /dev/null
+++ b/dev-tools/ansible/roles/database/files/mysql-tmp.te
@@ -0,0 +1,9 @@
+module mysql-tmp 1.0;
+
+require {
+ type mysqld_safe_t;
+ class capability { setgid setuid };
+}
+
+#============= mysqld_safe_t ==============
+allow mysqld_safe_t self:capability { setgid setuid };
http://git-wip-us.apache.org/repos/asf/airavata/blob/defbad39/dev-tools/ansible/roles/database/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/tasks/main.yml b/dev-tools/ansible/roles/database/tasks/main.yml
index 0f76c08..c09ced4 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -54,9 +54,55 @@
yum: name="{{ item }}" state=latest update_cache=yes
with_items: "{{ mysql_packages }}"
become_user: root
+#" for vim
+
+- name: check if mysql has been updated
+ stat: path=/usr/share/mysql/SELinux/mariadb.pp
+ register: mysql_selinux_update
+
+- debug:
+ var: mysql_selinux_update
+
+- name: double check policycoreutils installed
+ yum: name=policycoreutils-python state=installed
+ when: mysql_selinux_update.stat.exists == False
+
+- name: Copy SELinux type enforcement file
+ copy: src=mysql-tmp.te dest=/tmp/
+ when: mysql_selinux_update.stat.exists == False
+
+- name: Compile SELinux module file
+ command: checkmodule -M -m -o /tmp/mysql-tmp.mod /tmp/mysql-tmp.te
+ when: mysql_selinux_update.stat.exists == False
+
+- name: Build SELinux policy package
+ command: semodule_package -o /tmp/mysql-tmp.pp -m /tmp/mysql-tmp.mod
+ when: mysql_selinux_update.stat.exists == False
+
+#- name: check if mysql has been updated
+# stat: path=/tmp/mysql-tmp.pp
+# register: mysql_pp
+#
+#- debug:
+# var: mysql_pp
+
+- name: unLoad SELinux policy package
+ command: semodule -r mysql-tmp
+ when: mysql_selinux_update.stat.exists == False
+ become_user: root
+ ignore_errors: True
+
+- name: Load SELinux policy package
+ command: semodule -i /tmp/mysql-tmp.pp
+ when: mysql_selinux_update.stat.exists == False
+ become_user: root
+
+- name: Remove temporary files
+ file: path=/tmp/mysql-tmp.* state=absent
+ when: mysql_selinux_update.stat.exists == False
# TODO: SELinux issue for 10.0.29 MariaDB, need to allow setgid/setuid.
-# See https://www.rootusers.com/how-to-fix-mariadb-10-0-29-selinux-update-failure/
+## See https://www.rootusers.com/how-to-fix-mariadb-10-0-29-selinux-update-failure/
# and https://jira.mariadb.org/browse/MDEV-11789
# For now I'm not adding to Ansible script since this bug should be fixed in next MariaDB release
- name: start mariadb
[07/50] [abbrv] airavata git commit: Various fixes for gf{5,
6} environment
Posted by ma...@apache.org.
Various fixes for gf{5,6} environment
Added email addresses to gfac-config.yml to master current production.
gf{5,6} don't have an eth0 interface so I made that part more generic.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/749a84d9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/749a84d9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/749a84d9
Branch: refs/heads/develop
Commit: 749a84d9b31383fb839ad71617b5d31425e65006
Parents: 382e3cb
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 4 16:41:17 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 4 16:41:17 2017 -0400
----------------------------------------------------------------------
.../scigap/production/group_vars/all/vars.yml | 15 ++++++++++-----
dev-tools/ansible/roles/api-orch/tasks/main.yml | 9 ++++++---
.../roles/api-orch/templates/gfac-config.yaml.j2 | 6 ++++++
dev-tools/ansible/roles/gfac/tasks/main.yml | 2 +-
.../ansible/roles/gfac/templates/gfac-config.yaml.j2 | 6 ++++++
5 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index a6f6547..ecc6641 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -64,7 +64,7 @@ zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
# API Server related variables
api_server_name: "apiserver-node0"
-api_server_host: "{{ansible_fqdn}}"
+api_server_host: "{{ groups['api-orch'][0] }}"
api_server_port: "8930"
api_secured: "true"
tls_enable: "true"
@@ -73,13 +73,13 @@ enable_sharing: "true"
# Orchestrator related variables
orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_host: "{{ groups['api-orch'][0] }}"
orchestrator_port: "8940"
api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
# registry related variables
registry_name: regserver-node0
-registry_host: "{{groups['registry'][0]}}"
+registry_host: "{{ groups['api-orch'][0] }}"
registry_port: 8970
#registry_dir: "{{ deployment_dir }}/registry"
default_gateway: "default"
@@ -94,13 +94,13 @@ client_truststore_passwd: "{{ vault_client_truststore_passwd }}"
cred_keystore_src_path: "{{inventory_dir}}/files/airavata_sym.jks"
cred_keystore_passwd: "{{ vault_cred_keystore_passwd }}"
cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_server_host: "{{ groups['api-orch'][0] }}"
cred_store_port: "8960"
keystores_location: "{{ deployment_dir }}/keystores"
# Gfac related variables
gfac_name: "gfac-node0"
-gfac_host: "{{ ansible_fqdn }}"
+gfac_host: "{{ groups['gfac'][0] }}"
gfac_port: "8950"
gfac_dir: "{{ deployment_dir }}/gfac-instance"
@@ -110,3 +110,8 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+user_data_dir: "/var/www/portals/gateway-user-data"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ groups['api-orch'][0] }}"
+sharing_registry_port: 7878
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 4063c67..561b78f 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -45,9 +45,11 @@
- name: set api-orch private ip
set_fact:
- api_server_host: "{{ ansible_eth0.ipv4.address }}"
- orchestrator_host: "{{ ansible_eth0.ipv4.address }}"
- cred_store_server_host: "{{ ansible_eth0.ipv4.address }}"
+ api_server_host: "{{ ansible_default_ipv4.address }}"
+ orchestrator_host: "{{ ansible_default_ipv4.address }}"
+ cred_store_server_host: "{{ ansible_default_ipv4.address }}"
+ registry_host: "{{ ansible_default_ipv4.address }}"
+ sharing_registry_host: "{{ ansible_default_ipv4.address }}"
- name: Copy Airavata server properties file
@@ -76,6 +78,7 @@
- "{{ api_server_port }}/tcp"
- "{{ orchestrator_port }}/tcp"
- "{{ cred_store_port }}/tcp"
+ - "{{ registry_port }}/tcp"
become_user: root
- name: stop api-orch
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2 b/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
index 3df5832..ba18caa 100644
--- a/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/gfac-config.yaml.j2
@@ -94,18 +94,24 @@ resources:
- SDSC Admin <sl...@comet-fe4.sdsc.edu> # comet new
- Slurm <sl...@psc.edu> # bridges
- Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
+ - slurm@lnet28.stampede.tacc.utexas.edu # stampede2
+ - Slurm service account <sl...@chpc.utah.edu> # Utah Ember
- jobManagerType: UGE
commandOutputParser: org.apache.airavata.gfac.impl.job.UGEOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.UGEEmailParser
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
+ - root <ro...@local> # USD HPC Cluster
+ - root <li...@siu.edu> # SIU Little Dog
+
- jobManagerType: LSF
commandOutputParser: org.apache.airavata.gfac.impl.job.LSFOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.LSFEmailParser
resourceEmailAddresses:
- iu.xsede.edu # test resource mail address
+ - tcs.tulsahpc.org #Tandy
- jobManagerType: FORK
commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/gfac/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/tasks/main.yml b/dev-tools/ansible/roles/gfac/tasks/main.yml
index 5ce43a0..d5de2c6 100644
--- a/dev-tools/ansible/roles/gfac/tasks/main.yml
+++ b/dev-tools/ansible/roles/gfac/tasks/main.yml
@@ -46,7 +46,7 @@
- name: set gfac private ip
set_fact:
- gfac_host: "{{ ansible_eth0.ipv4.address }}"
+ gfac_host: "{{ ansible_default_ipv4.address }}"
- name: Copy Airavata server properties file
template: src=airavata-server.properties.j2
http://git-wip-us.apache.org/repos/asf/airavata/blob/749a84d9/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
index 3df5832..ba18caa 100644
--- a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
+++ b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
@@ -94,18 +94,24 @@ resources:
- SDSC Admin <sl...@comet-fe4.sdsc.edu> # comet new
- Slurm <sl...@psc.edu> # bridges
- Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
+ - slurm@lnet28.stampede.tacc.utexas.edu # stampede2
+ - Slurm service account <sl...@chpc.utah.edu> # Utah Ember
- jobManagerType: UGE
commandOutputParser: org.apache.airavata.gfac.impl.job.UGEOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.UGEEmailParser
resourceEmailAddresses:
- ls4.tacc.utexas.edu # contain Lonestar
+ - root <ro...@local> # USD HPC Cluster
+ - root <li...@siu.edu> # SIU Little Dog
+
- jobManagerType: LSF
commandOutputParser: org.apache.airavata.gfac.impl.job.LSFOutputParser
emailParser: org.apache.airavata.gfac.monitor.email.parser.LSFEmailParser
resourceEmailAddresses:
- iu.xsede.edu # test resource mail address
+ - tcs.tulsahpc.org #Tandy
- jobManagerType: FORK
commandOutputParser: org.apache.airavata.gfac.impl.job.ForkOutputParser
[48/50] [abbrv] airavata git commit: Adding default vhost config
Posted by ma...@apache.org.
Adding default vhost config
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/10d7c029
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/10d7c029
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/10d7c029
Branch: refs/heads/develop
Commit: 10d7c029ae0bfcda0a2f78b2bd0e015fb59b9721
Parents: a907317
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Apr 28 10:32:05 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Apr 28 10:57:03 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/pga/files/default.conf | 5 +++++
dev-tools/ansible/roles/pga/tasks/main.yml | 6 ++++++
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/10d7c029/dev-tools/ansible/roles/pga/files/default.conf
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/files/default.conf b/dev-tools/ansible/roles/pga/files/default.conf
new file mode 100644
index 0000000..d5bf54b
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/files/default.conf
@@ -0,0 +1,5 @@
+# Setup default virtual host as a catchall to prevent resolving to the first defined virtual host
+# This will show the welcome page when requesting on the ip address or server default hostname
+<VirtualHost _default_:80>
+ DocumentRoot "/www/default"
+</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/10d7c029/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 61d789e..9e9cb74 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -140,6 +140,12 @@
- restart httpd
when: vhost_ssl
+- name: copy default virtual host file
+ copy: src=default.conf dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
+ become: yes
+ notify:
+ - restart httpd
+
- name: copy pga user's SSH key for the gateway data store
authorized_key:
user: "{{user}}"
[15/50] [abbrv] airavata git commit: More pga configurations for
scigap production deployment
Posted by ma...@apache.org.
More pga configurations for scigap production deployment
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1bf6e77e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1bf6e77e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1bf6e77e
Branch: refs/heads/develop
Commit: 1bf6e77e992f0cc25616bdedebf3314136054d3a
Parents: 7f8272d
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Apr 7 13:30:08 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Apr 7 13:30:08 2017 -0400
----------------------------------------------------------------------
.../production/pga_config/brandeis/vars.yml | 52 ++++++++++++++++++
.../production/pga_config/brandeis/vault.yml | 18 +++++++
.../production/pga_config/cinetvtech/vars.yml | 56 ++++++++++++++++++++
.../production/pga_config/cinetvtech/vault.yml | 18 +++++++
.../production/pga_config/georgiastate/vars.yml | 56 ++++++++++++++++++++
.../pga_config/georgiastate/vault.yml | 18 +++++++
.../scigap/production/pga_config/lsu/vars.yml | 52 ++++++++++++++++++
.../scigap/production/pga_config/lsu/vault.yml | 18 +++++++
.../production/pga_config/southdakota/vars.yml | 56 ++++++++++++++++++++
.../production/pga_config/southdakota/vault.yml | 18 +++++++
.../pga_config/southernillinois/vars.yml | 56 ++++++++++++++++++++
.../pga_config/southernillinois/vault.yml | 18 +++++++
.../scigap/production/pga_config/utah/vars.yml | 56 ++++++++++++++++++++
.../scigap/production/pga_config/utah/vault.yml | 18 +++++++
dev-tools/ansible/pga-scigap-prod.yml | 17 ++++--
dev-tools/ansible/roles/pga/tasks/main.yml | 2 +-
16 files changed, 523 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
new file mode 100644
index 0000000..0d4dd60
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
@@ -0,0 +1,52 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/brandeis"
+vhost_servername: "sciencegateway.sci.brandeis.edu"
+vhost_ssl: False
+
+## WSO2 IS related variables
+tenant_domain: "airavata.brandeis"
+admin_username: "adminuser"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "brandeis"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/brandeis"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnenzHr90GmK9nGzUFVr2Xt0F8dVtqFTU/nSpEK22M0LcBWDJuX2lGw6tz/gU+j5SRAEu2HJnHb67DbvPG+DAEiCYf4sm94GBHljGjySlvDzC8uZGmOzRE3KCzDan5XnHHHQqXL+HJAOzkODVLhxEpN0AOq90Q+Og+vhJlmGJk6WIdjebBfVd0xcHp0nKFzB54F7f0cVubnt5XOE6rMZTb812RSHIIWVk1s5StVbpiDZMzwRJ4tBd1Oe+4DVSTJyn6SdEN18x2KoFeR6BrM8L5QiXhR8GhXj8MyoQLF5+m6q9Drp76n3qw2GMjGgmC8jdwFFOKRiIKM47u9sGrtljX"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu', 'pontiggi@brandeis.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "Brandeis University Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
new file mode 100644
index 0000000..3c4544c
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+33623763666132613862343931393731313066376663366536373338313734313932653430313233
+3566663033376334313238353133353664333464633065380a383735313737626139386634316230
+64663165636434386134306666633936316638373131396630346333393731343862343136663031
+3433663064326161640a643266633334333635656261346131666163356137336133386138613665
+63336466343132353066303039643763313834343933343263333730393237653962313630656135
+63333166373666616138316663393339623631313532396439313238663139613537653339323563
+64643261333234373938333465633366303866383061343030626137653664393566626435323831
+32653832353535663435363532376336633663633337366630623235383030623865666566653634
+30386137356462623563336631633033343039343866336334393537636430363065396566393861
+30333962653337623736303563663930373866643165653034383530353236366532393761376231
+33656534356336643736396534613264613738323233613636656663633933356562383864383332
+66636233656534646532333135653666343535653035306365363666616135303237623261623063
+35643235653462323034646533313934613538643864343264666631393332643239303139653436
+63643737306661623534363630663338376234633530333565646533376632343135663662373562
+65363233373739363961373632653363303439326531346561653166666236363733353833653436
+61363536633563653233346666656630663630643837343063303937663666666633326461633432
+31373663643233336133646661396636666538326334396663646666623533656463
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
new file mode 100644
index 0000000..118516e
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/cinet-virginiatech"
+vhost_servername: "cinet.scigap.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/cinet.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/cinet.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/cinet.scigap.org/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.cinet"
+admin_username: "adminuser"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "cinetvtech"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/cinet-virginiatech"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpt0ai3Z7TGUNFM8heCPsQAZJkSik+PCa3QD5ej+sApXfiZZoFdjLswXAFcRbsD4RyCMnKFQ4st9e6+1LT8nHG3dd5uHjtBI2FFBaDg5JrIAuQj40nkdCII12gbXLu4uKCjKJ3NThn/AFQjpw0TvzFLusDd7/Xb+xBpMdobHHqngDqG8Y8fA1pbHtB5BgcAuWp3TZ/s1PL5cEhS0yZ8cVBTnSYK87o6hh0Pn4tlyU29lyLRPz43aHvjkKBN0VNwJlyOtCgr+Gj4TzlRvHXgLTn7yg1w7L6/V5LFpH2cealS92qfoBJpQ9IBAi5hX4yokEopCBsXyx78+n5E2hW05xR"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu','esaliya@gmail.com']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "Virginia Tech Cinet Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vault.yml
new file mode 100644
index 0000000..fad823f
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+65636339386334386463313731383833643234663930326231343136616236643864303761393432
+3537326331656234363161613663323665313233643661330a613636353232306131323239656339
+66626162323634653335373434373133303962323637616638333632663437373864386337323830
+3164613832393033370a383064333830633861353765633039363865326463646262306131613335
+36396564653434383239623935643334396630333030636462333439653163346634363430353064
+32333663336335623438633931613032623038333931336566393962336263626266303232303365
+62303838636635346235623437653165333639363433663330373966396365336333313631376332
+33313966643332636230663263343337303837353037643837666665613437346464326361666165
+63346535316466303731633533623439323535353962343261653537646637303262626561663266
+34313732386564616239383831653963353231333836333164663138626564313431663163373337
+35666436643939363866626135613531336634653633386165343261653038323033613366663739
+61316237393630353135663830636264363439326365643736626435626639613037373431666336
+36336636623631663131343236656262333538323030616537616361313937653738653739333862
+37356330323265353061353762623965656262323939396438383330663064386634316635303837
+31323164333933323333666466616565346633623161333536633236656261323932666562663062
+38336263323630643935306538626635363631323363373066336335383631343536623136333033
+66616533376264366535353330663866633361643262653966326339363464323866
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
new file mode 100644
index 0000000..1b8f9af
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/georgia-state"
+vhost_servername: "hpcgateway.gsu.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.geo"
+admin_username: "adminuser"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "georgiastate"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/georgia-state"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "gsu-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
+portal_title: "Georgia State PHP Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
new file mode 100644
index 0000000..e1f603d
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+34326538383639653666336237336337363732643064323039656334363261356563346138666634
+3639383761653239353536336564383833393664333337630a393637386266393137643864326434
+39353865343065626639393937633065666639323738306330666536356334333433356531663238
+6636396333633935390a653965396231336535336334333330303462396433643831633065663666
+30303931323438396265646662396137636235363134383430343764303136313535366535363962
+31353833303536386661643039656231343265393336613262306665656366643061666531356633
+39386431663465646365613134366433366637666531346130323839613431346530646439356131
+31663835613664396663303463646336633262653736656138323030316138656264313338616331
+66356638663739303632323062303735656637306131323134653065313065396434306132303864
+32393862393033306536363832396664333232313634663433386236613064366662336336386466
+39643463353963663062373436653465653665343462373665643734643035613434616337613738
+66626438386566656637396539373734633731643633633830636338663662313663663733373137
+64303136363239663734326335303731363066663766323338646337313863623161623434373034
+39613362366432626666363835386166313738386632343738613063643437633235333636343933
+36336337343764316534346436643562396134363936646661353366643533326135396636363636
+35303133353339613763373735633965663465383239653134643735343339616134316462633436
+66376439623564616531623963383836333633303061643965663333643634646534
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
new file mode 100644
index 0000000..a7a8088
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
@@ -0,0 +1,52 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/lsu"
+vhost_servername: "lsu.scigap.org"
+vhost_ssl: False
+
+## WSO2 IS related variables
+tenant_domain: "lsu.edu"
+admin_username: "lsuadmin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "lsu"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/lsu"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjusb/NsMD1BRsb0A7CEYpaaoKY+RH9bkcGOCTtJMRYgtzenOaX9egIR7AtOH3eaWjr2221QU9IOTQj2S4ZhpnC6+/eO6Lx3zHbqzG78z7U7gX6IzDjjuwrQDeDLYGfd6RoDAZk+H2/pvoNGia/AnOXHU0+x1eF795TDbyVZvA+vtDPJ4EHUfbE8GG/QzTGK8IZqUBJUd+NSzcqTs/jzTetwunN1MnTHHDOCOEgYWDTia+TMECmEq/YNy0u8Uhu1TtmXUu/vyCwjnspWBNnWjiXf0tLEnZ10HnvmH15Yhh3OERKrACaU7JqNmPDj8Vc9YIAYK1bRjmh5OrYCtxiHVF"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['wfeinstein@lsu.edu','sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "LSU Cybergateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
new file mode 100644
index 0000000..6613bc7
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+30666366633331643466326435353639626235333865633630363735626565323039313363373466
+6364303466313965313332656465653435663836613439340a336232363033373036393465653335
+36323461373239343964316138303265356162346631393331373639333962303238643963383065
+3066386366623366660a613534386639633362396164643131643333373234373838636337313135
+38663464326231356266666161303337383730343261373034326263376162363763623334666466
+65366135346134663132366165396638646661383962663964646536393563633166363064366662
+30653735393238363162666365333363643139376662366535613237323837396363643036646338
+31303561323035653238333338643065343637323866346437323633313364343338646139363531
+34343733356437616662396137366265393030313430326439306234623637356434326439316330
+38616338646462383865316238373732633435333363346665316462363736626531336563313730
+63323833333338313937616661313437393238313538633335353765353532623636383831353735
+64303366636362613965303435666666323432353565623038373939393434363862303835313233
+34363133663864336331613734666533373464393365346334613663323236616466613563633939
+38393362373364636335376433353035636338353131326437663938366136393336626634336230
+30336232353961396565636532303434393866623963373064396166656232333564373330626366
+61626631366139653663346230613938623064386562623932383737333163346263326635653134
+39623962323630306437643238653739313566666533393233343033643764393863
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
new file mode 100644
index 0000000..90c0d35
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/southdakota"
+vhost_servername: "sciencegateway.usd.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/cybergateway_usd_edu_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/cybergateway_usd_edu_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/cybergateway.usd.key"
+
+## WSO2 IS related variables
+tenant_domain: "southdakota.edu"
+admin_username: "usdadmin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "southdakota"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/southdakota"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['Doug.Jennewein@usd.edu','sgg@iu.edu','Joseph.Madison@coyotes.usd.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "usd-cybergateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/usd-cybergateway-theme.git"
+portal_title: "South Dakota Cybergateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
new file mode 100644
index 0000000..26eb97b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+65646530306630303662386462346234366661303538613365633738336535653761656263353763
+3032393530373163346364636238386431326363626562300a303930303663646361366634363737
+33396531656231663432623464646366653631303862396137643937373562633738653335626431
+6632666632323536320a383433396534623839303761376162393166393962393731356531323435
+61666538663864663762386336313035393831343632393831663563643237303034663139633537
+38663263363765363964393463356136366531633632303836333138643063323463616133353034
+33626665393936656562656537343464346131396238396665363231333761653931363862383061
+61363261326163386335663933326230633830323533616632353339346365613934633736373235
+34623566633761313831353833303962623839333130313765626639666439383132623338303036
+36356432393530343566316262353163643131663338343163623535613937343035343734636635
+30633939356365326661316633383231353438376162326637653866616332303064383636303137
+35366639303435643861323035343330373666343038353633636639303932373236343366323232
+31313661623761333931353831383235346239653236646665353130346163666363633836363230
+39636164366462343161313139666134643033663030313637653263353333663233626662393562
+66393661613662393965623139343537303863663262663435303630346265393737623563663464
+36636262356433326232383038363735383733623766613238613431643830353864623631643062
+3033
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
new file mode 100644
index 0000000..60f9a11
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/southernillinois"
+vhost_servername: "sciencegateway.siu.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.siu.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.siu.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.siu.edu/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.southill"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "southill"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/southernillinois"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: ""
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "Southern Illinois PHP Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
new file mode 100644
index 0000000..9dab6a3
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+37323664643139643032373161333135636633346230346562613236313036326430323636343837
+6432656261326363653632613431323834373566336337630a616565353966383166353435626662
+31656638376633633736333335393039646161303366323164636431343334383166633464336561
+3533353662643637330a313630663232616435333464353930366561346433376438356134633037
+36313932633439346330366238303730643663663035393563333330613438333832396266356634
+66313238356237383336313465343765656365623865616262316132396338373234666535646266
+32663165646238666538333365613438623363336436646334633434333435373039613338383639
+30323537653230656233346565313464333730633734613138633036633632333231373066623736
+65313433623862346537633461613932326631323337383065366631346139666164316337616338
+38303063353834393937366431313566336636373961323165313862393832626431373261656364
+34323534663836653761643562333933666330313730343836336634303161363664613835336538
+30333135633135323437386566346136623635316565363764333162316530643265303533373264
+37306433356635616266316539336437623536616466353762333034643962356539623130343665
+31666639316231303130373566373030343335616266396464363431343937346234623466383735
+32313730323231366232623833396537343032636633343931353539616339613961666433326130
+61316135313531633534303262393632653732313935616334616430373561623461363163343830
+62663166316161656635656566393964323932383633306539653237373232373165
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
new file mode 100644
index 0000000..3513adf
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/utah-university"
+vhost_servername: "cybergateway.chpc.utah.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.utah"
+admin_username: "adminuser"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "utah"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/utah-university"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiR1OU3jrSqoDxkieAQuB4YXnEllg+74h9nWKXSa7G6S8BDuSOVQl6YFdk1nCpJ9pGEoCziYa+fgTmQ98eXFEaXglRyu2Cq7HkPgKnBR5xtsx+Qslm/jBxO2C/kez7eGJH8F8bSOq6o4hUsPP8XUdzvf76o+wZ25RErqzQl1Go8E1sOi4fXkH4eR8cCsI093ZquuUgwIZjoqcj+bwCRoZWCqyOhXEzYqZmng4EvBm3VnPf77xdVxAZELDd7oKiTf4y1cEExIJyQJqwCJJjic9Utuf13lEROfnV2nELf1YdaLwWoFKJgc+bBaoxxxoo1hdKW7hFQDmgHCWASSIX0fx/"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "Utah Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
new file mode 100644
index 0000000..7f188388
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+32393264363338303162363535326338376461633762376363326364363833356638316138383436
+3764313937636538303635623739623337386331613732360a643461323435356434353864646330
+30623964663261656235633765306139343561376264623737373063626263333836623361363361
+6266626666613937660a636338353462656362333734666436343431393266333661316330356333
+63613061363235336333366262623733333630386337353165316536323566313263653462353730
+31393437646138643734653536643866383230643136646138323137386432636331386333626135
+61346233636639636165626262626535316166356661666639623730643164303561313165303064
+32643138646666356634656364646234356238356235383937393461326634613136313135363966
+31343861333261666666666165333163663837653239376331386633613633656632346266346163
+63353764626566616130393638633137373563383238623464306366663536306661623134343231
+31303839353630376364336564346436383031313035393633346361333865393430306163653461
+31623535396466323230633032373265656631396437616236356336313662626333613366393736
+64666264313563616633653862363132633734343532303761343330363634363064316661626662
+62346164353864316665356664383638386436653336396266613834613533396164366339353964
+36386235396133626630336538656139383139343862316462373434353434666632376666613465
+64613830346138666530333632396434636264623835653138636139383261336636383932653132
+38383061323031323135323432633731303663346236336438373732353363303461
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index f5d5bd2..a4192b5 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -19,14 +19,21 @@
#
---
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cinetvtech"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/1bf6e77e/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 4ded1f4..dff3002 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -75,7 +75,7 @@
dest: "{{ doc_root_dir }}/public/themes/{{ portal_theme }}"
version: "master"
update: yes
- when: portal_theme_repo != ""
+ when: portal_theme != "base"
- name: give read permissions to doc root
file: path="{{ doc_root_dir }}" state=directory mode=a+rX recurse=yes
[43/50] [abbrv] airavata git commit: checking sharing is enabled
Posted by ma...@apache.org.
checking sharing is enabled
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/43c6736b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/43c6736b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/43c6736b
Branch: refs/heads/develop
Commit: 43c6736bd07b9420f0d9bc4c5d7f0da389ac0ace
Parents: 2fb19efc
Author: scnakandala <su...@gmail.com>
Authored: Thu Apr 27 14:51:54 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Thu Apr 27 14:51:54 2017 -0400
----------------------------------------------------------------------
.../core/experiment/catalog/resources/WorkerResource.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/43c6736b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index 1d2c6db..ab3034c 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -19,6 +19,7 @@
*/
package org.apache.airavata.registry.core.experiment.catalog.resources;
+import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.model.status.ExperimentState;
import org.apache.airavata.registry.core.experiment.catalog.ExpCatResourceUtils;
import org.apache.airavata.registry.core.experiment.catalog.ExperimentCatResource;
@@ -522,7 +523,7 @@ public class WorkerResource extends AbstractExpCatResource {
for (String id : accessibleIds)
query += ("'" + id + "'" + ",");
query = query.substring(0, query.length() - 1) + ") AND ";
- }else{
+ }else if(ServerSettings.isEnableSharing() && (accessibleIds==null || accessibleIds.size()==0)){
return new ArrayList<>();
}
@@ -615,7 +616,7 @@ public class WorkerResource extends AbstractExpCatResource {
for (String id : accessibleIds)
query += ("'" + id + "'" + ",");
query = query.substring(0, query.length() - 1) + ") AND ";
- }else{
+ }else if(ServerSettings.isEnableSharing() && (accessibleIds==null || accessibleIds.size()==0)){
return new ArrayList<>();
}
[23/50] [abbrv] airavata git commit: Add name including gateway_id to
pga play
Posted by ma...@apache.org.
Add name including gateway_id to pga play
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/8be77fd3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/8be77fd3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/8be77fd3
Branch: refs/heads/develop
Commit: 8be77fd37de62753df984a05d3591f4584b7f6d6
Parents: 82e39d8
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 19 13:56:16 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 19 13:56:16 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/pga-single-vhost.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/8be77fd3/dev-tools/ansible/pga-single-vhost.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-single-vhost.yml b/dev-tools/ansible/pga-single-vhost.yml
index 618c613..eae17e2 100644
--- a/dev-tools/ansible/pga-single-vhost.yml
+++ b/dev-tools/ansible/pga-single-vhost.yml
@@ -26,6 +26,7 @@
# See https://github.com/ansible/ansible/issues/9065 for more info.
---
- hosts: pga
+ name: Create/update pga for gateway {{ gateway_id }}
vars_files:
- "{{ vars_dir }}/vars.yml"
- "{{ vars_dir }}/vault.yml"
[03/50] [abbrv] airavata git commit: ansible database role: Must be
root to run yum install
Posted by ma...@apache.org.
ansible database role: Must be root to run yum install
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e440a966
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e440a966
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e440a966
Branch: refs/heads/develop
Commit: e440a966e08dd5a0301c6cb4c3d941c5acffbd0b
Parents: defbad3
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 4 10:30:36 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 4 10:30:36 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/database/tasks/main.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e440a966/dev-tools/ansible/roles/database/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/database/tasks/main.yml b/dev-tools/ansible/roles/database/tasks/main.yml
index c09ced4..eddd60b 100644
--- a/dev-tools/ansible/roles/database/tasks/main.yml
+++ b/dev-tools/ansible/roles/database/tasks/main.yml
@@ -66,6 +66,7 @@
- name: double check policycoreutils installed
yum: name=policycoreutils-python state=installed
when: mysql_selinux_update.stat.exists == False
+ become_user: root
- name: Copy SELinux type enforcement file
copy: src=mysql-tmp.te dest=/tmp/
[05/50] [abbrv] airavata git commit: Adding posix mode needed by
assembly plugin upgrade
Posted by ma...@apache.org.
Adding posix mode needed by assembly plugin upgrade
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9e1958f4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9e1958f4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9e1958f4
Branch: refs/heads/develop
Commit: 9e1958f457a461ecc033921c7631684b72016214
Parents: 2e90368
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Apr 4 12:39:08 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 4 12:39:08 2017 -0400
----------------------------------------------------------------------
airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml | 1 +
airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml | 1 +
airavata-api/airavata-client-sdks/airavata-python-sdk/pom.xml | 1 +
3 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9e1958f4/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
index c54db79..1d41933 100644
--- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/pom.xml
@@ -72,6 +72,7 @@
<goal>single</goal>
</goals>
<configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
<finalName>${archive.name}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9e1958f4/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
index 1990c60..9069af9 100644
--- a/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/pom.xml
@@ -72,6 +72,7 @@
<goal>single</goal>
</goals>
<configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
<finalName>${archive.name}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9e1958f4/airavata-api/airavata-client-sdks/airavata-python-sdk/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/pom.xml b/airavata-api/airavata-client-sdks/airavata-python-sdk/pom.xml
index ca1c99d..4fb5c4c 100644
--- a/airavata-api/airavata-client-sdks/airavata-python-sdk/pom.xml
+++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/pom.xml
@@ -72,6 +72,7 @@
<goal>single</goal>
</goals>
<configuration>
+ <tarLongFileMode>posix</tarLongFileMode>
<finalName>${archive.name}-${project.version}</finalName>
<descriptors>
<descriptor>src/main/assembly/bin-assembly.xml</descriptor>
[28/50] [abbrv] airavata git commit: Upating south dakota ssl cert
Posted by ma...@apache.org.
Upating south dakota ssl cert
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e74625d1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e74625d1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e74625d1
Branch: refs/heads/develop
Commit: e74625d166b76629223502c8167460aeb4983fa6
Parents: 05d39e5
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Apr 25 13:07:42 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 25 13:07:42 2017 -0400
----------------------------------------------------------------------
.../scigap/production/pga_config/southdakota/vars.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e74625d1/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
index 90c0d35..b37dc02 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -27,9 +27,9 @@ doc_root_dir: "/var/www/portals/southdakota"
vhost_servername: "sciencegateway.usd.edu"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/cybergateway_usd_edu_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/cybergateway_usd_edu_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/cybergateway.usd.key"
+ssl_certificate_file: "/etc/pki/tls/certs/sciencegateway_usd_edu_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/sciencegateway_usd_edu_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/southdakota-sg.key"
## WSO2 IS related variables
tenant_domain: "southdakota.edu"
@@ -52,5 +52,5 @@ portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "usd-cybergateway-theme"
portal_theme_repo: "https://github.com/SciGaP/usd-cybergateway-theme.git"
-portal_title: "South Dakota Cybergateway"
+portal_title: "South Dakota Sciencegateway"
...
[17/50] [abbrv] airavata git commit: Adding Ajinkya Dhamnaskar to
pom.xml
Posted by ma...@apache.org.
Adding Ajinkya Dhamnaskar to pom.xml
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ab6d02dc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ab6d02dc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ab6d02dc
Branch: refs/heads/develop
Commit: ab6d02dc423b165705b8ec23388c43c1fcdadcce
Parents: fc9b8f2
Author: Ajinkya Dhamnaskar <ad...@apache.org>
Authored: Tue Apr 11 13:00:11 2017 -0400
Committer: Ajinkya Dhamnaskar <ad...@apache.org>
Committed: Tue Apr 11 13:00:11 2017 -0400
----------------------------------------------------------------------
pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ab6d02dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20d3d53..e3e93be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -121,6 +121,17 @@
<developers>
<developer>
+ <id>adhamnas</id>
+ <name>Ajinkya Dhamnaskar</name>
+ <email>adhamnas@apache.org</email>
+ <timezone>-5</timezone>
+ <organization>Indiana University</organization>
+ <organizationUrl>http://www.iub.edu</organizationUrl>
+ <roles>
+ <role>committer</role>
+ </roles>
+ </developer>
+ <developer>
<id>aslom</id>
<name>Aleksander Slominski</name>
<email>aslom@us.ibm.com</email>
[39/50] [abbrv] airavata git commit: Ultrascan pga configuration
Posted by ma...@apache.org.
Ultrascan pga configuration
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c99687f9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c99687f9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c99687f9
Branch: refs/heads/develop
Commit: c99687f993992c402cb722acc2237b02245509b5
Parents: 57cb2ae
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 26 14:16:40 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 26 14:16:40 2017 -0400
----------------------------------------------------------------------
.../production/pga_config/ultrascan/vars.yml | 62 ++++++++++++++++++++
.../production/pga_config/ultrascan/vault.yml | 18 ++++++
dev-tools/ansible/roles/pga/tasks/main.yml | 4 +-
3 files changed, 82 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/c99687f9/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
new file mode 100644
index 0000000..2548cb8
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -0,0 +1,62 @@
+#
+#
+# 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.
+#
+
+---
+
+# NOTE Ultrascan is pointed to gw153
+airavata_server: "gw153.iu.xsede.org"
+airavata_port: "8930"
+
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+vhost_servername: "ultrascan.scigap.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/ultrascan_scigap_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/ultrascan_scigap_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/ultrascan.scigap.key"
+
+## WSO2 IS related variables
+tenant_domain: "prod.ultrascan"
+admin_username: "uslimsadmin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+user_role_name: "airavata-user"
+
+gateway_id: "Ultrascan_Production"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/ultrascan"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+# Not using gateway storage right now
+#gateway_data_store_ssh_public_key: ""
+
+## Portal related variables
+super_admin_portal: "true"
+admin_emails: "['eroma.abeysinghe@gmail.com','sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+portal_title: "Ultrascan SciGaP Dashboard"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/c99687f9/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
new file mode 100644
index 0000000..d8a11b1
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+32646566346165633263613063613465353634316261333737653431646232653433346636616635
+3136393565636162623536376661386138383733393637610a646138353030353138373739393839
+64353833616133633431333032306635333630313835333865313031363733373436303266616466
+3863366437643233630a366265316631336162623666303064343861646234326132663863346236
+63313364303063636136666365343164616336613837373133376232343165666139316165663961
+30316435313838656437346437363365663835656138353937643238363564373363623965336262
+34383964383363323862353932363538613432373765383762323138343435333239663939373533
+62373264353763363666623063393934376631336133623237353365663365303063366233336131
+30373836353566643430336436646138633237356265306438383937393937646234663831336436
+38616438663836313866393563363036396131373164616563653162333835656130376132316430
+65353864313337303366386566646435643065636662316563333734383432346431373536356533
+36393131383131663132613939386537336131353961653537646230326632373966303937613532
+62396436656161663264393335366633323533636666613364303364316134306439306334663065
+30623065333537643930373962663264343766356636333937383135333164363635396536316338
+36353436626436303938316638383632316233623562353930376238373038633964303431366135
+63623162306335353234393737623137356361653162633436666132333737316461663061373562
+32363836376238396239616163666338393839343865353866326166353532656361
http://git-wip-us.apache.org/repos/asf/airavata/blob/c99687f9/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 3279a97..61d789e 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -35,8 +35,8 @@
become: yes
become_user: "{{user}}"
-- name: Create user data dir {{ user_data_dir }}
- file: path="{{ user_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes follow=yes
+- name: Create experiment data dir {{ experiment_data_dir }}
+ file: path="{{ experiment_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes follow=yes
become: yes
# SELinux configuration
[11/50] [abbrv] airavata git commit: temp data store for gf4 for
testing; install pga ssh key
Posted by ma...@apache.org.
temp data store for gf4 for testing; install pga ssh key
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cda1172e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cda1172e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cda1172e
Branch: refs/heads/develop
Commit: cda1172e515bdae731cbd35f2222280173d9308f
Parents: 2e6437a
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 5 10:46:13 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 5 10:46:13 2017 -0400
----------------------------------------------------------------------
.../scigap/production/group_vars/pga-seagrid/vars.yml | 5 +++--
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 6 ++++++
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cda1172e/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
index f024d1a..89f300f 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
@@ -44,8 +44,9 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "seagrid"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/seagrid"
-# TODO: fix this
-gateway_data_store_resource_id: "149.165.156.11_b5f26430-14d5-4372-8a7e-39b125aa640b"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
## Portal related variables
super_admin_portal: "false"
http://git-wip-us.apache.org/repos/asf/airavata/blob/cda1172e/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 07f9a28..eb0308d 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -48,6 +48,7 @@ gateway_id: "{{ default_gateway }}"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}"
gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19"
+gateway_data_store_ssh_public_key: ""
## Portal related variables
super_admin_portal: "true"
http://git-wip-us.apache.org/repos/asf/airavata/blob/cda1172e/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 3f4aba6..4ded1f4 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -105,3 +105,9 @@
notify:
- restart httpd
when: vhost_ssl
+
+- name: copy pga user's SSH key for the gateway data store
+ authorized_key:
+ user: "{{user}}"
+ key: "{{ gateway_data_store_ssh_public_key }}"
+ when: gateway_data_store_ssh_public_key != ""
[09/50] [abbrv] airavata git commit: Add api-orch SSL port to
firewall config
Posted by ma...@apache.org.
Add api-orch SSL port to firewall config
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dc55333a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dc55333a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dc55333a
Branch: refs/heads/develop
Commit: dc55333a6b4338de133fc2b4c45cfda8434f61d8
Parents: ca9f938
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 5 09:36:38 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 5 09:36:38 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/api-orch/tasks/main.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc55333a/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 561b78f..1a5b298 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -76,6 +76,7 @@
firewalld: port={{ item }} zone=public permanent=true state=enabled immediate=yes
with_items:
- "{{ api_server_port }}/tcp"
+ - "{{ api_server_tls_port }}/tcp"
- "{{ orchestrator_port }}/tcp"
- "{{ cred_store_port }}/tcp"
- "{{ registry_port }}/tcp"
[06/50] [abbrv] airavata git commit: AIRAVATA-2335 Putting real
gateway datastore id in testdrive config
Posted by ma...@apache.org.
AIRAVATA-2335 Putting real gateway datastore id in testdrive config
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/382e3cb4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/382e3cb4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/382e3cb4
Branch: refs/heads/develop
Commit: 382e3cb482e78dd319bc1474b999c4de8b64801c
Parents: 9e1958f
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 4 14:13:09 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 4 14:13:09 2017 -0400
----------------------------------------------------------------------
.../inventories/testing-0.17-testdrive/group_vars/pga/vars.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/382e3cb4/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
index 6fff31c..5b5c13b 100644
--- a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
@@ -41,8 +41,7 @@ airavata_port: "8930"
gateway_id: "default"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}"
-# TODO: fix this
-gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19"
+gateway_data_store_resource_id: "149.165.156.148_13fd11a4-f2eb-4ba8-a2c7-0db07f96db6b"
## Portal related variables
super_admin_portal: "false"
[21/50] [abbrv] airavata git commit: gf4 user data directory is now
at /data/gateway-user-data
Posted by ma...@apache.org.
gf4 user data directory is now at /data/gateway-user-data
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dd5e9c1c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dd5e9c1c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dd5e9c1c
Branch: refs/heads/develop
Commit: dd5e9c1c332bfb5266b79c9cac2cf51f94ce6564
Parents: dc24945
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 18 14:30:50 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 18 14:30:50 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/scigap/production/group_vars/all/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/dd5e9c1c/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index 3984024..8069ff5 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -110,7 +110,7 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user_data_dir: "/var/www/portals/gateway-user-data"
+user_data_dir: "/data/gateway-user-data"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "tls://{{ groups['api-orch'][0] }}"
[16/50] [abbrv] airavata git commit: Adding goshenoy@apache.org to
developer list
Posted by ma...@apache.org.
Adding goshenoy@apache.org to developer list
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/fc9b8f23
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/fc9b8f23
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/fc9b8f23
Branch: refs/heads/develop
Commit: fc9b8f23cdb1d618862d90360f4e0401a91fe891
Parents: 1bf6e77
Author: Gourav Shenoy <sh...@gmail.com>
Authored: Mon Apr 10 14:02:46 2017 -0400
Committer: Gourav Shenoy <sh...@gmail.com>
Committed: Mon Apr 10 14:02:46 2017 -0400
----------------------------------------------------------------------
pom.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/fc9b8f23/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f6e3a0..20d3d53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,17 @@
<role>PMC member</role>
</roles>
</developer>
+ <developer>
+ <id>goshenoy</id>
+ <name>Gourav Ganesh Shenoy</name>
+ <email>goshenoy@apache.org</email>
+ <timezone>-5</timezone>
+ <organization>Indiana University</organization>
+ <organizationUrl>http://iub.edu</organizationUrl>
+ <roles>
+ <role>committer</role>
+ </roles>
+ </developer>
<developer>
<id>heshan</id>
<name>Heshan Suriyarachchi</name>
[31/50] [abbrv] airavata git commit: Groovy template updates to match
XSLT updates for campus gateways
Posted by ma...@apache.org.
Groovy template updates to match XSLT updates for campus gateways
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/cad84183
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/cad84183
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/cad84183
Branch: refs/heads/develop
Commit: cad84183ef2b0dfd15e570aaa7f29922ae4ea270
Parents: 1794197
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 14:52:04 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400
----------------------------------------------------------------------
.../configuration/server/src/main/resources/LSF_Groovy.template | 3 +++
.../configuration/server/src/main/resources/UGE_Groovy.template | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/cad84183/modules/configuration/server/src/main/resources/LSF_Groovy.template
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/LSF_Groovy.template b/modules/configuration/server/src/main/resources/LSF_Groovy.template
index 428b42b..f72e313 100644
--- a/modules/configuration/server/src/main/resources/LSF_Groovy.template
+++ b/modules/configuration/server/src/main/resources/LSF_Groovy.template
@@ -7,6 +7,8 @@
if (nodes != null && nodes != "") out.print '#BSUB -n ' + nodes + '\n'
if (jobName != null && jobName != "") out.print '#BSUB -J ' + jobName + '\n'
if (mailAddress != null && mailAddress != "") out.print '#BSUB -u ' + mailAddress + '\n'
+ out.print '#BSUB -B\n'
+ out.print '#BSUB -N\n'
if (accountString != null && accountString != "") out.print '#BSUB -P ' + accountString + '\n'
if (maxWallTime != null && maxWallTime != "") out.print '#BSUB -W ' + maxWallTime + '\n'
if (standardOutFile != null && standardOutFile != "") out.print '#BSUB -o ' + standardOutFile + '\n'
@@ -20,6 +22,7 @@
if (workingDirectory != null && workingDirectory != "") out.print 'cd ' + workingDirectory +'\n'
if (preJobCommands != null) for(pjc in preJobCommands) out.print pjc +'\n'
if (jobSubmitterCommand != null && jobSubmitterCommand != "") out.print jobSubmitterCommand + ' '
+ if (processPerNode != null && processPerNode != "") out.print processPerNode + ' '
if (executablePath != null && executablePath != "") out.print executablePath + ' '
if (inputs != null) for(input in inputs) out.print input + ' '
out.print '\n'
http://git-wip-us.apache.org/repos/asf/airavata/blob/cad84183/modules/configuration/server/src/main/resources/UGE_Groovy.template
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/UGE_Groovy.template b/modules/configuration/server/src/main/resources/UGE_Groovy.template
index df454dd..ce378f9 100644
--- a/modules/configuration/server/src/main/resources/UGE_Groovy.template
+++ b/modules/configuration/server/src/main/resources/UGE_Groovy.template
@@ -11,7 +11,7 @@
if (standardOutFile != null && standardOutFile != "") out.print '#$ -o ' + standardOutFile + '\n'
if (standardErrorFile != null && standardErrorFile != "") out.print '#$ -e ' + standardErrorFile + '\n'
if (nodes != null && nodes != "" && processPerNode != null && processPerNode != "")
- out.print '#$ -pe ' + processPerNode + 'way' + (12 * nodes)
+ out.print '#$ -pe orte ' + processPerNode
%>
#\$ -V
#\$ -m beas
@@ -21,6 +21,7 @@
if (workingDirectory != null && workingDirectory != "") out.print 'cd ' + workingDirectory +'\n'
if (preJobCommands != null) for(pjc in preJobCommands) out.print pjc +'\n'
if (jobSubmitterCommand != null && jobSubmitterCommand != "") out.print jobSubmitterCommand + ' '
+ if (processPerNode != null && processPerNode != "") out.print processPerNode + ' '
if (executablePath != null && executablePath != "") out.print executablePath + ' '
if (inputs != null) for(input in inputs) out.print input + ' '
out.print '\n'
[49/50] [abbrv] airavata git commit: Merge branch 'master' into
develop
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-api-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-api-stubs/src/main/java/org/apache/airavata/api/Airavata.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/application/io/InputDataObjectType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/messaging/event/MessageType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/NSFDemographics.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/user/UserProfile.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
----------------------------------------------------------------------
diff --cc airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
index 3b1e370,0000000..8d9a25d
mode 100644,000000..100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/tenant/entities/GatewayEntity.java
@@@ -1,254 -1,0 +1,254 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.service.profile.commons.tenant.entities;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Entity
+@Table(name = "GATEWAY")
+public class GatewayEntity {
+ private final static Logger logger = LoggerFactory.getLogger(GatewayEntity.class);
+ private String gatewayId;
+ private String gatewayName;
+ private String domain;
+ private String emailAddress;
+ private String gatewayApprovalStatus;
+ private String gatewayAcronym;
+ private String gatewayUrl;
+ private String gatewayPublicAbstract;
+ private String reviewProposalDescription;
+ private String gatewayAdminFirstName;
+ private String getGatewayAdminLastName;
+ private String gatewayAdminEmail;
+ private String identityServerUserName;
+ private String identityServerPasswordToken;
+ private String declinedReason;
+ private String oauthClientId;
+ private String getOauthClientSecret;
+ private long requestCreationTime;
+ private String requesterUsername;
+
+ @Id
+ @Column(name = "GATEWAY_ID")
+ public String getGatewayId() {
+ return gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ @Column(name = "GATEWAY_NAME")
+ public String getGatewayName() {
+ return gatewayName;
+ }
+
+ public void setGatewayName(String gatewayName) {
+ this.gatewayName = gatewayName;
+ }
+
+ @Column(name = "GATEWAY_DOMAIN")
+ public String getDomain() {
+ return domain;
+ }
+
+ public void setDomain(String domain) {
+ this.domain = domain;
+ }
+
+ @Column(name = "EMAIL_ADDRESS")
+ public String getEmailAddress() {
+ return emailAddress;
+ }
+
+ public void setEmailAddress(String emailAddress) {
+ this.emailAddress = emailAddress;
+ }
+
+ @Column(name = "GATEWAY_APPROVAL_STATUS")
+ public String getGatewayApprovalStatus() {
+ return gatewayApprovalStatus;
+ }
+
+ public void setGatewayApprovalStatus(String gatewayApprovalStatus) {
+ this.gatewayApprovalStatus = gatewayApprovalStatus;
+ }
+
+ @Column(name = "GATEWAY_ACRONYM")
+ public String getGatewayAcronym() {
+ return gatewayAcronym;
+ }
+
+ public void setGatewayAcronym(String gatewayAcronym) {
+ this.gatewayAcronym = gatewayAcronym;
+ }
+
+ @Column(name = "GATEWAY_URL")
+ public String getGatewayUrl() {
+ return gatewayUrl;
+ }
+
+ public void setGatewayUrl(String gatewayUrl) {
+ this.gatewayUrl = gatewayUrl;
+ }
+
+ @Column(name = "GATEWAY_PUBLIC_ABSTRACT")
+ public String getGatewayPublicAbstract() {
+ return gatewayPublicAbstract;
+ }
+
+ public void setGatewayPublicAbstract(String gatewayPublicAbstract) {
+ this.gatewayPublicAbstract = gatewayPublicAbstract;
+ }
+
+ @Column(name = "GATEWAY_REVIEW_PROPOSAL_DESCRIPTION")
+ public String getReviewProposalDescription() {
+ return reviewProposalDescription;
+ }
+
+ public void setReviewProposalDescription(String reviewProposalDescription) {
+ this.reviewProposalDescription = reviewProposalDescription;
+ }
+
+ @Column(name = "GATEWAY_ADMIN_FIRST_NAME")
+ public String getGatewayAdminFirstName() {
+ return gatewayAdminFirstName;
+ }
+
+ public void setGatewayAdminFirstName(String gatewayAdminFirstName) {
+ this.gatewayAdminFirstName = gatewayAdminFirstName;
+ }
+
+ @Column(name = "GATEWAY_ADMIN_LAST_NAME")
+ public String getGetGatewayAdminLastName() {
+ return getGatewayAdminLastName;
+ }
+
+ public void setGetGatewayAdminLastName(String getGatewayAdminLastName) {
+ this.getGatewayAdminLastName = getGatewayAdminLastName;
+ }
+
+ @Column(name = "GATEWAY_ADMIN_EMAIL")
+ public String getGatewayAdminEmail() {
+ return gatewayAdminEmail;
+ }
+
+ public void setGatewayAdminEmail(String gatewayAdminEmail) {
+ this.gatewayAdminEmail = gatewayAdminEmail;
+ }
+
+ @Column(name = "IDENTITY_SERVER_USERNAME")
+ public String getIdentityServerUserName() {
+ return identityServerUserName;
+ }
+
+ public void setIdentityServerUserName(String identityServerUserName) {
+ this.identityServerUserName = identityServerUserName;
+ }
+
+ @Column(name = "IDENTITY_SERVER_PASSWORD_TOKEN")
+ public String getIdentityServerPasswordToken() {
+ return identityServerPasswordToken;
+ }
+
+ public void setIdentityServerPasswordToken(String identityServerPasswordToken) {
+ this.identityServerPasswordToken = identityServerPasswordToken;
+ }
+
+ @Column(name = "REQUESTER_USERNAME")
+ public String getRequesterUsername() {
+ return requesterUsername;
+ }
+
+ public void setRequesterUsername(String requesterUsername) {
+ this.requesterUsername = requesterUsername;
+ }
+
+ @Column(name = "DECLINED_REASON")
+ public String getDeclinedReason() {
+ return declinedReason;
+ }
+
+ public void setDeclinedReason(String declinedReason) {
+ this.declinedReason = declinedReason;
+ }
+
+ @Column(name = "OAUTH_CLIENT_ID")
+ public String getOauthClientId() {
+ return oauthClientId;
+ }
+
+ public void setOauthClientId(String oauthClientId) {
+ this.oauthClientId = oauthClientId;
+ }
+
+ @Column(name = "REQUEST_CREATION_TIME")
+ public long getRequestCreationTime() {
+ return requestCreationTime;
+ }
+
+ public void setRequestCreationTime(long requestCreationTime) {
+ this.requestCreationTime = requestCreationTime;
+ }
+
+ @Column(name = "OAUTH_CLIENT_SECRET")
+ public String getGetOauthClientSecret() {
+ return getOauthClientSecret;
+ }
+
+ public void setGetOauthClientSecret(String oauthClientSecret) {
+ this.getOauthClientSecret = oauthClientSecret;
+ }
+
+ @PrePersist
+ void createdAt() {
+ this.requestCreationTime = new Date().getTime();
+ }
+
+ @Override
+ public String toString() {
+ return "GatewayEntity{" +
+ "gatewayId='" + gatewayId + '\'' +
+ ", gatewayName='" + gatewayName + '\'' +
+ ", domain='" + domain + '\'' +
+ ", emailAddress='" + emailAddress + '\'' +
+ ", gatewayApprovalStatus='" + gatewayApprovalStatus + '\'' +
+ ", gatewayAcronym='" + gatewayAcronym + '\'' +
+ ", gatewayUrl='" + gatewayUrl + '\'' +
+ ", gatewayPublicAbstract='" + gatewayPublicAbstract + '\'' +
+ ", reviewProposalDescription='" + reviewProposalDescription + '\'' +
+ ", gatewayAdminFirstName='" + gatewayAdminFirstName + '\'' +
+ ", getGatewayAdminLastName='" + getGatewayAdminLastName + '\'' +
+ ", gatewayAdminEmail='" + gatewayAdminEmail + '\'' +
+ ", identityServerUserName='" + identityServerUserName + '\'' +
+ ", identityServerPasswordToken='" + identityServerPasswordToken + '\'' +
+ ", declinedReason='" + declinedReason + '\'' +
+ ", oauthClientId='" + oauthClientId + '\'' +
+ ", getOauthClientSecret='" + getOauthClientSecret + '\'' +
+ ", requestCreationTime=" + requestCreationTime +
+ ", requesterUsername='" + requesterUsername + '\'' +
+ '}';
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
----------------------------------------------------------------------
diff --cc airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
index 2548991,0000000..f911b42
mode 100644,000000..100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/ObjectMapperSingleton.java
@@@ -1,39 -1,0 +1,39 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.service.profile.commons.utils;
+
+import org.dozer.DozerBeanMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ObjectMapperSingleton extends DozerBeanMapper{
+ private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class);
+
+ private static ObjectMapperSingleton instance;
+
+ private ObjectMapperSingleton(){}
+
+ public static ObjectMapperSingleton getInstance(){
+ if(instance == null)
+ instance = new ObjectMapperSingleton();
+ return instance;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java
----------------------------------------------------------------------
diff --cc airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java
index 1a7677c,0000000..2584262
mode 100644,000000..100644
--- a/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java
+++ b/airavata-services/profile-service/profile-user-core/src/main/java/org/apache/airavata/service/profile/user/core/exceptions/UserProfileRegistryException.java
@@@ -1,28 -1,0 +1,28 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.service.profile.user.core.exceptions;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UserProfileRegistryException extends Exception {
+ private final static Logger logger = LoggerFactory.getLogger(UserProfileRegistryException.class);
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java
----------------------------------------------------------------------
diff --cc airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java
index 7ec56b9,0000000..1651402
mode 100644,000000..100644
--- a/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java
+++ b/airavata-services/services-security/src/main/java/org/apache/airavata/service/security/interceptor/SecurityModule.java
@@@ -1,43 -1,0 +1,43 @@@
- /*
++/**
+ *
+ * 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.
+ *
+ */
+package org.apache.airavata.service.security.interceptor;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.matcher.Matchers;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This does the plumbing work of integrating the interceptor with Guice framework for the methods to be
+ * intercepted upon their invocation.
+ */
+public class SecurityModule extends AbstractModule {
+ private final static Logger logger = LoggerFactory.getLogger(SecurityModule.class);
+
+ public void configure(){
+ logger.info("Security module reached...");
+ SecurityInterceptor interceptor = new SecurityInterceptor();
+ //requestInjection(interceptor);
+
+ bindInterceptor(Matchers.any(), Matchers.annotatedWith(SecurityCheck.class), interceptor);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/dev-tools/ansible/inventories/develop/group_vars/all.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/dev-tools/ansible/roles/api-orch/defaults/main.yml
----------------------------------------------------------------------
diff --cc dev-tools/ansible/roles/api-orch/defaults/main.yml
index a9f655c,c7dd3a9..d10db39
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@@ -1,2 -1,22 +1,24 @@@
+ #
+ #
+ # 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.
+ #
+
api_orch_server_names: "api-orch"
+ api_orch_log_dir: "../logs"
++
+remote_idp_service_url: "https://iam.scigap.org/auth"
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/dev-tools/ansible/roles/java/tasks/main.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/commons/src/main/java/org/apache/airavata/common/utils/Constants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/commons/src/main/java/org/apache/airavata/common/utils/ServerSettings.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
----------------------------------------------------------------------
diff --cc modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
index 05aba6e,0000000..e2db407
mode 100644,000000..100644
--- a/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
+++ b/modules/db-event-manager/src/main/java/org/apache/airavata/db/event/manager/utils/Constants.java
@@@ -1,33 -1,0 +1,33 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.db.event.manager.utils;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by Ajinkya on 3/1/17.
+ */
+public class Constants {
+
+ public static final String DB_EVENT_MGR_ZK_PATH = "db-event-mgr";
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/gfac/gfac-client/src/main/java/org/apache/airavata/gfac/cpi/GfacService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/messaging/core/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/MessagingFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/Publisher.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/impl/RabbitMQPublisher.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/orchestrator/orchestrator-client/src/main/java/org/apache/airavata/orchestrator/cpi/OrchestratorService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/replica/catalog/impl/ReplicaCatalogImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-core/src/test/java/org/apache/airavata/replica/catalog/ReplicaCatalogTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/ReplicaCatalog.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-service/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java
----------------------------------------------------------------------
diff --cc modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java
index 04bcdd4,0cf40e7..d5f027c
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/RegistryAPIServer.java
@@@ -16,11 -16,9 +16,10 @@@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
- */
+ */
package org.apache.airavata.registry.api.service;
+import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.common.utils.ServerSettings;
import org.apache.airavata.registry.api.RegistryService;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
----------------------------------------------------------------------
diff --cc modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
index 973b2d5,eeb6a81..93ddc1d
--- a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
+++ b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/Constants.java
@@@ -16,16 -16,9 +16,14 @@@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
*/
-
package org.apache.airavata.registry.api.service.util;
+import org.apache.airavata.common.utils.DBEventService;
+
+import java.util.ArrayList;
+import java.util.List;
+
public class Constants {
public static final String REGISTRY_SERVER_PORT = "regserver.server.port";
public static final String REGISTRY_SERVER_HOST = "regserver.server.host";
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/util/DatabaseCreator.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/RegistryService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/registry/registry-server/registry-api-stubs/src/main/java/org/apache/airavata/registry/api/exception/RegistryServiceException.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserGroupRepository.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java
----------------------------------------------------------------------
diff --cc modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java
index 7b707f1,c728c00..0cca07a
--- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java
+++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServer.java
@@@ -16,17 -16,12 +16,16 @@@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
- */
+ */
package org.apache.airavata.sharing.registry.server;
+import org.apache.airavata.common.exception.AiravataException;
import org.apache.airavata.common.utils.IServer;
import org.apache.airavata.common.utils.ServerSettings;
+import org.apache.airavata.sharing.registry.messaging.SharingServiceDBEventMessagingFactory;
+import org.apache.airavata.sharing.registry.models.SharingRegistryException;
import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;
+import org.apache.airavata.sharing.registry.utils.Constants;
import org.apache.thrift.server.TServer;
import org.apache.thrift.server.TThreadPoolServer;
import org.apache.thrift.transport.TServerSocket;
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-server/src/test/java/org/apache/airavata/sharing/registry/SharingRegistryServiceTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-stubs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/Entity.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/service/cpi/SharingRegistryService.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-service-docs/api-docs/index.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-service-docs/api-docs/sharing_cpi.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/sharing-service-docs/api-docs/sharing_models.html
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/sharing-registry/thrift_models/thrift-gen.sh
----------------------------------------------------------------------
diff --cc modules/sharing-registry/thrift_models/thrift-gen.sh
index b4fb872,34b0934..a096eb1
--- a/modules/sharing-registry/thrift_models/thrift-gen.sh
+++ b/modules/sharing-registry/thrift_models/thrift-gen.sh
@@@ -1,6 -1,26 +1,26 @@@
#!/usr/bin/env bash
+ #
+ #
+ # 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.
+ #
+
-thrift --gen java sharing_models.thrift
+thrift --gen java:generated_annotations=undated sharing_models.thrift
cd gen-java
rm -r ../../sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/*
cp -r org/apache/airavata/sharing/registry/models/ ../../sharing-registry-stubs/src/main/java/org/apache/airavata/sharing/registry/models/
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile-migration/src/main/java/org/apache/airavata/UserProfileAiravataThriftClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/pom.xml
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/pom.xml
index 3e49f86,0000000..802c0ed
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/pom.xml
+++ b/modules/user-profile/user-profile-core/pom.xml
@@@ -1,131 -1,0 +1,152 @@@
+<?xml version="1.0" encoding="UTF-8"?>
++<!--
++
++
++ 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.
++
++-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata</artifactId>
+ <version>0.17-SNAPSHOT</version>
+ <relativePath>../../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>user-profile-core</artifactId>
+
+ <properties>
+ <derby.version>10.11.1.1</derby.version>
+ <surefire.version>2.18.1</surefire.version>
+ <skipTests>false</skipTests>
+ <mysql.connector.version>5.1.34</mysql.connector.version>
+ <openjpa.version>2.2.0</openjpa.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-data-models</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.dozer</groupId>
+ <artifactId>dozer</artifactId>
+ <version>5.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>${mysql.connector.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
+ <configuration>
+ <source>1.8</source>
+ <target>1.8</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-maven-plugin</artifactId>
+ <version>2.2.0</version>
+ <configuration>
+ <includes>**/entities/*.class</includes>
+ <excludes>**/entities/XML*.class</excludes>
+ <addDefaultConstructor>true</addDefaultConstructor>
+ <enforcePropertyRestrictions>true</enforcePropertyRestrictions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>enhancer</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>enhance</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <inherited>true</inherited>
+ <configuration>
+ <failIfNoTests>false</failIfNoTests>
+ <!--<skipTests>${skipTests}</skipTests>-->
+ <skipTests>true</skipTests>
+ <workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/UserProfileRegistryException.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/UserProfileRegistryException.java
index db6c391,0000000..056baea
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/UserProfileRegistryException.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/UserProfileRegistryException.java
@@@ -1,28 -1,0 +1,28 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class UserProfileRegistryException extends Exception {
+ private final static Logger logger = LoggerFactory.getLogger(UserProfileRegistryException.class);
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/NSFDemographicsEntity.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/NSFDemographicsEntity.java
index ccb4625,0000000..00d7bda
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/NSFDemographicsEntity.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/NSFDemographicsEntity.java
@@@ -1,94 -1,0 +1,94 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.entities;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name = "NSF_DEMOGRAPHIC")
+public class NSFDemographicsEntity {
+ private String airavataInternalUserId;
+ private String gender;
+ private List<String> ethnicities;
+ private List<String> races;
+ private List<String> disabilities;
+ private UserProfileEntity userProfile;
+
+ @Id
+ @Column(name = "AIRAVATA_INTERNAL_USER_ID")
+ public String getAiravataInternalUserId() {
+ return airavataInternalUserId;
+ }
+
+ public void setAiravataInternalUserId(String userId) {
+ this.airavataInternalUserId = userId;
+ }
+
+ @Column(name = "GENDER")
+ public String getGender() {
+ return gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+
+ @ElementCollection
+ @CollectionTable(name="NSF_DEMOGRAPHIC_ETHNICITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getEthnicities() {
+ return ethnicities;
+ }
+
+ public void setEthnicities(List<String> ethnicities) {
+ this.ethnicities = ethnicities;
+ }
+
+ @ElementCollection
+ @CollectionTable(name="NSF_DEMOGRAPHIC_RACE", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getRaces() {
+ return races;
+ }
+
+ public void setRaces(List<String> races) {
+ this.races = races;
+ }
+
+ @ElementCollection
+ @CollectionTable(name="NSF_DEMOGRAPHIC_DISABILITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getDisabilities() {
+ return disabilities;
+ }
+
+ public void setDisabilities(List<String> disabilities) {
+ this.disabilities = disabilities;
+ }
+
+ @OneToOne(targetEntity = UserProfileEntity.class, cascade = CascadeType.ALL)
+ @PrimaryKeyJoinColumn(name = "AIRAVATA_INTERNAL_USER_ID", referencedColumnName = "AIRAVATA_INTERNAL_USER_ID")
+ public UserProfileEntity getUserProfile() {
+ return userProfile;
+ }
+
+ public void setUserProfile(UserProfileEntity userProfile) {
+ this.userProfile = userProfile;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
index 81bf18e,0000000..06b678e
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/entities/UserProfileEntity.java
@@@ -1,247 -1,0 +1,247 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.entities;
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+@Table(name="USER_PROFILE")
+public class UserProfileEntity {
+ private String airavataInternalUserId;
+ private String userId;
+ private String gatewayId;
+ private String userModelVersion;
+ private String userName;
+ private String orcidId;
+ private String country;
+ private String homeOrganization;
+ private String orginationAffiliation;
+ private long creationTime;
+ private long lastAccessTime;
+ private long validUntil;
+ private String state;
+ private String comments;
+ private List<String> labeledURI;
+ private String gpgKey;
+ private String timeZone;
+
+ private List<String> nationality;
+ private List<String> emails;
+ private List<String> phones;
+ private NSFDemographicsEntity nsfDemographics;
+
+ @Id
+ @Column(name = "AIRAVATA_INTERNAL_USER_ID")
+ public String getAiravataInternalUserId() {
+ return airavataInternalUserId;
+ }
+
+ public void setAiravataInternalUserId(String id) {
+ this.airavataInternalUserId = id;
+ }
+
+ @Column(name = "USER_ID")
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ @Column(name = "GATEWAY_ID")
+ public String getGatewayId() {
+ return gatewayId;
+ }
+
+ public void setGatewayId(String gatewayId) {
+ this.gatewayId = gatewayId;
+ }
+
+ @Column(name = "USER_MODEL_VERSION")
+ public String getUserModelVersion() {
+ return userModelVersion;
+ }
+
+ public void setUserModelVersion(String userModelVersion) {
+ this.userModelVersion = userModelVersion;
+ }
+
+ @ElementCollection(fetch = FetchType.EAGER)
+ @CollectionTable(name="USER_PROFILE_EMAIL", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getEmails() {
+ return emails;
+ }
+
+ public void setEmails(List<String> emails) {
+ this.emails = emails;
+ }
+
+ @Column(name = "USER_NAME")
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ @Column(name = "ORCID_ID")
+ public String getOrcidId() {
+ return orcidId;
+ }
+
+ public void setOrcidId(String orcidId) {
+ this.orcidId = orcidId;
+ }
+
+ @ElementCollection(fetch = FetchType.EAGER)
+ @CollectionTable(name="USER_PROFILE_PHONE", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getPhones() {
+ return phones;
+ }
+
+ public void setPhones(List<String> phones) {
+ this.phones = phones;
+ }
+
+ @Column(name = "COUNTRY")
+ public String getCountry() {
+ return country;
+ }
+
+ public void setCountry(String country) {
+ this.country = country;
+ }
+
+ @ElementCollection(fetch = FetchType.EAGER)
+ @CollectionTable(name="USER_PROFILE_NATIONALITY", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getNationality() {
+ return nationality;
+ }
+
+ public void setNationality(List<String> nationality) {
+ this.nationality = nationality;
+ }
+
+ @Column(name = "HOME_ORGANIZATION")
+ public String getHomeOrganization() {
+ return homeOrganization;
+ }
+
+ public void setHomeOrganization(String homeOrganization) {
+ this.homeOrganization = homeOrganization;
+ }
+
+ @Column(name = "ORIGINATION_AFFILIATION")
+ public String getOrginationAffiliation() {
+ return orginationAffiliation;
+ }
+
+ public void setOrginationAffiliation(String orginationAffiliation) {
+ this.orginationAffiliation = orginationAffiliation;
+ }
+
+ @Column(name="CREATION_TIME")
+ public long getCreationTime() {
+ return creationTime;
+ }
+
+ public void setCreationTime(long creationTime) {
+ this.creationTime = creationTime;
+ }
+
+ @Column(name = "LAST_ACCESS_TIME")
+ public long getLastAccessTime() {
+ return lastAccessTime;
+ }
+
+ public void setLastAccessTime(long lastAccessTime) {
+ this.lastAccessTime = lastAccessTime;
+ }
+
+ @Column(name = "VALID_UNTIL")
+ public long getValidUntil() {
+ return validUntil;
+ }
+
+ public void setValidUntil(long validUntil) {
+ this.validUntil = validUntil;
+ }
+
+ @Column(name = "STATE")
+ public String getState() {
+ return state;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ @Lob
+ @Column(name = "COMMENTS")
+ public String getComments() {
+ return comments;
+ }
+
+ public void setComments(String comments) {
+ this.comments = comments;
+ }
+
+ @ElementCollection(fetch = FetchType.EAGER)
+ @CollectionTable(name="USER_PROFILE_LABELED_URI", joinColumns = @JoinColumn(name="AIRAVATA_INTERNAL_USER_ID"))
+ public List<String> getLabeledURI() {
+ return labeledURI;
+ }
+
+ public void setLabeledURI(List<String> labeledURI) {
+ this.labeledURI = labeledURI;
+ }
+
+ @Lob
+ @Column(name = "GPG_KEY")
+ public String getGpgKey() {
+ return gpgKey;
+ }
+
+ public void setGpgKey(String gpgKey) {
+ this.gpgKey = gpgKey;
+ }
+
+ @Column(name = "TIME_ZONE")
+ public String getTimeZone() {
+ return timeZone;
+ }
+
+ public void setTimeZone(String timeZone) {
+ this.timeZone = timeZone;
+ }
+
+ @OneToOne(targetEntity = NSFDemographicsEntity.class, cascade = CascadeType.ALL, mappedBy = "userProfile", fetch = FetchType.EAGER)
+ public NSFDemographicsEntity getNsfDemographics() {
+ return nsfDemographics;
+ }
+
+ public void setNsfDemographics(NSFDemographicsEntity nsfDemographics) {
+ this.nsfDemographics = nsfDemographics;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/AbstractRepository.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/AbstractRepository.java
index f61aa3b,0000000..f128086
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/AbstractRepository.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/AbstractRepository.java
@@@ -1,98 -1,0 +1,98 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.repositories;
+
+import org.apache.airavata.user.registry.core.utils.JPAUtils;
+import org.apache.airavata.user.registry.core.utils.ObjectMapperSingleton;
+import org.dozer.Mapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.Query;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+public abstract class AbstractRepository<T, E, Id> {
+ private final static Logger logger = LoggerFactory.getLogger(AbstractRepository.class);
+
+ private Class<T> thriftGenericClass;
+ private Class<E> dbEntityGenericClass;
+
+ public AbstractRepository(Class<T> thriftGenericClass, Class<E> dbEntityGenericClass) {
+ this.thriftGenericClass = thriftGenericClass;
+ this.dbEntityGenericClass = dbEntityGenericClass;
+ }
+
+ public T create(T t) {
+ return update(t);
+ }
+
+ public T update(T t) {
+ Mapper mapper = ObjectMapperSingleton.getInstance();
+ E entity = mapper.map(t, dbEntityGenericClass);
+ E persistedCopy = JPAUtils.execute(entityManager -> entityManager.merge(entity));
+ return mapper.map(persistedCopy, thriftGenericClass);
+ }
+
+ public boolean delete(Id id) {
+ JPAUtils.execute(entityManager -> {
+ E entity = entityManager.find(dbEntityGenericClass, id);
+ entityManager.remove(entity);
+ return entity;
+ });
+ return true;
+ }
+
+ public T get(Id id) {
+ E entity = JPAUtils.execute(entityManager -> entityManager
+ .find(dbEntityGenericClass, id));
+ Mapper mapper = ObjectMapperSingleton.getInstance();
+ return mapper.map(entity, thriftGenericClass);
+ }
+
+ public List<T> select(String query, int limit, int offset) {
+ List resultSet = (List) JPAUtils.execute(entityManager -> entityManager.createQuery(query).setFirstResult(offset)
+ .setMaxResults(offset).getResultList());
+ Mapper mapper = ObjectMapperSingleton.getInstance();
+ List<T> gatewayList = new ArrayList<>();
+ resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass)));
+ return gatewayList;
+ }
+
+ public List<T> select(String query, int limit, int offset, Map<String, Object> queryParams) {
+ List resultSet = (List) JPAUtils.execute(entityManager -> {
+ Query jpaQuery = entityManager.createQuery(query);
+
+ for (Map.Entry<String, Object> entry : queryParams.entrySet()) {
+
+ jpaQuery.setParameter(entry.getKey(), entry.getValue());
+ }
+
+ return jpaQuery.setFirstResult(offset).setMaxResults(limit).getResultList();
+
+ });
+ Mapper mapper = ObjectMapperSingleton.getInstance();
+ List<T> gatewayList = new ArrayList<>();
+ resultSet.stream().forEach(rs -> gatewayList.add(mapper.map(rs, thriftGenericClass)));
+ return gatewayList;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/UserProfileRepository.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/UserProfileRepository.java
index eee5963,0000000..ebf99e1
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/UserProfileRepository.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/repositories/UserProfileRepository.java
@@@ -1,87 -1,0 +1,87 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.repositories;
+
+import org.apache.airavata.model.user.UserProfile;
+import org.apache.airavata.user.registry.core.entities.UserProfileEntity;
+import org.apache.airavata.user.registry.core.utils.QueryConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class UserProfileRepository extends AbstractRepository<UserProfile, UserProfileEntity, String> {
+ private final static Logger logger = LoggerFactory.getLogger(UserProfileRepository.class);
+
+ public UserProfileRepository(Class<UserProfile> thriftGenericClass, Class<UserProfileEntity> dbEntityGenericClass) {
+ super(thriftGenericClass, dbEntityGenericClass);
+ }
+
+ @Override
+ public List<UserProfile> select(String query, int offset, int limit) {
+ throw new UnsupportedOperationException("Due to performance overheads this method is not supported. Instead use" +
+ " UserProfileSummaryRepository");
+ }
+
+ public UserProfile getUserProfileByIdAndGateWay(String userId, String gatewayId) {
+
+ UserProfile userProfile = null;
+
+ Map<String, Object> queryParam = new HashMap<String, Object>();
+ queryParam.put(UserProfile._Fields.USER_ID.getFieldName(), userId);
+ queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
+ List<UserProfile> resultList = select(QueryConstants.FIND_USER_PROFILE_BY_USER_ID, 1, 0, queryParam);
+
+ if (resultList != null && resultList.size() > 0)
+ userProfile = resultList.get(0);
+
+
+ return userProfile;
+ }
+
+ public List<UserProfile> getAllUserProfilesInGateway(String gatewayId, int offset, int limit) {
+
+ Map<String, Object> queryParam = new HashMap<String, Object>();
+ queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
+
+ List<UserProfile> resultList = select(QueryConstants.FIND_ALL_USER_PROFILES_BY_GATEWAY_ID, limit, offset, queryParam);
+
+ return resultList;
+ }
+
+ public UserProfile getUserProfileByNameAndGateWay(String name, String gatewayId) {
+
+ UserProfile userProfile = null;
+
+ Map<String, Object> queryParam = new HashMap<String, Object>();
+ queryParam.put(UserProfile._Fields.USER_NAME.getFieldName(), name);
+ queryParam.put(UserProfile._Fields.GATEWAY_ID.getFieldName(), gatewayId);
+ List<UserProfile> resultList = select(QueryConstants.FIND_USER_PROFILE_BY_USER_NAME, 0, 1, queryParam);
+
+ if (resultList != null && resultList.size() > 0)
+ userProfile = resultList.get(0);
+
+
+ return userProfile;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Committer.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Committer.java
index fe96ca9,0000000..6c4549d
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Committer.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Committer.java
@@@ -1,27 -1,0 +1,27 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.utils;
+
+@FunctionalInterface
+public interface Committer<T, R> {
+
+ R commit(T t);
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/JPAUtils.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/JPAUtils.java
index 2961524,0000000..b8024fa
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/JPAUtils.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/JPAUtils.java
@@@ -1,83 -1,0 +1,83 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.utils;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.persistence.*;
+import java.util.HashMap;
+import java.util.Map;
+
+public class JPAUtils {
+ private final static Logger logger = LoggerFactory.getLogger(JPAUtils.class);
+ private static final String PERSISTENCE_UNIT_NAME = "user_profile_catalog";
+ @PersistenceUnit(unitName = "user_profile_catalog")
+ protected static EntityManagerFactory factory;
+ @PersistenceContext(unitName = "user_profile_catalog")
+ private static EntityManager entityManager;
+
+ public static EntityManager getEntityManager(){
+
+ if (factory == null) {
+ //FIXME
+ String connectionProperties = "DriverClassName=" + Utils.getJDBCDriver() + "," + "Url=" +
+ Utils.getJDBCURL() + "?autoReconnect=true," +
+ "Username=" + Utils.getJDBCUser() + "," + "Password=" + Utils.getJDBCPassword() +
+ ",validationQuery=" + Utils.getValidationQuery();
+ logger.info(connectionProperties);
+ Map<String, String> properties = new HashMap<String, String>();
+ properties.put("openjpa.ConnectionDriverName", "org.apache.commons.dbcp.BasicDataSource");
+ properties.put("openjpa.ConnectionProperties", connectionProperties);
+ properties.put("openjpa.DynamicEnhancementAgent", "true");
+ properties.put("openjpa.RuntimeUnenhancedClasses", "warn");
+ properties.put("openjpa.RemoteCommitProvider", "sjvm");
+ properties.put("openjpa.Log", "DefaultLevel=INFO, Runtime=INFO, Tool=INFO, SQL=INFO");
+ properties.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=true)");
+ properties.put("openjpa.jdbc.QuerySQLCache", "false");
+ properties.put("openjpa.ConnectionFactoryProperties", "PrettyPrint=true, PrettyPrintLineLength=72," +
+ " PrintParameters=true, MaxActive=10, MaxIdle=5, MinIdle=2, MaxWait=31536000, autoReconnect=true");
+ factory = Persistence.createEntityManagerFactory(PERSISTENCE_UNIT_NAME, properties);
+ }
+
+ entityManager = factory.createEntityManager();
+ return entityManager;
+ }
+
+ public static <R> R execute(Committer<EntityManager, R> committer){
+ EntityManager entityManager = JPAUtils.getEntityManager();
+ try {
+ entityManager.getTransaction().begin();
+ R r = committer.commit(entityManager);
+ entityManager.getTransaction().commit();
+ return r;
+ }finally {
+ if (entityManager != null && entityManager.isOpen()) {
+ if (entityManager.getTransaction().isActive()) {
+ entityManager.getTransaction().rollback();
+ }
+ entityManager.close();
+ }
+ }
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/ObjectMapperSingleton.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/ObjectMapperSingleton.java
index e7324eb,0000000..f4d4d24
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/ObjectMapperSingleton.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/ObjectMapperSingleton.java
@@@ -1,39 -1,0 +1,39 @@@
- /*
++/**
+ *
+ * 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.
+ *
+*/
+package org.apache.airavata.user.registry.core.utils;
+
+import org.dozer.DozerBeanMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ObjectMapperSingleton extends DozerBeanMapper{
+ private final static Logger logger = LoggerFactory.getLogger(ObjectMapperSingleton.class);
+
+ private static ObjectMapperSingleton instance;
+
+ private ObjectMapperSingleton(){}
+
+ public static ObjectMapperSingleton getInstance(){
+ if(instance == null)
+ instance = new ObjectMapperSingleton();
+ return instance;
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/QueryConstants.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/QueryConstants.java
index 773dc3f,0000000..73e3f78
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/QueryConstants.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/QueryConstants.java
@@@ -1,22 -1,0 +1,41 @@@
++/**
++ *
++ * 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.
++ */
+package org.apache.airavata.user.registry.core.utils;
+
+import org.apache.airavata.model.user.UserProfile;
+
+/**
+ * Created by abhij on 11/11/2016.
+ */
+public interface QueryConstants {
+
+
+
+ String FIND_USER_PROFILE_BY_USER_ID = "SELECT u FROM UserProfileEntity u " +
+ "where u.userId LIKE :" + UserProfile._Fields.USER_ID.getFieldName() + " " +
+ "AND u.gatewayId LIKE :"+ UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
+
+ String FIND_ALL_USER_PROFILES_BY_GATEWAY_ID = "SELECT u FROM UserProfileEntity u " +
+ "where u.gatewayId LIKE :"+ UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
+
+ String FIND_USER_PROFILE_BY_USER_NAME = "SELECT u FROM UserProfileEntity u " +
+ "where u.userId LIKE :" + UserProfile._Fields.USER_NAME.getFieldName() + " " +
+ "AND u.gatewayId LIKE :"+ UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Utils.java
----------------------------------------------------------------------
diff --cc modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Utils.java
index b349c8d,0000000..a534221
mode 100644,000000..100644
--- a/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Utils.java
+++ b/modules/user-profile/user-profile-core/src/main/java/org/apache/airavata/user/registry/core/utils/Utils.java
@@@ -1,155 -1,0 +1,154 @@@
- /*
++/**
+ *
+ * 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.
- *
+ */
+package org.apache.airavata.user.registry.core.utils;
+
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.ServerSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.URI;
+
+
+public class Utils {
+ private final static Logger logger = LoggerFactory.getLogger(Utils.class);
+
+ public static String getJDBCFullURL(){
+ String jdbcUrl = getJDBCURL();
+ String jdbcUser = getJDBCUser();
+ String jdbcPassword = getJDBCPassword();
+ jdbcUrl = jdbcUrl + "?" + "user=" + jdbcUser + "&" + "password=" + jdbcPassword;
+ return jdbcUrl;
+ }
+
+ public static String getJDBCURL(){
+ try {
+ return ServerSettings.getSetting(JPAConstants.KEY_JDBC_URL);
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ public static String getHost(){
+ try{
+ String jdbcURL = getJDBCURL();
+ String cleanURI = jdbcURL.substring(5);
+ URI uri = URI.create(cleanURI);
+ return uri.getHost();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ public static int getPort(){
+ try{
+ String jdbcURL = getJDBCURL();
+ String cleanURI = jdbcURL.substring(5);
+ URI uri = URI.create(cleanURI);
+ return uri.getPort();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return -1;
+ }
+ }
+
+ public static int getJPACacheSize (){
+ try {
+ String cache = ServerSettings.getSetting(JPAConstants.JPA_CACHE_SIZE, "5000");
+ return Integer.parseInt(cache);
+ }catch (Exception e){
+ logger.error(e.getMessage(), e);
+ return -1;
+ }
+ }
+
+ public static String isCachingEnabled (){
+ try {
+ return ServerSettings.getSetting(JPAConstants.ENABLE_CACHING, "true");
+ }catch (Exception e){
+ logger.error(e.getMessage(), e);
+ return "true";
+ }
+ }
+
+ public static String getDBType(){
+ try{
+ String jdbcURL = getJDBCURL();
+ String cleanURI = jdbcURL.substring(5);
+ URI uri = URI.create(cleanURI);
+ return uri.getScheme();
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ public static boolean isDerbyStartEnabled(){
+ try {
+ String s = ServerSettings.getSetting(JPAConstants.KEY_DERBY_START_ENABLE);
+ if("true".equals(s)){
+ return true;
+ }
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ return false;
+ }
+ return false;
+ }
+
+ public static String getJDBCUser(){
+ try {
+ return ServerSettings.getSetting(JPAConstants.KEY_JDBC_USER);
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ public static String getValidationQuery(){
+ try {
+ return ServerSettings.getSetting(JPAConstants.VALIDATION_QUERY);
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+
+ public static String getJDBCPassword(){
+ try {
+ return ServerSettings.getSetting(JPAConstants.KEY_JDBC_PASSWORD);
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+
+ }
+
+ public static String getJDBCDriver(){
+ try {
+ return ServerSettings.getSetting(JPAConstants.KEY_JDBC_DRIVER);
+ } catch (ApplicationSettingsException e) {
+ logger.error(e.getMessage(), e);
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-service/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-service/src/main/java/org/apache/airavata/user/profile/server/UserProfileServiceHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/modules/user-profile/user-profile-stubs/src/main/java/org/apache/airavata/userprofile/cpi/client/UserProfileServiceClientFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/thrift-interface-descriptions/component-cpis/generate-cpi-stubs.sh
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7a779933/thrift-interface-descriptions/generate-thrift-stubs.sh
----------------------------------------------------------------------
[50/50] [abbrv] airavata git commit: Merge branch 'master' into
develop
Posted by ma...@apache.org.
Merge branch 'master' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7a779933
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7a779933
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7a779933
Branch: refs/heads/develop
Commit: 7a779933e7e6b89d722f11ef5c80026210e63dd1
Parents: b37882a 10d7c02
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Apr 28 11:20:49 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Apr 28 11:20:49 2017 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 31 +++--
.../airavata/api/server/AiravataAPIServer.java | 4 +-
.../api/server/AiravataDerbyServer.java | 4 +-
.../server/handler/AiravataServerHandler.java | 4 +-
.../AiravataExperimentStatusUpdator.java | 6 +-
.../listener/ExperimentStatusChangedEvent.java | 19 +++
.../security/AiravataSecurityManager.java | 3 +-
.../DefaultAiravataSecurityManager.java | 3 +-
.../api/server/security/IdentityContext.java | 4 +-
.../airavata/api/server/security/Main.java | 5 +-
.../server/security/SecurityManagerFactory.java | 3 +-
.../server/security/authzcache/AuthzCache.java | 3 +-
.../security/authzcache/AuthzCacheEntry.java | 3 +-
.../security/authzcache/AuthzCacheIndex.java | 3 +-
.../security/authzcache/AuthzCacheManager.java | 3 +-
.../authzcache/AuthzCacheManagerFactory.java | 3 +-
.../security/authzcache/AuthzCachedStatus.java | 3 +-
.../authzcache/DefaultAuthzCacheManager.java | 3 +-
.../security/interceptor/SecurityCheck.java | 3 +-
.../interceptor/SecurityInterceptor.java | 3 +-
.../security/interceptor/SecurityModule.java | 3 +-
.../security/oauth/DefaultOAuthClient.java | 3 +-
.../server/security/xacml/DefaultPAPClient.java | 3 +-
.../server/security/xacml/DefaultXACMLPEP.java | 3 +-
.../airavata/api/server/util/Constants.java | 4 +-
.../api/server/util/ThriftClientPool.java | 5 +-
airavata-api/airavata-api-stubs/pom.xml | 31 +++--
.../java/org/apache/airavata/api/Airavata.java | 28 ++--
.../airavata/api/airavata_apiConstants.java | 28 ++--
.../api/client/AiravataClientFactory.java | 4 +-
.../airavata-cpp-sdk/pom.xml | 27 +++-
.../src/main/assembly/bin-assembly.xml | 29 ++--
.../airavata-php-sdk/pom.xml | 27 +++-
.../src/main/assembly/bin-assembly.xml | 29 ++--
.../airavata-python-sdk/pom.xml | 27 +++-
.../src/main/assembly/bin-assembly.xml | 29 ++--
.../java-client-samples/pom.xml | 26 +++-
.../client/samples/CancelExperiments.java | 4 +-
.../client/samples/CreateLaunchBES.java | 3 +-
.../client/samples/CreateLaunchExperiment.java | 4 +-
.../samples/CreateLaunchExperimentUS3.java | 2 +-
.../client/samples/ReplicaCatalogSample.java | 5 +-
.../client/samples/SampleEchoExperiment.java | 4 +-
.../client/OAuthAppRegisteringClient.java | 3 +-
.../client/OAuthTokenRetrievalClient.java | 3 +-
.../client/secure/client/Properties.java | 3 +-
.../client/secure/client/SecureClient.java | 3 +-
.../tools/RegisterOGCEUS3Application.java | 6 +-
.../tools/RegisterSampleApplications.java | 5 +-
.../tools/RegisterSampleApplicationsUtils.java | 19 +++
.../client/tools/RegisterUS3Application.java | 6 +-
airavata-api/airavata-client-sdks/pom.xml | 26 +++-
airavata-api/airavata-data-models/pom.xml | 31 +++--
.../apache/airavata/model/ComponentState.java | 28 ++--
.../apache/airavata/model/ComponentStatus.java | 28 ++--
.../org/apache/airavata/model/EdgeModel.java | 28 ++--
.../org/apache/airavata/model/NodeModel.java | 28 ++--
.../org/apache/airavata/model/PortModel.java | 28 ++--
.../apache/airavata/model/WorkflowModel.java | 28 ++--
.../apache/airavata/model/WorkflowState.java | 28 ++--
.../apache/airavata/model/WorkflowStatus.java | 28 ++--
.../ApplicationDeploymentDescription.java | 28 ++--
.../appdeployment/ApplicationModule.java | 28 ++--
.../appcatalog/appdeployment/CommandObject.java | 28 ++--
.../appcatalog/appdeployment/SetEnvPaths.java | 28 ++--
.../application_deployment_modelConstants.java | 28 ++--
.../ApplicationInterfaceDescription.java | 28 ++--
.../application_interface_modelConstants.java | 28 ++--
.../appcatalog/computeresource/BatchQueue.java | 28 ++--
.../computeresource/CloudJobSubmission.java | 28 ++--
.../ComputeResourceDescription.java | 28 ++--
.../appcatalog/computeresource/DMType.java | 28 ++--
.../appcatalog/computeresource/FileSystems.java | 28 ++--
.../computeresource/GlobusJobSubmission.java | 28 ++--
.../computeresource/JobManagerCommand.java | 28 ++--
.../computeresource/JobSubmissionInterface.java | 28 ++--
.../computeresource/JobSubmissionProtocol.java | 28 ++--
.../computeresource/LOCALSubmission.java | 28 ++--
.../appcatalog/computeresource/MonitorMode.java | 28 ++--
.../computeresource/ProviderName.java | 28 ++--
.../computeresource/ResourceJobManager.java | 28 ++--
.../computeresource/ResourceJobManagerType.java | 28 ++--
.../computeresource/SSHJobSubmission.java | 28 ++--
.../computeresource/UnicoreJobSubmission.java | 28 ++--
.../compute_resource_modelConstants.java | 28 ++--
.../ComputeResourcePreference.java | 28 ++--
.../gatewayprofile/DataStoragePreference.java | 28 ++--
.../gatewayprofile/GatewayResourceProfile.java | 28 ++--
.../gatewayprofile/StoragePreference.java | 28 ++--
.../StorageResourceDescription.java | 28 ++--
.../UserComputeResourcePreference.java | 28 ++--
.../UserResourceProfile.java | 28 ++--
.../UserStoragePreference.java | 28 ++--
.../airavata/model/application/io/DataType.java | 28 ++--
.../application/io/InputDataObjectType.java | 28 ++--
.../application/io/OutputDataObjectType.java | 28 ++--
.../airavata/model/commons/ErrorModel.java | 28 ++--
.../model/commons/ValidationResults.java | 28 ++--
.../airavata/model/commons/ValidatorResult.java | 28 ++--
.../commons/airavata_commonsConstants.java | 28 ++--
.../credential/store/CertificateCredential.java | 28 ++--
.../model/credential/store/CommunityUser.java | 28 ++--
.../credential/store/CredentialOwnerType.java | 28 ++--
.../credential/store/CredentialSummary.java | 28 ++--
.../credential/store/PasswordCredential.java | 28 ++--
.../model/credential/store/SSHCredential.java | 28 ++--
.../credential/store/SSHCredentialSummary.java | 28 ++--
.../model/credential/store/SummaryType.java | 28 ++--
.../credential_store_data_modelsConstants.java | 28 ++--
.../airavata/model/data/movement/DMType.java | 28 ++--
.../data/movement/DataMovementInterface.java | 28 ++--
.../data/movement/DataMovementProtocol.java | 28 ++--
.../data/movement/GridFTPDataMovement.java | 28 ++--
.../model/data/movement/LOCALDataMovement.java | 28 ++--
.../model/data/movement/SCPDataMovement.java | 28 ++--
.../model/data/movement/SecurityProtocol.java | 28 ++--
.../data/movement/UnicoreDataMovement.java | 28 ++--
.../model/data/replica/DataProductModel.java | 28 ++--
.../model/data/replica/DataProductType.java | 28 ++--
.../data/replica/DataReplicaLocationModel.java | 28 ++--
.../data/replica/ReplicaLocationCategory.java | 28 ++--
.../data/replica/ReplicaPersistentType.java | 28 ++--
.../model/error/AiravataClientException.java | 28 ++--
.../airavata/model/error/AiravataErrorType.java | 28 ++--
.../model/error/AiravataSystemException.java | 28 ++--
.../model/error/AuthenticationException.java | 28 ++--
.../model/error/AuthorizationException.java | 28 ++--
.../error/ExperimentNotFoundException.java | 28 ++--
.../model/error/InvalidRequestException.java | 28 ++--
.../model/error/LaunchValidationException.java | 28 ++--
.../model/error/ProjectNotFoundException.java | 28 ++--
.../airavata/model/error/TimedOutException.java | 28 ++--
.../airavata/model/error/ValidationResults.java | 28 ++--
.../airavata/model/error/ValidatorResult.java | 28 ++--
.../model/experiment/ExperimentModel.java | 28 ++--
.../experiment/ExperimentSearchFields.java | 28 ++--
.../model/experiment/ExperimentStatistics.java | 28 ++--
.../experiment/ExperimentSummaryModel.java | 28 ++--
.../model/experiment/ExperimentType.java | 28 ++--
.../model/experiment/ProjectSearchFields.java | 28 ++--
.../experiment/UserConfigurationDataModel.java | 28 ++--
.../apache/airavata/model/group/GroupModel.java | 28 ++--
.../model/group/ResourcePermissionType.java | 28 ++--
.../airavata/model/group/ResourceType.java | 28 ++--
.../org/apache/airavata/model/job/JobModel.java | 28 ++--
.../event/ExperimentStatusChangeEvent.java | 28 ++--
.../messaging/event/ExperimentSubmitEvent.java | 28 ++--
.../model/messaging/event/JobIdentifier.java | 28 ++--
.../messaging/event/JobStatusChangeEvent.java | 28 ++--
.../event/JobStatusChangeRequestEvent.java | 28 ++--
.../airavata/model/messaging/event/Message.java | 28 ++--
.../model/messaging/event/MessageLevel.java | 28 ++--
.../model/messaging/event/MessageType.java | 28 ++--
.../messaging/event/ProcessIdentifier.java | 28 ++--
.../event/ProcessStatusChangeEvent.java | 28 ++--
.../event/ProcessStatusChangeRequestEvent.java | 28 ++--
.../messaging/event/ProcessSubmitEvent.java | 28 ++--
.../messaging/event/ProcessTerminateEvent.java | 28 ++--
.../model/messaging/event/TaskIdentifier.java | 28 ++--
.../messaging/event/TaskOutputChangeEvent.java | 28 ++--
.../messaging/event/TaskStatusChangeEvent.java | 28 ++--
.../event/TaskStatusChangeRequestEvent.java | 28 ++--
.../model/messaging/event/TaskSubmitEvent.java | 28 ++--
.../messaging/event/TaskTerminateEvent.java | 28 ++--
.../event/messaging_eventsConstants.java | 28 ++--
.../parallelism/ApplicationParallelismType.java | 28 ++--
.../airavata/model/process/ProcessModel.java | 28 ++--
.../ComputationalResourceSchedulingModel.java | 28 ++--
.../airavata/model/security/AuthzToken.java | 28 ++--
.../airavata/model/status/ExperimentState.java | 28 ++--
.../airavata/model/status/ExperimentStatus.java | 28 ++--
.../apache/airavata/model/status/JobState.java | 28 ++--
.../apache/airavata/model/status/JobStatus.java | 28 ++--
.../airavata/model/status/ProcessState.java | 28 ++--
.../airavata/model/status/ProcessStatus.java | 28 ++--
.../airavata/model/status/QueueStatusModel.java | 28 ++--
.../apache/airavata/model/status/TaskState.java | 28 ++--
.../airavata/model/status/TaskStatus.java | 28 ++--
.../airavata/model/task/DataStageType.java | 28 ++--
.../model/task/DataStagingTaskModel.java | 28 ++--
.../model/task/EnvironmentSetupTaskModel.java | 28 ++--
.../model/task/JobSubmissionTaskModel.java | 28 ++--
.../airavata/model/task/MonitorTaskModel.java | 28 ++--
.../apache/airavata/model/task/TaskModel.java | 28 ++--
.../apache/airavata/model/task/TaskTypes.java | 28 ++--
.../airavata/model/user/NSFDemographics.java | 28 ++--
.../org/apache/airavata/model/user/Status.java | 28 ++--
.../airavata/model/user/USCitizenship.java | 28 ++--
.../apache/airavata/model/user/UserProfile.java | 28 ++--
.../apache/airavata/model/user/disability.java | 28 ++--
.../apache/airavata/model/user/ethnicity.java | 28 ++--
.../org/apache/airavata/model/user/race.java | 28 ++--
.../model/user/user_profile_modelConstants.java | 28 ++--
.../model/workflow_data_modelConstants.java | 28 ++--
.../airavata/model/workspace/Gateway.java | 28 ++--
.../model/workspace/GatewayApprovalStatus.java | 28 ++--
.../apache/airavata/model/workspace/Group.java | 28 ++--
.../airavata/model/workspace/Notification.java | 28 ++--
.../model/workspace/NotificationPriority.java | 28 ++--
.../airavata/model/workspace/Project.java | 28 ++--
.../apache/airavata/model/workspace/User.java | 28 ++--
airavata-api/airavata-model-utils/pom.xml | 31 +++--
.../airavata/model/util/AppDeploymentUtil.java | 4 +-
.../airavata/model/util/AppInterfaceUtil.java | 4 +-
.../model/util/ComputeResourceUtil.java | 4 +-
.../airavata/model/util/ExecutionType.java | 4 +-
.../model/util/ExperimentModelUtil.java | 4 +-
.../airavata/model/util/ProjectModelUtil.java | 2 +-
airavata-api/pom.xml | 26 +++-
.../commons/tenant/entities/GatewayEntity.java | 2 +-
.../commons/utils/ObjectMapperSingleton.java | 2 +-
.../UserProfileRegistryException.java | 2 +-
.../security/interceptor/SecurityModule.java | 2 +-
dev-tools/ansible/airavata.yml | 20 +++
dev-tools/ansible/ansible.cfg | 2 +-
dev-tools/ansible/dev_airavata_deploy.yml | 20 +++
dev-tools/ansible/dev_pga_deploy.yml | 20 +++
.../inventories/develop/group_vars/all.yml | 20 +++
.../develop/group_vars/dev-airavata.yml | 20 +++
.../inventories/develop/group_vars/dev-pga.yml | 20 +++
.../geogateway-dev/group_vars/pga/vars.yml | 22 ++-
.../scigap/production/files/airavata.jks | 76 ++++++++++
.../scigap/production/files/airavata_sym.jks | 30 ++++
.../production/files/client_truststore.jks | 126 +++++++++++++++++
.../scigap/production/group_vars/all/vars.yml | 123 +++++++++++++++++
.../scigap/production/group_vars/all/vault.yml | 20 +++
.../ansible/inventories/scigap/production/hosts | 20 +++
.../production/pga_config/brandeis/vars.yml | 51 +++++++
.../production/pga_config/brandeis/vault.yml | 18 +++
.../production/pga_config/cinetvtech/vars.yml | 55 ++++++++
.../production/pga_config/cinetvtech/vault.yml | 18 +++
.../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 +++++
.../pga_config/cornell-dnasequence/vars.yml | 63 +++++++++
.../pga_config/cornell-dnasequence/vault.yml | 18 +++
.../production/pga_config/georgiastate/vars.yml | 55 ++++++++
.../pga_config/georgiastate/vault.yml | 18 +++
.../production/pga_config/iugateway/vars.yml | 55 ++++++++
.../production/pga_config/iugateway/vault.yml | 18 +++
.../scigap/production/pga_config/lsu/vars.yml | 51 +++++++
.../scigap/production/pga_config/lsu/vault.yml | 18 +++
.../scigap/production/pga_config/nsg/vars.yml | 56 ++++++++
.../scigap/production/pga_config/nsg/vault.yml | 18 +++
.../production/pga_config/oiitandy/vars.yml | 55 ++++++++
.../production/pga_config/oiitandy/vault.yml | 18 +++
.../scigap/production/pga_config/oscer/vars.yml | 55 ++++++++
.../production/pga_config/oscer/vault.yml | 18 +++
.../production/pga_config/phasta/vars.yml | 55 ++++++++
.../production/pga_config/phasta/vault.yml | 18 +++
.../production/pga_config/scigap/vars.yml | 56 ++++++++
.../production/pga_config/scigap/vault.yml | 18 +++
.../production/pga_config/seagrid/vars.yml | 56 ++++++++
.../production/pga_config/seagrid/vault.yml | 18 +++
.../production/pga_config/simvascular/vars.yml | 55 ++++++++
.../production/pga_config/simvascular/vault.yml | 18 +++
.../production/pga_config/southdakota/vars.yml | 55 ++++++++
.../production/pga_config/southdakota/vault.yml | 18 +++
.../pga_config/southernillinois/vars.yml | 55 ++++++++
.../pga_config/southernillinois/vault.yml | 18 +++
.../production/pga_config/testdrive/vars.yml | 56 ++++++++
.../production/pga_config/testdrive/vault.yml | 18 +++
.../production/pga_config/ultrascan/vars.yml | 64 +++++++++
.../production/pga_config/ultrascan/vault.yml | 18 +++
.../scigap/production/pga_config/utah/vars.yml | 55 ++++++++
.../scigap/production/pga_config/utah/vault.yml | 18 +++
.../testing-0.17-scigap/group_vars/all/vars.yml | 20 +++
.../testing-0.17-scigap/group_vars/pga/vars.yml | 22 ++-
.../group_vars/all/vars.yml | 20 +++
.../group_vars/pga/vars.yml | 25 +++-
.../testing-0.17/group_vars/all/vars.yml | 20 +++
.../testing-0.17/group_vars/pga/vars.yml | 22 ++-
dev-tools/ansible/local_airavata_deploy.yml | 20 +++
dev-tools/ansible/pga-scigap-prod.yml | 41 ++++++
dev-tools/ansible/pga-single-vhost.yml | 37 +++++
dev-tools/ansible/pga.yml | 20 +++
.../ansible/roles/airavata_build/tasks/main.yml | 20 +++
.../roles/airavata_deploy/defaults/main.yml | 20 +++
.../roles/airavata_deploy/handlers/main.yml | 20 +++
.../roles/airavata_deploy/tasks/main.yml | 20 +++
.../ansible/roles/api-orch/defaults/main.yml | 22 +++
.../ansible/roles/api-orch/handlers/main.yml | 20 +++
dev-tools/ansible/roles/api-orch/tasks/main.yml | 42 +++++-
.../api-orch/templates/gfac-config.yaml.j2 | 6 +
.../roles/api-orch/templates/logback.xml.j2 | 55 ++++++++
.../ansible/roles/common/defaults/main.yml | 20 +++
dev-tools/ansible/roles/common/tasks/main.yml | 20 +++
dev-tools/ansible/roles/common/vars/main.yml | 20 +++
.../ansible/roles/database/defaults/main.yml | 21 +++
.../ansible/roles/database/files/mysql-tmp.te | 9 ++
.../ansible/roles/database/handlers/main.yml | 20 +++
dev-tools/ansible/roles/database/tasks/main.yml | 70 +++++++++-
.../roles/database/tasks/secure_install.yml | 20 +++
dev-tools/ansible/roles/database/vars/main.yml | 21 ++-
.../ansible/roles/env_setup/tasks/main.yml | 20 +++
.../ansible/roles/env_setup/tasks/redhat.yml | 20 +++
dev-tools/ansible/roles/gfac/defaults/main.yml | 21 +++
dev-tools/ansible/roles/gfac/handlers/main.yml | 20 +++
dev-tools/ansible/roles/gfac/tasks/main.yml | 34 ++++-
.../roles/gfac/templates/gfac-config.yaml.j2 | 7 +
.../ansible/roles/gfac/templates/logback.xml.j2 | 55 ++++++++
dev-tools/ansible/roles/java/tasks/main.yml | 20 +++
dev-tools/ansible/roles/java/vars/main.yml | 20 +++
dev-tools/ansible/roles/pga/defaults/main.yml | 37 ++++-
dev-tools/ansible/roles/pga/files/default.conf | 5 +
dev-tools/ansible/roles/pga/handlers/main.yml | 24 +++-
.../roles/pga/tasks/install_deps_CentOS_7.yml | 20 +++
.../roles/pga/tasks/install_deps_Ubuntu_14.yml | 20 +++
.../roles/pga/tasks/install_deps_Ubuntu_16.yml | 20 +++
dev-tools/ansible/roles/pga/tasks/main.yml | 137 +++++++++++++++----
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 29 ++++
.../roles/pga/templates/pga-vhost.conf.j2 | 3 +
.../roles/pga/templates/pga_config.php.j2 | 16 +--
.../ansible/roles/pga_deploy/handlers/main.yml | 20 +++
.../ansible/roles/pga_deploy/tasks/main.yml | 20 +++
.../ansible/roles/rabbitmq/handlers/main.yml | 20 +++
dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 20 +++
dev-tools/ansible/roles/rabbitmq/vars/main.yml | 20 +++
dev-tools/ansible/roles/registry/tasks/main.yml | 20 +++
dev-tools/ansible/roles/wso2_is/tasks/main.yml | 20 +++
dev-tools/ansible/roles/wso2_is/vars/main.yml | 20 +++
.../ansible/roles/zookeeper/handlers/main.yml | 20 +++
.../ansible/roles/zookeeper/tasks/main.yml | 20 +++
dev-tools/ansible/roles/zookeeper/vars/main.yml | 20 +++
dev-tools/ansible/site.yml | 20 +++
modules/cloud/cloud-provisioning/pom.xml | 5 -
modules/cluster-monitoring/pom.xml | 25 +++-
.../monitoring/ClusterStatusMonitorJob.java | 5 +-
.../ClusterStatusMonitorJobScheduler.java | 5 +-
modules/commons/pom.xml | 30 ++--
.../airavata/common/utils/BuildConstant.java | 4 +-
.../airavata/common/context/RequestContext.java | 4 +-
.../common/context/WorkflowContext.java | 4 +-
.../AiravataConfigurationException.java | 4 +-
.../common/exception/AiravataException.java | 4 +-
.../exception/AiravataStartupException.java | 4 +-
.../exception/ApplicationSettingsException.java | 4 +-
.../airavata/common/logging/Exception.java | 3 +-
.../airavata/common/logging/LogEntry.java | 3 +-
.../airavata/common/logging/MDCConstants.java | 3 +-
.../apache/airavata/common/logging/MDCUtil.java | 19 +++
.../airavata/common/logging/ServerId.java | 3 +-
.../common/logging/kafka/KafkaAppender.java | 3 +-
.../airavata/common/utils/AiravataJobState.java | 5 +-
.../airavata/common/utils/AiravataUtils.java | 4 +-
.../airavata/common/utils/AiravataZKUtils.java | 5 +-
.../common/utils/ApplicationSettings.java | 4 +-
.../airavata/common/utils/AwsMetadata.java | 3 +-
.../airavata/common/utils/BrowserLauncher.java | 4 +-
.../airavata/common/utils/ClientSettings.java | 4 +-
.../apache/airavata/common/utils/Constants.java | 4 +-
.../apache/airavata/common/utils/DBUtil.java | 4 +-
.../common/utils/DatabaseTestCases.java | 4 +-
.../utils/DefaultKeyStorePasswordCallback.java | 4 +-
.../apache/airavata/common/utils/DerbyUtil.java | 4 +-
.../airavata/common/utils/ExecutionMode.java | 4 +-
.../apache/airavata/common/utils/IOUtil.java | 4 +-
.../apache/airavata/common/utils/IServer.java | 4 +-
.../apache/airavata/common/utils/JSONUtil.java | 4 +-
.../common/utils/KeyStorePasswordCallback.java | 19 +++
.../common/utils/LocalEventPublisher.java | 5 +-
.../airavata/common/utils/NameValidator.java | 4 +-
.../org/apache/airavata/common/utils/Pair.java | 4 +-
.../airavata/common/utils/SecurityUtil.java | 4 +-
.../airavata/common/utils/ServerSettings.java | 4 +-
.../airavata/common/utils/ServiceUtils.java | 19 +++
.../airavata/common/utils/StringUtil.java | 4 +-
.../apache/airavata/common/utils/SwingUtil.java | 4 +-
.../airavata/common/utils/ThriftUtils.java | 4 +-
.../apache/airavata/common/utils/Version.java | 4 +-
.../airavata/common/utils/WSConstants.java | 4 +-
.../apache/airavata/common/utils/WSDLUtil.java | 4 +-
.../airavata/common/utils/ZkConstants.java | 3 +-
.../listener/AbstractActivityListener.java | 4 +-
.../listener/AbstractStateChangeRequest.java | 4 +-
.../common/utils/listener/PublisherMessage.java | 4 +-
.../common/utils/ApplicationSettingsTest.java | 4 +-
.../airavata/common/utils/SecurityUtilTest.java | 4 +-
modules/configuration/client/pom.xml | 26 +++-
modules/configuration/pom.xml | 26 +++-
modules/configuration/server/pom.xml | 26 +++-
.../src/main/resources/LSF_Groovy.template | 3 +
.../src/main/resources/UGE_Groovy.template | 3 +-
.../server/src/main/resources/log4j.properties | 48 -------
.../server/src/main/resources/logback.xml | 70 ++++++----
.../credential-store-service/pom.xml | 33 +++--
.../credential/store/credential/AuditInfo.java | 4 +-
.../store/credential/CommunityUser.java | 4 +-
.../credential/store/credential/Credential.java | 4 +-
.../store/credential/CredentialOwnerType.java | 19 +++
.../impl/certificate/CertificateAuditInfo.java | 6 +-
.../impl/certificate/CertificateCredential.java | 4 +-
.../impl/password/PasswordCredential.java | 4 +-
.../credential/impl/ssh/SSHCredential.java | 4 +-
.../impl/ssh/SSHCredentialGenerator.java | 4 +-
.../store/notifier/CredentialStoreNotifier.java | 19 +++
.../store/notifier/NotificationMessage.java | 4 +-
.../store/notifier/NotifierBootstrap.java | 4 +-
.../notifier/impl/EmailNotificationMessage.java | 4 +-
.../store/notifier/impl/EmailNotifier.java | 4 +-
.../impl/EmailNotifierConfiguration.java | 4 +-
.../store/server/CredentialStoreServer.java | 3 +-
.../server/CredentialStoreServerHandler.java | 3 +-
.../store/servlet/CredentialBootstrapper.java | 4 +-
.../servlet/CredentialStoreCallbackServlet.java | 4 +-
.../servlet/CredentialStoreStartServlet.java | 4 +-
.../store/store/CredentialReader.java | 4 +-
.../store/store/CredentialReaderFactory.java | 4 +-
.../store/store/CredentialStoreException.java | 4 +-
.../store/store/CredentialWriter.java | 4 +-
.../store/impl/CertificateCredentialWriter.java | 4 +-
.../store/store/impl/CredentialReaderImpl.java | 4 +-
.../store/store/impl/SSHCredentialWriter.java | 4 +-
.../store/store/impl/db/CommunityUserDAO.java | 4 +-
.../store/store/impl/db/CredentialsDAO.java | 4 +-
.../store/store/impl/db/ParentDAO.java | 4 +-
.../store/store/impl/util/ConnectionPool.java | 5 +-
.../impl/util/CredentialStoreInitUtil.java | 5 +-
.../store/store/impl/util/DatabaseCreator.java | 5 +-
.../store/store/impl/util/JdbcStorage.java | 5 +-
.../store/util/ConfigurationReader.java | 4 +-
.../store/util/CredentialStoreConstants.java | 4 +-
.../credential/store/util/PrivateKeyStore.java | 4 +-
.../credential/store/util/TokenGenerator.java | 4 +-
.../airavata/credential/store/util/Utility.java | 4 +-
.../cpi/SSHSummaryTest/SSHSummaryTest.java | 19 +++
.../store/notifier/impl/EmailNotifierTest.java | 4 +-
.../store/impl/db/CommunityUserDAOTest.java | 4 +-
.../store/store/impl/db/CredentialsDAOTest.java | 4 +-
.../store/store/impl/db/SSHCredentialTest.java | 4 +-
.../store/util/ConfigurationReaderTest.java | 4 +-
.../store/util/TokenGeneratorTest.java | 4 +-
.../credential-store-stubs/pom.xml | 31 +++--
.../client/CredentialStoreClientFactory.java | 4 +-
.../credential/store/client/TestSSLClient.java | 3 +-
.../store/cpi/CredentialStoreService.java | 19 +++
.../cpi/credential_store_cpiConstants.java | 19 +++
.../exception/CredentialStoreException.java | 19 +++
modules/credential-store/pom.xml | 26 +++-
.../db/event/manager/utils/Constants.java | 2 +-
modules/distribution/pom.xml | 46 +++++--
.../src/main/assembly/bin-assembly.xml | 32 +++--
.../src/main/assembly/src-assembly.xml | 37 ++---
.../main/resources/bin/airavata-server-start.sh | 17 ++-
.../gfac-application-specific-handlers/pom.xml | 31 +++--
.../gaussian/handler/GaussianHandler.java | 19 +++
modules/gfac/gfac-bes/pom.xml | 29 ++--
.../gfac/bes/handlers/AbstractSMSHandler.java | 19 +++
.../gfac/bes/handlers/SMSByteIOInHandler.java | 19 +++
.../gfac/bes/handlers/SMSByteIOOutHandler.java | 19 +++
.../gfac/bes/handlers/SMSDirectoryHandler.java | 19 +++
.../gfac/bes/provider/impl/BESProvider.java | 3 +-
.../bes/security/UNICORESecurityContext.java | 19 +++
.../gfac/bes/security/X509SecurityContext.java | 5 +-
.../airavata/gfac/bes/utils/ActivityInfo.java | 19 +++
.../gfac/bes/utils/ApplicationProcessor.java | 4 +-
.../airavata/gfac/bes/utils/BESConstants.java | 19 +++
.../gfac/bes/utils/DataTransferrer.java | 4 +-
.../airavata/gfac/bes/utils/FileDownloader.java | 4 +-
.../gfac/bes/utils/FileTransferBase.java | 4 +-
.../airavata/gfac/bes/utils/FileUploader.java | 4 +-
.../airavata/gfac/bes/utils/JSDLGenerator.java | 3 +-
.../airavata/gfac/bes/utils/JSDLUtils.java | 4 +-
.../apache/airavata/gfac/bes/utils/Mode.java | 4 +-
.../airavata/gfac/bes/utils/MyProxyLogon.java | 19 +++
.../airavata/gfac/bes/utils/OSRequirement.java | 4 +-
.../apache/airavata/gfac/bes/utils/OSType.java | 4 +-
.../gfac/bes/utils/ProcessorRequirement.java | 6 +-
.../airavata/gfac/bes/utils/RangeValueType.java | 4 +-
.../gfac/bes/utils/ResourceProcessor.java | 4 +-
.../airavata/gfac/bes/utils/SPMDProcessor.java | 4 +-
.../airavata/gfac/bes/utils/SPMDVariations.java | 4 +-
.../airavata/gfac/bes/utils/SecurityUtils.java | 19 +++
.../airavata/gfac/bes/utils/StorageCreator.java | 4 +-
.../gfac/bes/utils/UASDataStagingProcessor.java | 4 +-
.../airavata/gfac/bes/utils/URIUtils.java | 4 +-
.../impl/JSDLGeneratorTestWithMyProxyAuth.java | 4 +-
modules/gfac/gfac-client/pom.xml | 31 +++--
.../airavata/gfac/client/GFACInstance.java | 5 +-
.../airavata/gfac/client/GFacClientFactory.java | 5 +-
.../apache/airavata/gfac/cpi/GfacService.java | 19 +++
.../airavata/gfac/cpi/gfac_cpiConstants.java | 19 +++
modules/gfac/gfac-impl/pom.xml | 26 +++-
.../java/com/jcraft/jsch/ExtendedSession.java | 4 +-
.../com/jcraft/jsch/GSISSHIdentityFile.java | 4 +-
.../jcraft/jsch/GSISSHIdentityRepository.java | 4 +-
.../java/com/jcraft/jsch/GSSContextX509.java | 4 +-
.../UserAuthGSSAPIWithMICGSSCredentials.java | 4 +-
.../apache/airavata/gfac/impl/AuroraUtils.java | 3 +-
.../airavata/gfac/impl/BESRemoteCluster.java | 6 +-
.../gfac/impl/DefaultHostScheduler.java | 3 +-
.../org/apache/airavata/gfac/impl/Factory.java | 3 +-
.../airavata/gfac/impl/GFacEngineImpl.java | 6 +-
.../apache/airavata/gfac/impl/GFacWorker.java | 4 +-
.../airavata/gfac/impl/HPCRemoteCluster.java | 5 +-
.../apache/airavata/gfac/impl/HTTPUtils.java | 19 +++
.../airavata/gfac/impl/LocalCommandOutput.java | 3 +-
.../airavata/gfac/impl/LocalRemoteCluster.java | 3 +-
.../org/apache/airavata/gfac/impl/SSHUtils.java | 3 +-
.../airavata/gfac/impl/StandardOutReader.java | 5 +-
.../job/AiravataCustomCommandOutputParser.java | 6 +-
.../gfac/impl/job/ForkJobConfiguration.java | 6 +-
.../gfac/impl/job/ForkOutputParser.java | 6 +-
.../apache/airavata/gfac/impl/job/JobUtil.java | 3 +-
.../gfac/impl/job/LSFJobConfiguration.java | 5 +-
.../airavata/gfac/impl/job/LSFOutputParser.java | 5 +-
.../gfac/impl/job/PBSJobConfiguration.java | 5 +-
.../airavata/gfac/impl/job/PBSOutputParser.java | 5 +-
.../gfac/impl/job/SlurmJobConfiguration.java | 5 +-
.../gfac/impl/job/SlurmOutputParser.java | 5 +-
.../gfac/impl/job/UGEJobConfiguration.java | 5 +-
.../airavata/gfac/impl/job/UGEOutputParser.java | 5 +-
.../airavata/gfac/impl/task/ArchiveTask.java | 3 +-
.../gfac/impl/task/AuroraJobSubmissionTask.java | 3 +-
.../gfac/impl/task/BESJobSubmissionTask.java | 19 +++
.../airavata/gfac/impl/task/DataStageTask.java | 3 +-
.../gfac/impl/task/DataStreamingTask.java | 6 +-
.../impl/task/DefaultJobSubmissionTask.java | 6 +-
.../gfac/impl/task/EnvironmentSetupTask.java | 3 +-
.../gfac/impl/task/ForkJobSubmissionTask.java | 6 +-
.../gfac/impl/task/LocalJobSubmissionTask.java | 6 +-
.../gfac/impl/task/SCPDataStageTask.java | 3 +-
.../airavata/gfac/impl/task/TaskUtils.java | 3 +-
.../gfac/impl/task/utils/StreamData.java | 6 +-
.../gfac/impl/task/utils/bes/ActivityInfo.java | 19 +++
.../task/utils/bes/ApplicationProcessor.java | 4 +-
.../gfac/impl/task/utils/bes/BESConstants.java | 19 +++
.../impl/task/utils/bes/DataTransferrer.java | 4 +-
.../impl/task/utils/bes/FileDownloader.java | 4 +-
.../impl/task/utils/bes/FileTransferBase.java | 4 +-
.../gfac/impl/task/utils/bes/FileUploader.java | 4 +-
.../gfac/impl/task/utils/bes/JSDLGenerator.java | 3 +-
.../gfac/impl/task/utils/bes/JSDLUtils.java | 4 +-
.../airavata/gfac/impl/task/utils/bes/Mode.java | 4 +-
.../gfac/impl/task/utils/bes/MyProxyLogon.java | 19 +++
.../gfac/impl/task/utils/bes/OSType.java | 4 +-
.../task/utils/bes/ProcessorRequirement.java | 6 +-
.../impl/task/utils/bes/RangeValueType.java | 4 +-
.../impl/task/utils/bes/ResourceProcessor.java | 4 +-
.../task/utils/bes/ResourceRequirement.java | 4 +-
.../impl/task/utils/bes/SPMDVariations.java | 4 +-
.../gfac/impl/task/utils/bes/SecurityUtils.java | 19 +++
.../impl/task/utils/bes/StorageCreator.java | 4 +-
.../task/utils/bes/UASDataStagingProcessor.java | 4 +-
.../task/utils/bes/UNICORESecurityContext.java | 19 +++
.../gfac/impl/task/utils/bes/URIUtils.java | 4 +-
.../task/utils/bes/X509SecurityContext.java | 5 +-
.../impl/watcher/CancelRequestWatcherImpl.java | 3 +-
.../watcher/RedeliveryRequestWatcherImpl.java | 3 +-
.../handler/LocalDirectorySetupHandler.java | 19 +++
.../gfac/local/handler/LocalInputHandler.java | 19 +++
.../gfac/local/provider/impl/LocalProvider.java | 19 +++
.../local/utils/InputStreamToFileWriter.java | 5 +-
.../airavata/gfac/local/utils/InputUtils.java | 5 +-
.../gfac/local/utils/LocalProviderUtil.java | 19 +++
.../gfac/monitor/cloud/AuroraJobMonitor.java | 3 +-
.../gfac/monitor/email/EmailBasedMonitor.java | 5 +-
.../email/parser/AiravataCustomMailParser.java | 5 +-
.../monitor/email/parser/LSFEmailParser.java | 5 +-
.../monitor/email/parser/PBSEmailParser.java | 5 +-
.../monitor/email/parser/SLURMEmailParser.java | 5 +-
.../monitor/email/parser/UGEEmailParser.java | 5 +-
.../exception/AiravataMonitorException.java | 5 +-
.../gfac/ssh/context/SSHAuthWrapper.java | 5 +-
.../gfac/ssh/security/SSHSecurityContext.java | 3 +-
.../gfac/ssh/security/TokenizedSSHAuthInfo.java | 5 +-
.../services/impl/BigRed2TestWithSSHAuth.java | 19 +++
.../gfac/services/impl/CredentialStoreTest.java | 19 +++
.../impl/GSISSHProviderTestWithMyProxyAuth.java | 19 +++
.../gfac/services/impl/LocalProviderTest.java | 19 +++
.../impl/SSHProviderTestWithSSHAuth.java | 19 +++
.../GSISecurityContextTestWithMyProxyAuth.java | 19 +++
.../email/parser/PBSEmailParserTest.java | 19 +++
.../gfac/ssh/config/ConfigReaderTest.java | 19 +++
.../impl/DefaultSSHApiTestWithMyProxyAuth.java | 19 +++
.../gfac/ssh/impl/VanilaTestWithSSHAuth.java | 19 +++
.../apache/airavata/job/AMQPMonitorTest.java | 19 +++
.../job/QstatMonitorTestWithMyProxyAuth.java | 19 +++
modules/gfac/gfac-service/pom.xml | 31 +++--
.../apache/airavata/gfac/server/GfacServer.java | 5 +-
.../airavata/gfac/server/GfacServerHandler.java | 5 +-
.../gfac/client/GfacClientFactoryTest.java | 6 +-
.../airavata/gfac/client/util/Initialize.java | 4 +-
modules/gfac/pom.xml | 26 +++-
modules/integration-tests/pom.xml | 26 +++-
.../org/apache/airavata/integration/Man.java | 4 +-
.../integration/AbstractIntegrationTest.java | 4 +-
.../apache/airavata/integration/BaseCaseIT.java | 4 +-
.../airavata/integration/DataRetrievalIT.java | 4 +-
.../airavata/integration/ForEachCaseIT.java | 4 +-
.../apache/airavata/integration/OsUtils.java | 4 +-
.../integration/PasswordCallbackImpl.java | 19 +++
.../airavata/integration/SimpleEchoIT.java | 4 +-
.../SingleAppIntegrationTestBase.java | 3 +-
.../WorkflowIntegrationTestBase.java | 4 +-
.../integration/WorkflowSamplesCaseIT.java | 4 +-
.../integration/tools/DocumentCreatorNew.java | 5 +-
.../integration/tools/DocumentCreatorUtils.java | 4 +-
.../integration-tests/src/test/java/suite.xml | 30 ++--
modules/messaging/client/pom.xml | 26 +++-
.../messaging/client/RabbitMQListener.java | 4 +-
.../airavata/messaging/client/TestReader.java | 3 +-
modules/messaging/core/pom.xml | 29 ++--
.../airavata/messaging/core/MessageContext.java | 4 +-
.../airavata/messaging/core/MessageHandler.java | 4 +-
.../messaging/core/MessagingConstants.java | 4 +-
.../messaging/core/MessagingFactory.java | 3 +-
.../airavata/messaging/core/Publisher.java | 4 +-
.../messaging/core/PublisherFactory.java | 19 +++
.../messaging/core/RabbitMQProperties.java | 3 +-
.../airavata/messaging/core/Subscriber.java | 4 +-
.../airavata/messaging/core/TestClient.java | 4 +-
.../apache/airavata/messaging/core/Type.java | 3 +-
.../messaging/core/impl/ExperimentConsumer.java | 3 +-
.../messaging/core/impl/ProcessConsumer.java | 3 +-
.../impl/RabbitMQProcessLaunchConsumer.java | 19 +++
.../impl/RabbitMQProcessLaunchPublisher.java | 19 +++
.../messaging/core/impl/RabbitMQProducer.java | 19 +++
.../messaging/core/impl/RabbitMQPublisher.java | 3 +-
.../core/impl/RabbitMQStatusPublisher.java | 19 +++
.../core/impl/RabbitMQStatusSubscriber.java | 19 +++
.../messaging/core/impl/RabbitMQSubscriber.java | 4 +-
.../messaging/core/impl/StatusConsumer.java | 3 +-
.../messaging/core/stats/CountWriterTask.java | 3 +-
.../messaging/core/stats/LatencyWriterTask.java | 3 +-
.../messaging/core/stats/StatCounter.java | 3 +-
modules/messaging/pom.xml | 26 +++-
modules/monitoring/pom.xml | 31 +++--
.../org/apache/airavata/monitoring/Main.java | 3 +-
.../airavata/monitoring/MessageExtract.java | 3 +-
.../org/apache/airavata/monitoring/Util.java | 3 +-
.../monitoring/consumer/StatusConsumer.java | 3 +-
.../monitoring/consumer/StatusReceiver.java | 3 +-
.../monitoring/mailbox/GmailSMTPMailBox.java | 3 +-
.../airavata/monitoring/mailbox/MailBox.java | 3 +-
.../airavata/monitoring/mailbox/MailConfig.java | 3 +-
.../producer/RabbitMQEmailPublisher.java | 3 +-
.../monitoring/simulator/FetchPublish.java | 3 +-
.../monitoring/simulator/Simulator.java | 3 +-
modules/orchestrator/NULL | 1 -
.../orchestrator/orchestrator-client/pom.xml | 31 +++--
.../client/OrchestratorClientFactory.java | 4 +-
.../orchestrator/cpi/OrchestratorService.java | 19 +++
.../cpi/orchestrator_cpiConstants.java | 19 +++
.../sample/OrchestratorClientSample.java | 6 +-
modules/orchestrator/orchestrator-core/pom.xml | 31 +++--
.../core/OrchestratorConfiguration.java | 5 +-
.../core/context/OrchestratorContext.java | 5 +-
.../core/exception/OrchestratorException.java | 5 +-
.../core/impl/GFACPassiveJobSubmitter.java | 5 +-
.../orchestrator/core/job/JobSubmitter.java | 5 +-
.../core/utils/OrchestratorConstants.java | 5 +-
.../core/utils/OrchestratorUtils.java | 5 +-
.../core/validator/JobMetadataValidator.java | 5 +-
.../validator/impl/BatchQueueValidator.java | 5 +-
.../impl/ExperimentStatusValidator.java | 5 +-
.../airavata/orchestrator/cpi/Orchestrator.java | 5 +-
.../cpi/impl/AbstractOrchestrator.java | 5 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 5 +-
.../orchestrator/core/BaseOrchestratorTest.java | 5 +-
.../orchestrator/core/NewOrchestratorTest.java | 5 +-
.../core/OrchestratorTestWithGRAM.java | 5 +-
.../core/OrchestratorTestWithMyProxyAuth.java | 5 +-
.../orchestrator/core/ValidatorTest.java | 19 +++
.../orchestrator/core/util/Initialize.java | 4 +-
.../orchestrator/core/util/SecondValidator.java | 19 +++
.../orchestrator/core/util/TestValidator.java | 19 +++
.../orchestrator/orchestrator-service/pom.xml | 31 +++--
.../orchestrator/server/OrchestratorServer.java | 4 +-
.../server/OrchestratorServerHandler.java | 4 +-
.../airavata/orchestrator/util/Constants.java | 4 +-
.../OrchestratorServerThreadPoolExecutor.java | 4 +-
.../orchestrator/util/OrchestratorUtils.java | 3 +-
.../client/OrchestratorClientFactoryTest.java | 6 +-
.../orchestrator/client/util/Initialize.java | 4 +-
modules/orchestrator/pom.xml | 26 +++-
modules/registry/pom.xml | 26 +++-
modules/registry/registry-core/pom.xml | 26 +++-
.../core/app/catalog/impl/AppCatalogImpl.java | 4 +-
.../catalog/impl/ApplicationDeploymentImpl.java | 4 +-
.../catalog/impl/ApplicationInterfaceImpl.java | 4 +-
.../app/catalog/impl/ComputeResourceImpl.java | 4 +-
.../catalog/impl/GwyResourceProfileImpl.java | 4 +-
.../app/catalog/impl/StorageResourceImpl.java | 4 +-
.../catalog/impl/UsrResourceProfileImpl.java | 4 +-
.../core/app/catalog/model/AppEnvironment.java | 4 +-
.../app/catalog/model/AppEnvironment_PK.java | 4 +-
.../core/app/catalog/model/AppInput_PK.java | 4 +-
.../app/catalog/model/AppModuleMapping.java | 4 +-
.../app/catalog/model/AppModuleMapping_PK.java | 4 +-
.../core/app/catalog/model/AppOutput_PK.java | 4 +-
.../catalog/model/ApplicationDeployment.java | 4 +-
.../app/catalog/model/ApplicationIntInput.java | 4 +-
.../app/catalog/model/ApplicationIntOutput.java | 4 +-
.../app/catalog/model/ApplicationInterface.java | 4 +-
.../app/catalog/model/ApplicationModule.java | 4 +-
.../core/app/catalog/model/BatchQueue.java | 4 +-
.../core/app/catalog/model/BatchQueue_PK.java | 4 +-
.../app/catalog/model/CloudJobSubmission.java | 5 +-
.../core/app/catalog/model/ComputeResource.java | 4 +-
.../model/ComputeResourceFileSystem.java | 4 +-
.../model/ComputeResourceFileSystem_PK.java | 4 +-
.../model/ComputeResourcePreference.java | 4 +-
.../model/ComputeResourcePreferencePK.java | 4 +-
.../core/app/catalog/model/Configuration.java | 19 +++
.../app/catalog/model/Configuration_PK.java | 4 +-
.../catalog/model/DataMovementInterface.java | 4 +-
.../catalog/model/DataMovementInterface_PK.java | 4 +-
.../app/catalog/model/DataStorageResource.java | 4 +-
.../core/app/catalog/model/GSISSHExport.java | 4 +-
.../core/app/catalog/model/GSISSHExportPK.java | 4 +-
.../app/catalog/model/GSISSHSubmission.java | 4 +-
.../core/app/catalog/model/GatewayProfile.java | 4 +-
.../app/catalog/model/GlobusGKEndPointPK.java | 4 +-
.../app/catalog/model/GlobusGKEndpoint.java | 4 +-
.../app/catalog/model/GlobusJobSubmission.java | 4 +-
.../app/catalog/model/GridftpDataMovement.java | 4 +-
.../core/app/catalog/model/GridftpEndpoint.java | 4 +-
.../app/catalog/model/GridftpEndpoint_PK.java | 4 +-
.../core/app/catalog/model/HostAlias.java | 4 +-
.../core/app/catalog/model/HostAliasPK.java | 4 +-
.../core/app/catalog/model/HostIPAddress.java | 4 +-
.../core/app/catalog/model/HostIPAddressPK.java | 4 +-
.../app/catalog/model/JobManagerCommand.java | 4 +-
.../app/catalog/model/JobManagerCommand_PK.java | 4 +-
.../catalog/model/JobSubmissionInterface.java | 4 +-
.../model/JobSubmissionInterface_PK.java | 4 +-
.../app/catalog/model/LibraryApendPath.java | 4 +-
.../app/catalog/model/LibraryApendPath_PK.java | 4 +-
.../app/catalog/model/LibraryPrepandPath.java | 4 +-
.../catalog/model/LibraryPrepandPath_PK.java | 4 +-
.../app/catalog/model/LocalDataMovement.java | 4 +-
.../core/app/catalog/model/LocalSubmission.java | 4 +-
.../core/app/catalog/model/ModuleLoadCmd.java | 4 +-
.../app/catalog/model/ModuleLoadCmd_PK.java | 4 +-
.../catalog/model/ParallelismPrefixCommand.java | 4 +-
.../model/ParallelismPrefixCommand_PK.java | 4 +-
.../core/app/catalog/model/PostJobCommand.java | 4 +-
.../app/catalog/model/PostJobCommandPK.java | 4 +-
.../core/app/catalog/model/PreJobCommand.java | 4 +-
.../core/app/catalog/model/PreJobCommandPK.java | 4 +-
.../app/catalog/model/ResourceJobManager.java | 4 +-
.../core/app/catalog/model/ScpDataMovement.java | 4 +-
.../app/catalog/model/SshJobSubmission.java | 4 +-
.../app/catalog/model/StorageInterface.java | 4 +-
.../app/catalog/model/StorageInterface_PK.java | 4 +-
.../app/catalog/model/StoragePreference.java | 4 +-
.../app/catalog/model/StoragePreferencePK.java | 4 +-
.../core/app/catalog/model/StorageResource.java | 4 +-
.../app/catalog/model/UnicoreDataMovement.java | 6 +-
.../app/catalog/model/UnicoreJobSubmission.java | 6 +-
.../model/UserComputeResourcePreference.java | 4 +-
.../model/UserComputeResourcePreferencePK.java | 4 +-
.../app/catalog/model/UserResourceProfile.java | 4 +-
.../catalog/model/UserResourceProfilePK.java | 4 +-
.../catalog/model/UserStoragePreference.java | 4 +-
.../catalog/model/UserStoragePreferencePK.java | 4 +-
.../resources/AppCatAbstractResource.java | 4 +-
.../catalog/resources/AppCatalogResource.java | 19 +++
.../resources/AppDeploymentResource.java | 4 +-
.../resources/AppEnvironmentResource.java | 4 +-
.../catalog/resources/AppInterfaceResource.java | 4 +-
...ppModuleMappingAppCatalogResourceAppCat.java | 4 +-
.../catalog/resources/AppModuleResource.java | 4 +-
.../resources/ApplicationInputResource.java | 2 +-
.../resources/ApplicationOutputResource.java | 2 +-
.../catalog/resources/BatchQueueResource.java | 4 +-
.../resources/CloudSubmissionResource.java | 5 +-
.../ComputeHostPreferenceResource.java | 4 +-
.../ComputeResourceFileSystemResource.java | 4 +-
.../resources/ComputeResourceResource.java | 4 +-
.../DataMovementInterfaceResource.java | 4 +-
.../catalog/resources/GSISSHExportResource.java | 2 +-
.../resources/GSISSHSubmissionResource.java | 2 +-
.../resources/GatewayProfileResource.java | 2 +-
.../resources/GlobusGKEndpointResource.java | 2 +-
.../resources/GlobusJobSubmissionResource.java | 2 +-
.../resources/GridftpDataMovementResource.java | 2 +-
.../resources/GridftpEndpointResource.java | 2 +-
.../catalog/resources/HostAliasAppResource.java | 2 +-
.../resources/HostIPAddressResource.java | 2 +-
.../resources/JobManagerCommandResource.java | 4 +-
.../JobSubmissionInterfaceResource.java | 4 +-
.../resources/LibraryApendPathResource.java | 4 +-
.../resources/LibraryPrepandPathResource.java | 4 +-
.../resources/LocalDataMovementResource.java | 4 +-
.../resources/LocalSubmissionResource.java | 4 +-
.../resources/ModuleLoadCmdResource.java | 4 +-
.../ParallelismPrefixCommandResource.java | 4 +-
.../resources/PostJobCommandResource.java | 2 +-
.../resources/PreJobCommandResource.java | 2 +-
.../resources/ResourceJobManagerResource.java | 4 +-
.../resources/ScpDataMovementResource.java | 2 +-
.../resources/SshJobSubmissionResource.java | 2 +-
.../resources/StorageInterfaceResource.java | 4 +-
.../resources/StoragePreferenceResource.java | 4 +-
.../resources/StorageResourceResource.java | 4 +-
.../resources/UnicoreDataMovementResource.java | 6 +-
.../resources/UnicoreJobSubmissionResource.java | 6 +-
.../UserComputeHostPreferenceResource.java | 4 +-
.../resources/UserResourceProfileResource.java | 2 +-
.../UserStoragePreferenceResource.java | 4 +-
.../app/catalog/util/AppCatalogJPAUtils.java | 4 +-
.../catalog/util/AppCatalogQueryGenerator.java | 4 +-
.../catalog/util/AppCatalogResourceType.java | 4 +-
.../util/AppCatalogThriftConversion.java | 4 +-
.../core/app/catalog/util/AppCatalogUtils.java | 4 +-
.../experiment/catalog/ExpCatResourceUtils.java | 5 +-
.../catalog/ExperimentCatResource.java | 5 +-
.../core/experiment/catalog/JPAConstants.java | 4 +-
.../core/experiment/catalog/ResourceType.java | 5 +-
.../catalog/impl/ExperimentCatalogImpl.java | 4 +-
.../catalog/impl/ExperimentRegistry.java | 4 +-
.../catalog/impl/GatewayRegistry.java | 4 +-
.../catalog/impl/NotificationRegistry.java | 4 +-
.../catalog/impl/ProjectRegistry.java | 4 +-
.../catalog/impl/RegistryFactory.java | 4 +-
.../experiment/catalog/impl/UserRegistry.java | 4 +-
.../experiment/catalog/model/Experiment.java | 5 +-
.../catalog/model/ExperimentError.java | 5 +-
.../catalog/model/ExperimentErrorPK.java | 5 +-
.../catalog/model/ExperimentInput.java | 5 +-
.../catalog/model/ExperimentInputPK.java | 5 +-
.../catalog/model/ExperimentOutput.java | 5 +-
.../catalog/model/ExperimentOutputPK.java | 5 +-
.../catalog/model/ExperimentStatus.java | 5 +-
.../catalog/model/ExperimentStatusPK.java | 5 +-
.../catalog/model/ExperimentSummary.java | 5 +-
.../core/experiment/catalog/model/Gateway.java | 5 +-
.../experiment/catalog/model/GatewayWorker.java | 5 +-
.../catalog/model/GatewayWorkerPK.java | 5 +-
.../core/experiment/catalog/model/Job.java | 5 +-
.../core/experiment/catalog/model/JobPK.java | 5 +-
.../experiment/catalog/model/JobStatus.java | 5 +-
.../experiment/catalog/model/JobStatusPK.java | 5 +-
.../experiment/catalog/model/Notification.java | 5 +-
.../core/experiment/catalog/model/Process.java | 5 +-
.../experiment/catalog/model/ProcessError.java | 5 +-
.../catalog/model/ProcessErrorPK.java | 5 +-
.../experiment/catalog/model/ProcessInput.java | 5 +-
.../catalog/model/ProcessInputPK.java | 5 +-
.../experiment/catalog/model/ProcessOutput.java | 5 +-
.../catalog/model/ProcessOutputPK.java | 5 +-
.../catalog/model/ProcessResourceSchedule.java | 5 +-
.../experiment/catalog/model/ProcessStatus.java | 5 +-
.../catalog/model/ProcessStatusPK.java | 5 +-
.../core/experiment/catalog/model/Project.java | 5 +-
.../experiment/catalog/model/ProjectUser.java | 5 +-
.../experiment/catalog/model/ProjectUserPK.java | 5 +-
.../experiment/catalog/model/QueueStatus.java | 5 +-
.../experiment/catalog/model/QueueStatusPK.java | 5 +-
.../core/experiment/catalog/model/Task.java | 5 +-
.../experiment/catalog/model/TaskError.java | 5 +-
.../experiment/catalog/model/TaskErrorPK.java | 5 +-
.../experiment/catalog/model/TaskStatus.java | 5 +-
.../experiment/catalog/model/TaskStatusPK.java | 5 +-
.../catalog/model/UserConfigurationData.java | 5 +-
.../core/experiment/catalog/model/UserPK.java | 5 +-
.../core/experiment/catalog/model/Users.java | 5 +-
.../resources/AbstractExpCatResource.java | 3 +-
.../resources/ExperimentErrorResource.java | 4 +-
.../resources/ExperimentInputResource.java | 4 +-
.../resources/ExperimentOutputResource.java | 4 +-
.../catalog/resources/ExperimentResource.java | 4 +-
.../resources/ExperimentStatisticsResource.java | 5 +-
.../resources/ExperimentStatusResource.java | 4 +-
.../resources/ExperimentSummaryResource.java | 5 +-
.../catalog/resources/GatewayResource.java | 5 +-
.../catalog/resources/JobResource.java | 4 +-
.../catalog/resources/JobStatusResource.java | 4 +-
.../catalog/resources/NotificationResource.java | 5 +-
.../catalog/resources/ProcessErrorResource.java | 4 +-
.../catalog/resources/ProcessInputResource.java | 4 +-
.../resources/ProcessOutputResource.java | 4 +-
.../catalog/resources/ProcessResource.java | 4 +-
.../ProcessResourceScheduleResource.java | 4 +-
.../resources/ProcessStatusResource.java | 4 +-
.../catalog/resources/ProjectResource.java | 5 +-
.../catalog/resources/ProjectUserResource.java | 4 +-
.../catalog/resources/QueueStatusResource.java | 5 +-
.../catalog/resources/TaskErrorResource.java | 4 +-
.../catalog/resources/TaskResource.java | 4 +-
.../catalog/resources/TaskStatusResource.java | 4 +-
.../UserConfigurationDataResource.java | 4 +-
.../catalog/resources/UserResource.java | 5 +-
.../experiment/catalog/resources/Utils.java | 3 +-
.../catalog/resources/WorkerResource.java | 9 +-
.../catalog/utils/QueryGenerator.java | 4 +-
.../utils/ThriftDataModelConversion.java | 19 +++
.../registry/core/impl/RegistryImpl.java | 6 +-
.../catalog/impl/ReplicaCatalogImpl.java | 4 +-
.../replica/catalog/model/Configuration.java | 19 +++
.../replica/catalog/model/Configuration_PK.java | 4 +-
.../core/replica/catalog/model/DataProduct.java | 5 +-
.../catalog/model/DataProductMetaData.java | 5 +-
.../catalog/model/DataProductMetaData_PK.java | 5 +-
.../catalog/model/DataReplicaLocation.java | 5 +-
.../catalog/model/DataReplicaMetaData.java | 5 +-
.../catalog/model/DataReplicaMetaData_PK.java | 5 +-
.../catalog/utils/ReplicaCatalogConstants.java | 3 +-
.../catalog/utils/ReplicaCatalogJPAUtils.java | 4 +-
.../utils/ReplicaCatalogQueryGenerator.java | 4 +-
.../utils/ThriftDataModelConversion.java | 19 +++
.../catalog/impl/WorkflowCatalogImpl.java | 4 +-
.../workflow/catalog/model/ComponentStatus.java | 4 +-
.../core/workflow/catalog/model/Edge.java | 4 +-
.../core/workflow/catalog/model/Edge_PK.java | 4 +-
.../core/workflow/catalog/model/Node.java | 4 +-
.../core/workflow/catalog/model/Node_PK.java | 4 +-
.../core/workflow/catalog/model/Port.java | 4 +-
.../core/workflow/catalog/model/Port_PK.java | 4 +-
.../core/workflow/catalog/model/Workflow.java | 4 +-
.../workflow/catalog/model/WorkflowInput.java | 4 +-
.../catalog/model/WorkflowInput_PK.java | 4 +-
.../workflow/catalog/model/WorkflowOutput.java | 4 +-
.../catalog/model/WorkflowOutput_PK.java | 4 +-
.../workflow/catalog/model/WorkflowStatus.java | 4 +-
.../catalog/model/WorkflowStatus_PK.java | 4 +-
.../resources/ComponentStatusResource.java | 2 +-
.../catalog/resources/EdgeResource.java | 2 +-
.../catalog/resources/NodeResource.java | 2 +-
.../catalog/resources/PortResource.java | 2 +-
.../resources/WorkflowCatAbstractResource.java | 4 +-
.../resources/WorkflowCatalogResource.java | 19 +++
.../resources/WorkflowInputResource.java | 2 +-
.../resources/WorkflowOutputResource.java | 2 +-
.../catalog/resources/WorkflowResource.java | 4 +-
.../resources/WorkflowStatusResource.java | 2 +-
.../catalog/utils/WorkflowCatalogJPAUtils.java | 4 +-
.../utils/WorkflowCatalogQueryGenerator.java | 4 +-
.../utils/WorkflowCatalogResourceType.java | 4 +-
.../utils/WorkflowCatalogThriftConversion.java | 4 +-
.../catalog/utils/WorkflowCatalogUtils.java | 4 +-
.../airavata/app/catalog/AppDeploymentTest.java | 4 +-
.../airavata/app/catalog/AppInterfaceTest.java | 4 +-
...puteAppCatalogExperimentCatResourceTest.java | 4 +-
.../app/catalog/GatewayProfileTest.java | 4 +-
.../catalog/StorageResourceAppCatalogTest.java | 4 +-
.../app/catalog/UserResourceProfileTest.java | 4 +-
.../airavata/app/catalog/util/Initialize.java | 4 +-
.../catalog/AbstractResourceTest.java | 4 +-
.../catalog/ExperimentInputResourceTest.java | 19 +++
.../catalog/ExperimentOutputResourceTest.java | 19 +++
.../catalog/ExperimentResourceTest.java | 19 +++
.../experiment/catalog/GatewayResourceTest.java | 19 +++
.../experiment/catalog/JobResourceTest.java | 2 +-
.../experiment/catalog/ProcessResourceTest.java | 2 +-
.../catalog/QueueStatusResourceTest.java | 19 +++
.../experiment/catalog/TaskResourceTest.java | 2 +-
.../catalog/UserConfigurationDataTest.java | 4 +-
.../experiment/catalog/UserResourceTest.java | 19 +++
.../experiment/catalog/util/Initialize.java | 4 +-
.../replica/catalog/ReplicaCatalogTest.java | 5 +-
.../replica/catalog/util/Initialize.java | 4 +-
modules/registry/registry-cpi/pom.xml | 26 +++-
.../airavata/registry/cpi/AppCatalog.java | 2 +-
.../registry/cpi/AppCatalogException.java | 2 +-
.../registry/cpi/ApplicationDeployment.java | 2 +-
.../registry/cpi/ApplicationInterface.java | 2 +-
.../registry/cpi/CompositeIdentifier.java | 4 +-
.../airavata/registry/cpi/ComputeResource.java | 2 +-
.../registry/cpi/ExpCatChildDataType.java | 2 +-
.../registry/cpi/ExpCatParentDataType.java | 2 +-
.../registry/cpi/ExperimentCatalog.java | 2 +-
.../cpi/ExperimentCatalogException.java | 6 +-
.../cpi/ExperimentCatalogModelType.java | 2 +-
.../registry/cpi/GwyClientCredential.java | 2 +-
.../registry/cpi/GwyResourceProfile.java | 2 +-
.../apache/airavata/registry/cpi/Registry.java | 6 +-
.../registry/cpi/RegistryException.java | 4 +-
.../airavata/registry/cpi/ReplicaCatalog.java | 2 +-
.../registry/cpi/ReplicaCatalogException.java | 2 +-
.../airavata/registry/cpi/ResultOrderType.java | 19 +++
.../airavata/registry/cpi/StorageResource.java | 8 +-
.../registry/cpi/UsrResourceProfile.java | 2 +-
.../airavata/registry/cpi/WorkflowCatalog.java | 6 +-
.../registry/cpi/WorkflowCatalogException.java | 2 +-
.../airavata/registry/cpi/utils/Constants.java | 4 +-
.../airavata/registry/cpi/utils/StatusType.java | 2 +-
modules/registry/registry-server/pom.xml | 28 +++-
.../registry-api-service/pom.xml | 21 +++
.../registry/api/service/RegistryAPIServer.java | 5 +-
.../service/handler/RegistryServerHandler.java | 5 +-
.../api/service/util/AppCatalogInitUtil.java | 19 +++
.../api/service/util/ConnectionPool.java | 6 +-
.../registry/api/service/util/Constants.java | 4 +-
.../api/service/util/DatabaseCreator.java | 5 +-
.../service/util/ExperimentCatalogInitUtil.java | 19 +++
.../registry/api/service/util/JdbcStorage.java | 5 +-
.../service/util/ReplicaCatalogInitUtil.java | 19 +++
.../service/util/WorkflowCatalogInitUtil.java | 19 +++
.../registry-server/registry-api-stubs/pom.xml | 21 +++
.../airavata/registry/api/RegistryService.java | 19 +++
.../client/RegistryServiceClientFactory.java | 4 +-
.../api/exception/RegistryServiceException.java | 19 +++
.../registry/api/registry_apiConstants.java | 19 +++
modules/registry/registry-tools/jpa-gen/pom.xml | 26 +++-
.../computeresource/BatchQueueGenerator.java | 4 +-
.../ComputeResourceDescriptionGenerator.java | 4 +-
.../DataMovementInterfaceGenerator.java | 4 +-
.../computeresource/FileSystemsGenerator.java | 4 +-
.../GridFTPDataMovementGenerator.java | 4 +-
.../GridFTPEndpointsGenerator.java | 4 +-
.../JobManagerCommandGenerator.java | 4 +-
.../JobSubmissionInterfaceGenerator.java | 4 +-
.../LocalDataMovementGenerator.java | 4 +-
.../LocalSubmissionGenerator.java | 4 +-
.../computeresource/ModuleCMDGenerator.java | 4 +-
.../ResourceJobManagerGenerator.java | 4 +-
.../SCPDataMovementGenerator.java | 4 +-
.../SSHJobSubmissionGenerator.java | 4 +-
.../main/java/generators/AbstractGenerator.java | 19 +++
.../main/java/generators/JPAClassGenerator.java | 19 +++
.../generators/JPAResourceClassGenerator.java | 19 +++
.../src/main/java/generators/SQLGenerator.java | 19 +++
.../src/main/java/model/JPAClassField.java | 19 +++
.../src/main/java/model/JPAClassModel.java | 19 +++
.../src/main/java/model/JPAPKClassModel.java | 19 +++
.../main/java/model/JPAResourceClassModel.java | 19 +++
.../jpa-gen/src/main/java/model/SQLData.java | 19 +++
.../jpa-gen/src/main/java/test/Test.java | 19 +++
modules/registry/registry-tools/pom.xml | 26 +++-
.../registry-tools/registry-tool/pom.xml | 26 +++-
.../airavata/registry/tool/DBMigrator.java | 4 +-
.../DeltaScripts/appCatalog_schema_delta.sql | 20 +++
.../credentialStore_schema_delta.sql | 20 +++
.../DeltaScripts/expCatalog_schema_delta.sql | 20 +++
.../replicaCatalog_schema_delta.sql | 20 +++
.../DeltaScripts/workFlow_schema_delta.sql | 20 +++
modules/security/pom.xml | 30 ++--
.../security/AbstractAuthenticator.java | 4 +-
.../security/AbstractDatabaseAuthenticator.java | 4 +-
.../security/AiravataSecurityException.java | 3 +-
.../security/AuthenticationException.java | 4 +-
.../apache/airavata/security/Authenticator.java | 4 +-
.../apache/airavata/security/Authoriser.java | 4 +-
.../org/apache/airavata/security/UserStore.java | 4 +-
.../airavata/security/UserStoreException.java | 4 +-
.../AbstractConfigurationReader.java | 4 +-
.../AuthenticatorConfigurationReader.java | 4 +-
.../userstore/AbstractJDBCUserStore.java | 4 +-
.../security/userstore/JDBCUserStore.java | 4 +-
.../security/userstore/LDAPUserStore.java | 4 +-
.../security/userstore/SessionDBUserStore.java | 4 +-
.../security/util/PasswordDigester.java | 4 +-
.../security/util/TrustStoreManager.java | 3 +-
.../AuthenticatorConfigurationReaderTest.java | 4 +-
.../configurations/TestDBAuthenticator1.java | 4 +-
.../configurations/TestDBAuthenticator2.java | 4 +-
.../configurations/TestDBAuthenticator3.java | 4 +-
.../security/configurations/TestUserStore.java | 36 +++--
.../security/userstore/JDBCUserStoreTest.java | 36 +++--
.../security/userstore/LDAPUserStoreTest.java | 36 +++--
.../userstore/SessionDBUserStoreTest.java | 36 +++--
modules/server/pom.xml | 30 ++--
.../org/apache/airavata/server/ServerMain.java | 3 +-
modules/sharing-registry/pom.xml | 21 +++
.../sharing-data-migrator/pom.xml | 21 +++
.../migrator/airavata/AiravataDataMigrator.java | 5 +-
.../migrator/airavata/ConnectionFactory.java | 5 +-
.../sharing-registry-distribution/pom.xml | 21 +++
.../src/main/assembly/bin-assembly.xml | 37 ++---
.../sharing-registry-server/pom.xml | 27 ++++
.../registry/db/entities/DomainEntity.java | 5 +-
.../registry/db/entities/EntityEntity.java | 5 +-
.../sharing/registry/db/entities/EntityPK.java | 5 +-
.../registry/db/entities/EntityTypeEntity.java | 5 +-
.../registry/db/entities/EntityTypePK.java | 5 +-
.../db/entities/GroupMembershipEntity.java | 5 +-
.../registry/db/entities/GroupMembershipPK.java | 5 +-
.../db/entities/PermissionTypeEntity.java | 5 +-
.../registry/db/entities/PermissionTypePK.java | 5 +-
.../registry/db/entities/SharingEntity.java | 5 +-
.../sharing/registry/db/entities/SharingPK.java | 5 +-
.../registry/db/entities/UserEntity.java | 5 +-
.../registry/db/entities/UserGroupEntity.java | 5 +-
.../registry/db/entities/UserGroupPK.java | 5 +-
.../sharing/registry/db/entities/UserPK.java | 5 +-
.../db/repositories/AbstractRepository.java | 5 +-
.../db/repositories/DomainRepository.java | 5 +-
.../db/repositories/EntityRepository.java | 5 +-
.../db/repositories/EntityTypeRepository.java | 5 +-
.../repositories/GroupMembershipRepository.java | 5 +-
.../repositories/PermissionTypeRepository.java | 5 +-
.../db/repositories/SharingRepository.java | 5 +-
.../db/repositories/UserGroupRepository.java | 5 +-
.../db/repositories/UserRepository.java | 5 +-
.../sharing/registry/db/utils/Committer.java | 5 +-
.../registry/db/utils/ConnectionPool.java | 5 +-
.../sharing/registry/db/utils/DBConstants.java | 5 +-
.../registry/db/utils/DatabaseCreator.java | 5 +-
.../sharing/registry/db/utils/JPAUtils.java | 5 +-
.../sharing/registry/db/utils/JdbcStorage.java | 5 +-
.../db/utils/ObjectMapperSingleton.java | 5 +-
.../sharing/registry/server/ServerMain.java | 5 +-
.../registry/server/SharingRegistryServer.java | 5 +-
.../server/SharingRegistryServerHandler.java | 5 +-
.../airavata/sharing/registry/CipresTest.java | 5 +-
.../SharingRegistryServerHandlerTest.java | 5 +-
.../registry/SharingRegistryServiceTest.java | 5 +-
.../sharing/registry/util/Initialize.java | 4 +-
.../sharing-registry-stubs/pom.xml | 21 +++
.../SharingRegistryServiceClientFactory.java | 5 +-
.../sharing/registry/models/Domain.java | 19 +++
.../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 | 19 +++
.../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 | 19 +++
.../sharing-service-docs/api-docs/index.html | 21 +++
.../api-docs/sharing_cpi.html | 21 +++
.../api-docs/sharing_models.html | 21 +++
.../sharing-service-docs/api-docs/style.css | 22 ++-
.../sharing-service-docs/index.html | 21 +++
.../sharing-service-docs/style.css | 22 ++-
.../thrift_models/thrift-gen.sh | 20 +++
.../test-suite/multi-tenanted-airavata/pom.xml | 26 +++-
.../multitenantedairavata/AiravataClient.java | 6 +-
.../multitenantedairavata/AiravataIT.java | 6 +-
.../ApplicationRegister.java | 6 +-
.../ComputeResourceRegister.java | 6 +-
.../ExperimentExecution.java | 6 +-
.../FrameworkBootstrapping.java | 19 +++
.../multitenantedairavata/FrameworkSetup.java | 6 +-
.../multitenantedairavata/GatewayRegister.java | 6 +-
.../StorageResourceRegister.java | 19 +++
.../TestFrameworkProps.java | 6 +-
.../utils/ApplicationProperties.java | 19 +++
.../utils/ComputeResourceProperties.java | 19 +++
.../utils/FrameworkUtils.java | 6 +-
.../utils/PropertyFileType.java | 6 +-
.../utils/PropertyReader.java | 6 +-
.../utils/TestFrameworkConstants.java | 6 +-
modules/test-suite/pom.xml | 26 +++-
modules/user-profile-migration/pom.xml | 31 +++--
.../apache/airavata/ISLoginCredentialsDAO.java | 19 +++
.../apache/airavata/IdentityServerClient.java | 19 +++
.../org/apache/airavata/MigrationManager.java | 4 +-
.../UserProfileAiravataThriftClient.java | 4 +-
.../org/apache/airavata/UserProfileDAO.java | 4 +-
modules/user-profile/pom.xml | 31 +++--
modules/user-profile/user-profile-core/pom.xml | 21 +++
.../core/UserProfileRegistryException.java | 2 +-
.../core/entities/NSFDemographicsEntity.java | 2 +-
.../core/entities/UserProfileEntity.java | 2 +-
.../core/repositories/AbstractRepository.java | 2 +-
.../repositories/UserProfileRepository.java | 2 +-
.../user/registry/core/utils/Committer.java | 2 +-
.../user/registry/core/utils/JPAUtils.java | 2 +-
.../core/utils/ObjectMapperSingleton.java | 2 +-
.../registry/core/utils/QueryConstants.java | 19 +++
.../user/registry/core/utils/Utils.java | 3 +-
.../user-profile/user-profile-service/pom.xml | 21 +++
.../user/profile/server/UserProfileServer.java | 6 +-
.../server/UserProfileServiceHandler.java | 5 +-
modules/user-profile/user-profile-stubs/pom.xml | 31 +++--
.../userprofile/cpi/UserProfileService.java | 19 +++
.../client/UserProfileServiceClientFactory.java | 3 +-
.../exception/UserProfileServiceException.java | 19 +++
.../cpi/user_profile_cpiConstants.java | 19 +++
modules/workflow-model/pom.xml | 26 +++-
modules/workflow-model/workflow-engine/pom.xml | 26 +++-
.../catalog/WorkflowCatalogFactory.java | 4 +-
.../workflow/engine/WorkflowEngine.java | 4 +-
.../engine/WorkflowEngineException.java | 4 +-
.../workflow/engine/WorkflowEngineFactory.java | 4 +-
.../workflow/engine/WorkflowEngineImpl.java | 4 +-
.../airavata/workflow/engine/WorkflowUtils.java | 4 +-
.../engine/concurrent/PredicatedExecutable.java | 5 +-
.../engine/concurrent/PredicatedTaskRunner.java | 5 +-
.../engine/core/amazon/AmazonCredential.java | 4 +-
.../engine/core/amazon/EC2InstanceResult.java | 19 +++
.../engine/core/generators/XmlBeansFiler.java | 4 +-
.../core/workflow/ParameterListModel.java | 4 +-
.../engine/datadriven/WorkflowHarvester.java | 4 +-
.../engine/file/XBayaPathConstants.java | 4 +-
.../engine/gfac/GFacRegistryClient.java | 4 +-
.../workflow/engine/gfac/SimpleWSClient.java | 4 +-
.../engine/globus/FileTransferConstants.java | 4 +-
.../globus/GridFTPFileTransferClient.java | 19 +++
.../engine/graph/controller/NodeController.java | 19 +++
.../engine/interpretor/DoWhileHandler.java | 3 +-
.../engine/interpretor/HeaderConstants.java | 4 +-
.../SSWorkflowInterpreterInteractorImpl.java | 4 +-
.../interpretor/SystemComponentInvoker.java | 4 +-
.../WorkFlowInterpreterException.java | 4 +-
.../interpretor/WorkflowExecutionMessage.java | 4 +-
.../engine/interpretor/WorkflowInterpreter.java | 4 +-
.../WorkflowInterpreterConfiguration.java | 4 +-
.../WorkflowInterpreterInteractor.java | 4 +-
.../interpretor/WorkflowInterpreterInvoker.java | 4 +-
.../WorkflowInterpreterSkeleton2.java | 19 +++
.../engine/invoker/AsynchronousInvoker.java | 4 +-
.../workflow/engine/invoker/DynamicInvoker.java | 4 +-
.../workflow/engine/invoker/Invoker.java | 4 +-
.../invoker/MsgBoxWsaResponsesCorrelator.java | 19 +++
.../workflow/engine/invoker/SimpleInvoker.java | 4 +-
.../engine/invoker/WorkflowInputUtil.java | 5 +-
.../workflow/engine/util/AmazonUtil.java | 4 +-
.../airavata/workflow/engine/util/Data.java | 4 +-
.../workflow/engine/util/GOConstants.java | 4 +-
.../workflow/engine/util/GlobusOnlineUtils.java | 19 +++
.../workflow/engine/util/InterpreterUtil.java | 3 +-
.../engine/util/ProxyMonitorPublisher.java | 4 +-
.../workflow/engine/util/RegistryConstants.java | 4 +-
.../workflow/engine/util/TransferFile.java | 4 +-
.../workflow/engine/util/XBayaUtil.java | 4 +-
.../workflow/WorkflowEngineException.java | 4 +-
.../engine/workflow/proxy/ProxyWSDL.java | 4 +-
.../engine/workflow/proxy/WorkflowClient.java | 4 +-
.../engine/workflow/proxy/WorkflowContext.java | 4 +-
.../workflow/proxy/WorkflowProxyException.java | 4 +-
.../interpreter/ComplexForEachWorkflowTest.java | 19 +++
.../xbaya/interpreter/ComplexMathService.java | 4 +-
.../interpreter/ComplexMathWorkflowTest.java | 19 +++
.../interpreter/CrossProductWorkflowTest.java | 19 +++
.../airavata/xbaya/interpreter/EchoService.java | 3 +-
.../xbaya/interpreter/ForEachWorkflowTest.java | 19 +++
.../interpreter/LevenshteinDistanceService.java | 4 +-
.../airavata/xbaya/interpreter/Listener.java | 19 +++
.../xbaya/interpreter/NotificationSender.java | 19 +++
.../xbaya/interpreter/RegistryServiceTest.java | 19 +++
.../interpreter/SimpleForEachWorkflowTest.java | 19 +++
.../interpreter/SimpleMathWorkflowTest.java | 19 +++
.../xbaya/interpreter/WorkflowTest.java | 19 +++
.../xbaya/interpreter/WorkflowTrackingTest.java | 19 +++
.../xbaya/interpreter/XBayaClientTest.java | 5 +-
.../interpreter/XBayaConsolidatedTestSuite.java | 19 +++
.../xbaya/interpreter/utils/ConfigKeys.java | 5 +-
.../xbaya/interpreter/utils/TestUtilServer.java | 19 +++
.../interpreter/utils/WorkflowTestUtils.java | 19 +++
.../workflow-model-component/pom.xml | 26 +++-
.../registry/JCRComponentReference.java | 4 +-
.../registry/JCRComponentRegistry.java | 4 +-
.../workflow-model/workflow-model-core/pom.xml | 26 +++-
.../workflow/model/component/Component.java | 4 +-
.../model/component/ComponentControlPort.java | 4 +-
.../model/component/ComponentDataPort.java | 4 +-
.../model/component/ComponentEPRPort.java | 4 +-
.../model/component/ComponentException.java | 4 +-
.../component/ComponentOperationReference.java | 4 +-
.../workflow/model/component/ComponentPort.java | 4 +-
.../model/component/ComponentReference.java | 4 +-
.../model/component/ComponentRegistry.java | 4 +-
.../component/ComponentRegistryException.java | 4 +-
.../amazon/AmazonComponentRegistry.java | 4 +-
.../component/amazon/InstanceComponent.java | 4 +-
.../amazon/InstanceComponentDataPort.java | 4 +-
.../amazon/TerminateInstanceComponent.java | 4 +-
.../component/dynamic/DynamicComponent.java | 4 +-
.../component/dynamic/DynamicComponentPort.java | 4 +-
.../local/LocalComponentReference.java | 4 +-
.../component/local/LocalComponentRegistry.java | 4 +-
.../model/component/system/BlockComponent.java | 4 +-
.../component/system/ConstantComponent.java | 4 +-
.../system/DifferedInputComponent.java | 8 +-
.../component/system/DoWhileComponent.java | 4 +-
.../component/system/EndBlockComponent.java | 4 +-
.../component/system/EndDoWhileComponent.java | 4 +-
.../component/system/EndForEachComponent.java | 4 +-
.../model/component/system/EndifComponent.java | 4 +-
.../model/component/system/ExitComponent.java | 4 +-
.../component/system/ForEachComponent.java | 4 +-
.../model/component/system/IfComponent.java | 4 +-
.../model/component/system/InputComponent.java | 4 +-
.../model/component/system/MemoComponent.java | 4 +-
.../model/component/system/OutputComponent.java | 4 +-
.../component/system/ReceiveComponent.java | 4 +-
.../component/system/S3InputComponent.java | 4 +-
.../component/system/StreamSourceComponent.java | 4 +-
.../component/system/SubWorkflowComponent.java | 4 +-
.../model/component/system/SystemComponent.java | 4 +-
.../system/SystemComponentDataPort.java | 4 +-
.../system/SystemComponentReference.java | 4 +-
.../system/SystemComponentRegistry.java | 4 +-
.../component/url/URLComponentReference.java | 4 +-
.../component/url/URLComponentRegistry.java | 4 +-
.../component/web/WebComponentReference.java | 4 +-
.../component/web/WebComponentRegistry.java | 4 +-
.../model/component/ws/WSComponent.java | 4 +-
.../component/ws/WSComponentApplication.java | 4 +-
.../ws/WSComponentApplicationParameter.java | 4 +-
.../model/component/ws/WSComponentFactory.java | 4 +-
.../model/component/ws/WSComponentKey.java | 4 +-
.../model/component/ws/WSComponentPort.java | 4 +-
.../component/ws/WSComponentReference.java | 4 +-
.../model/component/ws/WSComponentRegistry.java | 4 +-
.../model/component/ws/WorkflowComponent.java | 4 +-
.../exceptions/LazyLoadedDataException.java | 4 +-
.../model/exceptions/UtilsException.java | 4 +-
.../model/exceptions/WorkflowException.java | 4 +-
.../exceptions/WorkflowRuntimeException.java | 4 +-
.../airavata/workflow/model/gpel/DSCUtil.java | 4 +-
.../workflow/model/gpel/script/BPELScript.java | 4 +-
.../model/gpel/script/BPELScriptType.java | 4 +-
.../model/gpel/script/WorkflowWSDL.java | 4 +-
.../workflow/model/graph/ControlEdge.java | 4 +-
.../workflow/model/graph/ControlPort.java | 4 +-
.../airavata/workflow/model/graph/DataEdge.java | 4 +-
.../airavata/workflow/model/graph/DataPort.java | 4 +-
.../airavata/workflow/model/graph/EPRPort.java | 4 +-
.../airavata/workflow/model/graph/Edge.java | 4 +-
.../model/graph/ForEachExecutableNode.java | 5 +-
.../airavata/workflow/model/graph/Graph.java | 4 +-
.../workflow/model/graph/GraphException.java | 4 +-
.../workflow/model/graph/GraphFactory.java | 4 +-
.../workflow/model/graph/GraphPiece.java | 4 +-
.../workflow/model/graph/GraphSchema.java | 4 +-
.../airavata/workflow/model/graph/Node.java | 4 +-
.../airavata/workflow/model/graph/Port.java | 4 +-
.../model/graph/amazon/InstanceDataPort.java | 4 +-
.../model/graph/amazon/InstanceNode.java | 4 +-
.../model/graph/amazon/ResourceNode.java | 4 +-
.../graph/amazon/TerminateInstanceNode.java | 4 +-
.../model/graph/dynamic/BasicTypeMapping.java | 4 +-
.../model/graph/dynamic/DynamicNode.java | 4 +-
.../model/graph/dynamic/DynamicPort.java | 4 +-
.../model/graph/dynamic/PortAddable.java | 4 +-
.../model/graph/dynamic/SchemaCompilerUtil.java | 4 +-
.../workflow/model/graph/impl/EdgeImpl.java | 4 +-
.../workflow/model/graph/impl/GraphImpl.java | 4 +-
.../workflow/model/graph/impl/NodeImpl.java | 4 +-
.../workflow/model/graph/impl/PortImpl.java | 4 +-
.../graph/subworkflow/SubWorkflowNode.java | 4 +-
.../workflow/model/graph/system/BlockNode.java | 4 +-
.../model/graph/system/ConstantNode.java | 4 +-
.../model/graph/system/DifferedInputNode.java | 7 +-
.../model/graph/system/DoWhileNode.java | 4 +-
.../model/graph/system/EndBlockNode.java | 4 +-
.../model/graph/system/EndDoWhileNode.java | 4 +-
.../model/graph/system/EndForEachNode.java | 4 +-
.../workflow/model/graph/system/EndifNode.java | 4 +-
.../workflow/model/graph/system/ExitNode.java | 4 +-
.../model/graph/system/ForEachNode.java | 4 +-
.../workflow/model/graph/system/IfNode.java | 4 +-
.../workflow/model/graph/system/InputNode.java | 4 +-
.../workflow/model/graph/system/MemoNode.java | 4 +-
.../workflow/model/graph/system/OutputNode.java | 4 +-
.../model/graph/system/ParameterNode.java | 4 +-
.../model/graph/system/ReceiveNode.java | 4 +-
.../model/graph/system/S3InputNode.java | 4 +-
.../model/graph/system/StreamSourceNode.java | 4 +-
.../model/graph/system/SystemDataPort.java | 4 +-
.../workflow/model/graph/system/SystemNode.java | 4 +-
.../workflow/model/graph/util/GraphUtil.java | 4 +-
.../workflow/model/graph/ws/WSGraph.java | 4 +-
.../workflow/model/graph/ws/WSGraphFactory.java | 4 +-
.../workflow/model/graph/ws/WSNode.java | 4 +-
.../workflow/model/graph/ws/WSPort.java | 4 +-
.../workflow/model/graph/ws/WorkflowNode.java | 4 +-
.../workflow/model/ode/ODEBPELTransformer.java | 19 +++
.../airavata/workflow/model/ode/ODEClient.java | 19 +++
.../model/ode/ODEDeploymentDescriptor.java | 19 +++
.../workflow/model/ode/ODEWSDLTransformer.java | 19 +++
.../workflow/model/ode/WSDLCleaner.java | 19 +++
.../model/utils/ApplicationVersion.java | 4 +-
.../workflow/model/utils/FileConstants.java | 4 +-
.../workflow/model/utils/MessageConstants.java | 4 +-
.../workflow/model/utils/WorkflowConstants.java | 4 +-
.../model/wf/InvalidDataFormatException.java | 4 +-
.../workflow/model/wf/TridentTransformer.java | 4 +-
.../airavata/workflow/model/wf/Workflow.java | 4 +-
.../workflow/model/wf/WorkflowData.java | 4 +-
.../model/wf/WorkflowExecutionState.java | 4 +-
.../workflow/model/wf/WorkflowInput.java | 4 +-
.../workflow/model/xsd/GFacSimpleTypesXSD.java | 4 +-
.../model/xsd/LeadContextHeaderXSD.java | 4 +-
.../workflow/model/xsd/LeadCrosscutXSD.java | 4 +-
modules/workflow/pom.xml | 31 +++--
modules/workflow/workflow-core/pom.xml | 31 +++--
.../airavata/workflow/core/WorkflowBuilder.java | 4 +-
.../workflow/core/WorkflowEnactmentService.java | 4 +-
.../airavata/workflow/core/WorkflowFactory.java | 4 +-
.../airavata/workflow/core/WorkflowInfo.java | 3 +-
.../workflow/core/WorkflowInterpreter.java | 4 +-
.../apache/airavata/workflow/core/XMLUtil.java | 4 +-
.../airavata/workflow/core/XmlFormatter.java | 4 +-
.../workflow/core/dag/edge/DirectedEdge.java | 4 +-
.../airavata/workflow/core/dag/edge/Edge.java | 4 +-
.../core/dag/nodes/ApplicationNode.java | 4 +-
.../core/dag/nodes/ApplicationNodeImpl.java | 4 +-
.../workflow/core/dag/nodes/InputNode.java | 4 +-
.../workflow/core/dag/nodes/InputNodeImpl.java | 4 +-
.../workflow/core/dag/nodes/NodeType.java | 4 +-
.../workflow/core/dag/nodes/OutputNode.java | 4 +-
.../workflow/core/dag/nodes/OutputNodeImpl.java | 4 +-
.../workflow/core/dag/nodes/WorkflowNode.java | 4 +-
.../airavata/workflow/core/dag/port/InPort.java | 4 +-
.../workflow/core/dag/port/InputPortIml.java | 4 +-
.../workflow/core/dag/port/OutPort.java | 4 +-
.../workflow/core/dag/port/OutPortImpl.java | 4 +-
.../airavata/workflow/core/dag/port/Port.java | 4 +-
.../core/parser/JsonWorkflowParser.java | 4 +-
.../workflow/core/parser/ParserException.java | 3 +-
.../workflow/core/parser/WorkflowParser.java | 4 +-
.../airavata/workflow/core/XMLUtilTest.java | 5 +-
.../core/parser/JsonWorkflowParserTest.java | 4 +-
modules/xbaya-gui/pom.xml | 26 +++-
.../apache/airavata/xbaya/ThriftClientData.java | 4 +-
.../airavata/xbaya/ThriftServiceType.java | 4 +-
.../java/org/apache/airavata/xbaya/XBaya.java | 4 +-
.../airavata/xbaya/XBayaConfiguration.java | 4 +-
.../apache/airavata/xbaya/XBayaConstants.java | 4 +-
.../org/apache/airavata/xbaya/XBayaEngine.java | 4 +-
.../org/apache/airavata/xbaya/XBayaVersion.java | 4 +-
.../component/registry/ComponentController.java | 4 +-
.../registry/ComponentRegistryLoader.java | 4 +-
.../xbaya/concurrent/PredicatedExecutable.java | 5 +-
.../xbaya/concurrent/PredicatedTaskRunner.java | 5 +-
.../xbaya/core/amazon/AmazonCredential.java | 4 +-
.../xbaya/core/amazon/EC2InstanceResult.java | 4 +-
.../xbaya/core/generators/BPELFiler.java | 4 +-
.../xbaya/core/generators/ImageFiler.java | 4 +-
.../xbaya/core/generators/JythonFiler.java | 4 +-
.../xbaya/core/generators/ODEScriptFiler.java | 4 +-
.../xbaya/core/generators/ScuflFiler.java | 4 +-
.../xbaya/core/generators/WorkflowFiler.java | 4 +-
.../xbaya/core/generators/XmlBeansFiler.java | 4 +-
.../core/ide/XBayaExecutionModeListener.java | 4 +-
.../xbaya/core/workflow/ParameterListModel.java | 4 +-
.../xbaya/datadriven/WorkflowHarvester.java | 4 +-
.../airavata/xbaya/file/XBayaPathConstants.java | 4 +-
.../airavata/xbaya/gfac/GFacRegistryClient.java | 4 +-
.../airavata/xbaya/gfac/SimpleWSClient.java | 4 +-
.../xbaya/globus/FileTransferConstants.java | 4 +-
.../xbaya/globus/GridFTPFileTransferClient.java | 19 +++
.../xbaya/graph/controller/NodeController.java | 4 +-
.../xbaya/interpretor/ExperimentTemplate.java | 19 +++
.../GUIWorkflowInterpreterInteractorImpl.java | 19 +++
.../xbaya/interpretor/HeaderConstants.java | 4 +-
.../SSWorkflowInterpreterInteractorImpl.java | 19 +++
.../StandaloneNotificationSender.java | 4 +-
.../WorkFlowInterpreterException.java | 4 +-
.../interpretor/WorkflowExecutionMessage.java | 4 +-
.../interpretor/WorkflowExecutionTemplate.java | 19 +++
.../xbaya/interpretor/WorkflowInterpreter.java | 19 +++
.../WorkflowInterpreterConfiguration.java | 19 +++
.../WorkflowInterpreterInteractor.java | 19 +++
.../interpretor/WorkflowInterpreterInvoker.java | 4 +-
.../WorkflowInterpretorEventListener.java | 19 +++
...WorkflowInterpretorMessageReceiverInOut.java | 19 +++
.../WorkflowInterpretorSkeleton.java | 19 +++
.../xbaya/jython/lib/GFacServiceCreator.java | 4 +-
.../xbaya/jython/lib/NotificationSender.java | 19 +++
.../xbaya/jython/lib/ServiceNotifiable.java | 4 +-
.../jython/lib/ServiceNotificationSender.java | 19 +++
.../StandaloneServiceNotificationSender.java | 4 +-
.../xbaya/jython/lib/WorkflowNotifiable.java | 4 +-
.../xbaya/jython/runner/JythonClassLoader.java | 4 +-
.../jython/runner/JythonOneTimeRunner.java | 4 +-
.../jython/runner/JythonOneTimeRunnerImpl.java | 4 +-
.../xbaya/jython/runner/JythonRunner.java | 4 +-
.../xbaya/jython/script/JythonScript.java | 4 +-
.../xbaya/menues/tools/ToolsMenuItem.java | 4 +-
.../airavata/xbaya/messaging/EventData.java | 4 +-
.../xbaya/messaging/EventDataListener.java | 4 +-
.../xbaya/messaging/EventDataRepository.java | 4 +-
.../airavata/xbaya/messaging/Monitor.java | 4 +-
.../xbaya/messaging/MonitorException.java | 4 +-
.../xbaya/messaging/NotificationHandler.java | 4 +-
.../airavata/xbaya/messaging/event/Event.java | 4 +-
.../xbaya/messaging/event/EventListener.java | 4 +-
.../xbaya/messaging/event/EventProducer.java | 4 +-
.../xbaya/modifier/WorkflowModifier.java | 4 +-
.../xbaya/registry/PasswordCallbackImpl.java | 19 +++
.../xbaya/scufl/script/ScuflScript.java | 19 +++
.../xbaya/test/util/WorkflowCreator.java | 19 +++
.../org/apache/airavata/xbaya/ui/XBayaGUI.java | 4 +-
.../ui/actions/AbstractBrowserActionItem.java | 4 +-
.../ui/actions/registry/browser/AddAction.java | 4 +-
.../actions/registry/browser/BrowserAction.java | 4 +-
.../ui/actions/registry/browser/CopyAction.java | 4 +-
.../actions/registry/browser/DeleteAction.java | 4 +-
.../ui/actions/registry/browser/EditAction.java | 4 +-
.../actions/registry/browser/ImportAction.java | 4 +-
.../actions/registry/browser/RefreshAction.java | 4 +-
.../ui/actions/registry/browser/ViewAction.java | 4 +-
.../airavata/xbaya/ui/dialogs/AboutWindow.java | 4 +-
.../airavata/xbaya/ui/dialogs/ErrorWindow.java | 4 +-
.../ui/dialogs/GlobusFileTransferWindow.java | 19 +++
.../airavata/xbaya/ui/dialogs/TextWindow.java | 4 +-
.../airavata/xbaya/ui/dialogs/WaitDialog.java | 4 +-
.../airavata/xbaya/ui/dialogs/XBayaDialog.java | 4 +-
.../dialogs/amazon/AmazonEC2InvokerWindow.java | 4 +-
.../ui/dialogs/amazon/AmazonS3UtilsWindow.java | 4 +-
.../xbaya/ui/dialogs/amazon/BucketsLoader.java | 4 +-
.../dialogs/amazon/ChangeCredentialWindow.java | 4 +-
.../amazon/EC2InstancesManagementWindow.java | 4 +-
.../ui/dialogs/amazon/EC2LaunchWindow.java | 4 +-
.../ui/dialogs/amazon/InstancesLoader.java | 4 +-
.../xbaya/ui/dialogs/amazon/S3Downloader.java | 4 +-
.../xbaya/ui/dialogs/amazon/S3Uploader.java | 4 +-
.../ui/dialogs/component/URLRegistryWindow.java | 4 +-
.../ui/dialogs/component/WebResigtryWindow.java | 4 +-
.../amazon/InstanceConfigurationDialog.java | 4 +-
.../system/ConstantConfigurationDialog.java | 4 +-
.../DifferedInputConfigurationDialog.java | 4 +-
.../graph/system/DoWhileConfigrationDialog.java | 4 +-
.../system/EndBlockConfigurationDialog.java | 4 +-
.../system/EndDoWhileConfigurationDialog.java | 4 +-
.../system/EndForEachConfigurationDialog.java | 4 +-
.../graph/system/EndifConfigurationDialog.java | 4 +-
.../system/ForEachConfigurationDialog.java | 4 +-
.../graph/system/IfConfigurationDialog.java | 4 +-
.../graph/system/InputConfigurationDialog.java | 4 +-
.../graph/system/MemoConfigurationDialog.java | 4 +-
.../graph/system/OutputConfigurationDialog.java | 4 +-
.../system/ReceiveConfigurationDialog.java | 4 +-
.../ui/dialogs/graph/system/S3FileChooser.java | 4 +-
.../system/StreamSourceConfigurationDialog.java | 4 +-
.../graph/ws/ServiceInteractionWindow.java | 4 +-
.../xbaya/ui/dialogs/graph/ws/WSNodeWindow.java | 4 +-
.../monitor/MonitorConfigurationWindow.java | 4 +-
.../xbaya/ui/dialogs/monitor/MonitorWindow.java | 4 +-
.../dialogs/registry/NewRegistryUserDialog.java | 4 +-
.../ui/dialogs/registry/RegistryWindow.java | 4 +-
.../registry/browser/JCRBrowserDialog.java | 4 +-
.../workflow/ParameterPropertyWindow.java | 4 +-
.../dialogs/workflow/WorkflowImportWindow.java | 4 +-
.../workflow/WorkflowPropertyWindow.java | 4 +-
.../xbaya/ui/experiment/ExperimentMenu.java | 4 +-
.../ui/experiment/LaunchApplicationWindow.java | 4 +-
.../ui/experiment/RegistrySearchResult.java | 4 +-
.../RegistryWorkflowPublisherWindow.java | 4 +-
.../WorkflowInterpreterLaunchWindow.java | 4 +-
.../apache/airavata/xbaya/ui/graph/EdgeGUI.java | 4 +-
.../airavata/xbaya/ui/graph/GraphCanvas.java | 4 +-
.../xbaya/ui/graph/GraphCanvasEvent.java | 4 +-
.../xbaya/ui/graph/GraphCanvasListener.java | 4 +-
.../airavata/xbaya/ui/graph/GraphGUI.java | 4 +-
.../airavata/xbaya/ui/graph/GraphPieceGUI.java | 4 +-
.../apache/airavata/xbaya/ui/graph/NodeGUI.java | 4 +-
.../airavata/xbaya/ui/graph/Paintable.java | 4 +-
.../apache/airavata/xbaya/ui/graph/PortGUI.java | 4 +-
.../xbaya/ui/graph/amazon/InstanceNodeGUI.java | 4 +-
.../graph/amazon/TerminateInstanceNodeGUI.java | 4 +-
.../graph/subworkflow/SubWorkflowNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/BlockNodeGUI.java | 4 +-
.../ui/graph/system/ConfigurableNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ConstantNodeGUI.java | 4 +-
.../ui/graph/system/DifferedInputHandler.java | 3 +-
.../ui/graph/system/DifferedInputNodeGUI.java | 3 +-
.../xbaya/ui/graph/system/DoWhileNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/EndBlockNodeGUI.java | 4 +-
.../ui/graph/system/EndDoWhileNodeGUI.java | 4 +-
.../ui/graph/system/EndForEachNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/EndifNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ExitNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ForEachNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/IfNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/InputNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/MemoNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/OutputNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/ReceiveNodeGUI.java | 4 +-
.../xbaya/ui/graph/system/S3InputNodeGUI.java | 4 +-
.../ui/graph/system/StreamSourceNodeGUI.java | 4 +-
.../airavata/xbaya/ui/graph/ws/WSNodeGUI.java | 4 +-
.../xbaya/ui/graph/ws/WorkflowNodeGUI.java | 4 +-
.../xbaya/ui/menues/AmazonEC2MenuItem.java | 4 +-
.../xbaya/ui/menues/ApplicationMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/EditMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/MenuIcons.java | 4 +-
.../xbaya/ui/menues/RegistryMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/RunMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/ViewMenuItem.java | 4 +-
.../airavata/xbaya/ui/menues/XBayaMenu.java | 4 +-
.../airavata/xbaya/ui/menues/XBayaMenuItem.java | 4 +-
.../xbaya/ui/monitor/MonitorEventHandler.java | 4 +-
.../xbaya/ui/monitor/MonitorStarter.java | 4 +-
.../xbaya/ui/monitor/ResourcePaintable.java | 4 +-
.../airavata/xbaya/ui/utils/Cancelable.java | 4 +-
.../airavata/xbaya/ui/utils/DrawUtils.java | 4 +-
.../airavata/xbaya/ui/utils/ErrorMessages.java | 4 +-
.../xbaya/ui/views/ComponentViewer.java | 4 +-
.../xbaya/ui/views/JCRBrowserPanel.java | 19 +++
.../airavata/xbaya/ui/views/MonitorPanel.java | 4 +-
.../xbaya/ui/views/ParameterPropertyPanel.java | 4 +-
.../airavata/xbaya/ui/views/PortViewer.java | 4 +-
.../airavata/xbaya/ui/widgets/GridPanel.java | 4 +-
.../airavata/xbaya/ui/widgets/ScrollPanel.java | 4 +-
.../xbaya/ui/widgets/TabLabelButton.java | 4 +-
.../xbaya/ui/widgets/TableRenderable.java | 4 +-
.../xbaya/ui/widgets/ToolbarButton.java | 4 +-
.../xbaya/ui/widgets/XBayaComboBox.java | 4 +-
.../xbaya/ui/widgets/XBayaComponent.java | 4 +-
.../airavata/xbaya/ui/widgets/XBayaLabel.java | 3 +-
.../xbaya/ui/widgets/XBayaLinkButton.java | 4 +-
.../airavata/xbaya/ui/widgets/XBayaList.java | 4 +-
.../xbaya/ui/widgets/XBayaTextArea.java | 4 +-
.../xbaya/ui/widgets/XBayaTextComponent.java | 4 +-
.../xbaya/ui/widgets/XBayaTextField.java | 4 +-
.../airavata/xbaya/ui/widgets/XBayaToolBar.java | 4 +-
.../xbaya/ui/widgets/XbayaEnhancedList.java | 4 +-
.../xbaya/ui/widgets/amazon/S3Tree.java | 4 +-
.../xbaya/ui/widgets/amazon/S3TreeModel.java | 4 +-
.../ui/widgets/component/ComponentSelector.java | 4 +-
.../component/ComponentSelectorEvent.java | 4 +-
.../component/ComponentSelectorListener.java | 4 +-
.../component/ComponentSourceTransferable.java | 4 +-
.../widgets/component/ComponentTreeModel.java | 4 +-
.../ui/widgets/component/ComponentTreeNode.java | 4 +-
.../apache/airavata/xbaya/util/AmazonUtil.java | 4 +-
.../org/apache/airavata/xbaya/util/Data.java | 4 +-
.../apache/airavata/xbaya/util/GOConstants.java | 4 +-
.../airavata/xbaya/util/GlobusOnlineUtils.java | 19 +++
.../airavata/xbaya/util/RegistryConstants.java | 4 +-
.../airavata/xbaya/util/TransferFile.java | 4 +-
.../apache/airavata/xbaya/util/XBayaUtil.java | 4 +-
.../airavata/xbaya/workflow/WorkflowClient.java | 4 +-
.../xbaya/workflow/WorkflowEngineException.java | 4 +-
.../xbaya/workflow/proxy/ProxyWSDL.java | 4 +-
.../xbaya/workflow/proxy/WorkflowClient.java | 4 +-
.../xbaya/workflow/proxy/WorkflowContext.java | 4 +-
.../workflow/proxy/WorkflowProxyException.java | 4 +-
.../interpreter/ComplexForEachWorkflowTest.java | 19 +++
.../xbaya/interpreter/ComplexMathService.java | 4 +-
.../interpreter/ComplexMathWorkflowTest.java | 19 +++
.../interpreter/CrossProductWorkflowTest.java | 19 +++
.../airavata/xbaya/interpreter/EchoService.java | 3 +-
.../xbaya/interpreter/ForEachWorkflowTest.java | 19 +++
.../interpreter/LevenshteinDistanceService.java | 4 +-
.../airavata/xbaya/interpreter/Listener.java | 19 +++
.../xbaya/interpreter/NotificationSender.java | 19 +++
.../xbaya/interpreter/RegistryServiceTest.java | 19 +++
.../interpreter/SimpleForEachWorkflowTest.java | 19 +++
.../interpreter/SimpleMathWorkflowTest.java | 19 +++
.../xbaya/interpreter/WorkflowTest.java | 19 +++
.../xbaya/interpreter/WorkflowTrackingTest.java | 19 +++
.../xbaya/interpreter/XBayaClientTest.java | 5 +-
.../interpreter/XBayaConsolidatedTestSuite.java | 19 +++
.../xbaya/interpreter/utils/ConfigKeys.java | 5 +-
.../xbaya/interpreter/utils/TestUtilServer.java | 19 +++
.../interpreter/utils/WorkflowTestUtils.java | 19 +++
pom.xml | 99 +++++++++++---
sandbox/amqpwstunnel/python/amqpwstunnel.py | 20 +++
sandbox/amqpwstunnel/wstest.html | 21 +++
sandbox/job-status-rest-server/api_test.py | 20 +++
sandbox/job-status-rest-server/app.py | 20 +++
.../example/logfile_checker/generate_logs.sh | 20 +++
.../example/logfile_checker/log_consumer.py | 20 +++
.../example/logfile_checker/log_streamer.py | 20 +++
.../simstream/example/logfile_checker/test.txt | 20 +++
.../example/mem_streamer/memory_consumption.py | 20 +++
.../example/mem_streamer/memory_streamer.py | 20 +++
.../application/alanine_dipeptide.py | 20 +++
.../example/openmm_example/openmm_consumer.py | 20 +++
.../openmm_example/openmm_log_consumer.py | 20 +++
.../openmm_example/openmm_rmsd_consumer.py | 20 +++
.../example/openmm_example/openmm_streamer.py | 20 +++
.../simstream/example/openmm_example/test.txt | 20 +++
sandbox/simstream/setup.py | 20 +++
sandbox/simstream/simstream/__init__.py | 20 +++
sandbox/simstream/simstream/datacollector.py | 20 +++
sandbox/simstream/simstream/datareporter.py | 20 +++
sandbox/simstream/simstream/eventhandler.py | 20 +++
sandbox/simstream/simstream/eventmonitor.py | 20 +++
.../simstream/simstream/pikaasyncconsumer.py | 20 +++
sandbox/simstream/simstream/pikaproducer.py | 20 +++
sandbox/simstream/simstream/simstream.py | 20 +++
.../component-cpis/generate-cpi-stubs.sh | 30 ++--
.../generate-thrift-stubs.sh | 30 ++--
tools/gsissh-cli-tools/README.txt | 20 +++
tools/gsissh-cli-tools/pom.xml | 29 ++--
.../ssh/cli/SSHApiClientWithMyProxyAuth.java | 4 +-
tools/phoebus-integration/pom.xml | 26 +++-
.../impl/PhoebusGridConfigurationHandler.java | 4 +-
.../airavata/core/gfac/utils/PhoebusUtils.java | 4 +-
tools/pom.xml | 26 +++-
tools/rabbitmq-download-start.sh | 20 +++
1679 files changed, 12712 insertions(+), 5992 deletions(-)
----------------------------------------------------------------------
[36/50] [abbrv] airavata git commit: fixing bug in project and
experiment search when the list is empty
Posted by ma...@apache.org.
fixing bug in project and experiment search when the list is empty
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2fb19efc
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2fb19efc
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2fb19efc
Branch: refs/heads/develop
Commit: 2fb19efccf804f4710cedcb1dad891e3cc9c4170
Parents: 1565881
Author: scnakandala <su...@gmail.com>
Authored: Tue Apr 25 17:20:39 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Apr 25 17:20:39 2017 -0400
----------------------------------------------------------------------
.../core/experiment/catalog/resources/WorkerResource.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2fb19efc/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
index 9154cae..1d2c6db 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/experiment/catalog/resources/WorkerResource.java
@@ -522,6 +522,8 @@ public class WorkerResource extends AbstractExpCatResource {
for (String id : accessibleIds)
query += ("'" + id + "'" + ",");
query = query.substring(0, query.length() - 1) + ") AND ";
+ }else{
+ return new ArrayList<>();
}
if (filters != null && filters.size() != 0) {
@@ -613,6 +615,8 @@ public class WorkerResource extends AbstractExpCatResource {
for (String id : accessibleIds)
query += ("'" + id + "'" + ",");
query = query.substring(0, query.length() - 1) + ") AND ";
+ }else{
+ return new ArrayList<>();
}
if (filters.get(ExperimentStatusConstants.STATE) != null) {
[19/50] [abbrv] airavata git commit: AIRAVATA-2363 Removing slf4j
bindings except logback
Posted by ma...@apache.org.
AIRAVATA-2363 Removing slf4j bindings except logback
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9578e5c3
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9578e5c3
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9578e5c3
Branch: refs/heads/develop
Commit: 9578e5c3d32d01eb1c455c248275696a6856f430
Parents: ab6d02d
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 11 11:31:51 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 11 17:17:25 2017 -0400
----------------------------------------------------------------------
airavata-api/airavata-api-server/pom.xml | 5 -----
airavata-api/airavata-api-stubs/pom.xml | 5 -----
airavata-api/airavata-data-models/pom.xml | 5 -----
airavata-api/airavata-model-utils/pom.xml | 5 -----
modules/cloud/cloud-provisioning/pom.xml | 5 -----
modules/cluster-monitoring/pom.xml | 4 ----
modules/commons/pom.xml | 4 ----
.../credential-store-service/pom.xml | 4 ----
.../credential-store-stubs/pom.xml | 5 -----
modules/distribution/pom.xml | 17 +++++++++++++++++
modules/gfac/gfac-client/pom.xml | 5 -----
modules/gfac/gfac-service/pom.xml | 5 -----
modules/orchestrator/orchestrator-client/pom.xml | 5 -----
modules/orchestrator/orchestrator-core/pom.xml | 5 -----
modules/orchestrator/orchestrator-service/pom.xml | 5 -----
modules/registry/registry-server/pom.xml | 7 -------
modules/security/pom.xml | 4 ----
modules/server/pom.xml | 4 ----
.../sharing-registry-server/pom.xml | 6 ++++++
19 files changed, 23 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-api-server/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/pom.xml b/airavata-api/airavata-api-server/pom.xml
index 213a638..0d9ea97 100644
--- a/airavata-api/airavata-api-server/pom.xml
+++ b/airavata-api/airavata-api-server/pom.xml
@@ -99,11 +99,6 @@
<version>${thrift.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-api-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-stubs/pom.xml b/airavata-api/airavata-api-stubs/pom.xml
index dc1714a..79d8bb1 100644
--- a/airavata-api/airavata-api-stubs/pom.xml
+++ b/airavata-api/airavata-api-stubs/pom.xml
@@ -52,11 +52,6 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-data-models/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/pom.xml b/airavata-api/airavata-data-models/pom.xml
index 26bde47..d03ef52 100644
--- a/airavata-api/airavata-data-models/pom.xml
+++ b/airavata-api/airavata-data-models/pom.xml
@@ -43,11 +43,6 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/airavata-api/airavata-model-utils/pom.xml
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-model-utils/pom.xml b/airavata-api/airavata-model-utils/pom.xml
index a36ae6e..4e877c1 100644
--- a/airavata-api/airavata-model-utils/pom.xml
+++ b/airavata-api/airavata-model-utils/pom.xml
@@ -43,11 +43,6 @@
<artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/cloud/cloud-provisioning/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cloud/cloud-provisioning/pom.xml b/modules/cloud/cloud-provisioning/pom.xml
index 7981a10..673e617 100644
--- a/modules/cloud/cloud-provisioning/pom.xml
+++ b/modules/cloud/cloud-provisioning/pom.xml
@@ -51,11 +51,6 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.21</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.7.21</version>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/cluster-monitoring/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cluster-monitoring/pom.xml b/modules/cluster-monitoring/pom.xml
index 2797b04..a83d38d 100644
--- a/modules/cluster-monitoring/pom.xml
+++ b/modules/cluster-monitoring/pom.xml
@@ -78,10 +78,6 @@
<artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/commons/pom.xml
----------------------------------------------------------------------
diff --git a/modules/commons/pom.xml b/modules/commons/pom.xml
index 54ca4c7..b00c9ee 100644
--- a/modules/commons/pom.xml
+++ b/modules/commons/pom.xml
@@ -114,10 +114,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
<version>${curator.version}</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/credential-store/credential-store-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/pom.xml b/modules/credential-store/credential-store-service/pom.xml
index 48602b2..b7e7b2c 100644
--- a/modules/credential-store/credential-store-service/pom.xml
+++ b/modules/credential-store/credential-store-service/pom.xml
@@ -78,10 +78,6 @@
<!--<version>5.1.34</version>-->
<!--</dependency>-->
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/credential-store/credential-store-stubs/pom.xml
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-stubs/pom.xml b/modules/credential-store/credential-store-stubs/pom.xml
index 67308f2..6ce97b9 100644
--- a/modules/credential-store/credential-store-stubs/pom.xml
+++ b/modules/credential-store/credential-store-stubs/pom.xml
@@ -43,11 +43,6 @@
<version>${thrift.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-commons</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index d89bbfc..24d8e88 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -455,6 +455,16 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
@@ -477,6 +487,7 @@
<artifactId>kafka-clients</artifactId>
<version>${kafka-clients.version}</version>
</dependency>
+ <!-- Use logback as the runtime binding for SLF4J -->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
@@ -508,6 +519,12 @@
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-client-samples</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/gfac/gfac-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-client/pom.xml b/modules/gfac/gfac-client/pom.xml
index c605a3e..9f98fbd 100644
--- a/modules/gfac/gfac-client/pom.xml
+++ b/modules/gfac/gfac-client/pom.xml
@@ -42,11 +42,6 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/gfac/gfac-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-service/pom.xml b/modules/gfac/gfac-service/pom.xml
index b879f90..67d0836 100644
--- a/modules/gfac/gfac-service/pom.xml
+++ b/modules/gfac/gfac-service/pom.xml
@@ -42,11 +42,6 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
<!--<dependency>-->
<!--<groupId>org.apache.airavata</groupId>-->
<!--<artifactId>airavata-client-api</artifactId>-->
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/orchestrator/orchestrator-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client/pom.xml b/modules/orchestrator/orchestrator-client/pom.xml
index 78abd60..9f7154a 100644
--- a/modules/orchestrator/orchestrator-client/pom.xml
+++ b/modules/orchestrator/orchestrator-client/pom.xml
@@ -42,11 +42,6 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/orchestrator/orchestrator-core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-core/pom.xml b/modules/orchestrator/orchestrator-core/pom.xml
index cc4d213..791d27d 100644
--- a/modules/orchestrator/orchestrator-core/pom.xml
+++ b/modules/orchestrator/orchestrator-core/pom.xml
@@ -37,11 +37,6 @@
<dependencies>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.5</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-cpi</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/orchestrator/orchestrator-service/pom.xml
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/pom.xml b/modules/orchestrator/orchestrator-service/pom.xml
index dfcb33f..1f0cac3 100644
--- a/modules/orchestrator/orchestrator-service/pom.xml
+++ b/modules/orchestrator/orchestrator-service/pom.xml
@@ -48,11 +48,6 @@
<version>${thrift.version}</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-orchestrator-core</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/registry/registry-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/registry/registry-server/pom.xml b/modules/registry/registry-server/pom.xml
index 4d3555a..39e0cf7 100644
--- a/modules/registry/registry-server/pom.xml
+++ b/modules/registry/registry-server/pom.xml
@@ -37,13 +37,6 @@
<module>registry-api-service</module>
<module>registry-api-stubs</module>
</modules>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>${org.slf4j.version}</version>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/security/pom.xml
----------------------------------------------------------------------
diff --git a/modules/security/pom.xml b/modules/security/pom.xml
index d0c4d05..92ed231 100644
--- a/modules/security/pom.xml
+++ b/modules/security/pom.xml
@@ -44,10 +44,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.2.1</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/server/pom.xml b/modules/server/pom.xml
index 0602148..0bedd4b 100644
--- a/modules/server/pom.xml
+++ b/modules/server/pom.xml
@@ -38,10 +38,6 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
http://git-wip-us.apache.org/repos/asf/airavata/blob/9578e5c3/modules/sharing-registry/sharing-registry-server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/sharing-registry/sharing-registry-server/pom.xml b/modules/sharing-registry/sharing-registry-server/pom.xml
index 69aa3f0..e6e0f39 100644
--- a/modules/sharing-registry/sharing-registry-server/pom.xml
+++ b/modules/sharing-registry/sharing-registry-server/pom.xml
@@ -61,6 +61,12 @@
<groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId>
<version>5.4.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openjpa</groupId>
[13/50] [abbrv] airavata git commit: Added scigap pga config;
for testing using SSL on beta subdomains
Posted by ma...@apache.org.
Added scigap pga config; for testing using SSL on beta subdomains
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/22e97985
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/22e97985
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/22e97985
Branch: refs/heads/develop
Commit: 22e979857078313c3dfdb53da52241a1e491a9a5
Parents: 67eed40
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 5 16:55:54 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 5 16:55:54 2017 -0400
----------------------------------------------------------------------
.../production/pga_config/scigap/vars.yml | 59 ++++++++++++++++++++
.../production/pga_config/scigap/vault.yml | 18 ++++++
.../production/pga_config/seagrid/vars.yml | 13 +++--
.../production/pga_config/testdrive/vars.yml | 14 +++--
dev-tools/ansible/pga-scigap-prod.yml | 1 +
5 files changed, 95 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/22e97985/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
new file mode 100644
index 0000000..5e77eea
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -0,0 +1,59 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/scigap"
+#vhost_servername: "scigap.org"
+vhost_servername: "beta.scigap.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+#ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
+#ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
+#ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
+ssl_certificate_file: "/etc/letsencrypt/live/beta.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/beta.scigap.org/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: ""
+admin_username: "scigap_admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "scigap"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/scigap"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+
+## Portal related variables
+super_admin_portal: "true"
+admin_emails: "['sgg@iu.edu','eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "scigap"
+portal_theme_repo: "https://github.com/SciGaP/scigap-portal-theme"
+portal_title: "SciGaP Admin Portal"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/22e97985/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
new file mode 100644
index 0000000..a30ba69
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+64653833663230383465353266623839636163316364356431373837653638306130616130383963
+3132323230336531646162616464633061623830653462640a663263373436653831643063616638
+31383336306438613732613839396336626566313737316363636430393136633632613130326237
+6539306131633433660a633734643961633161323161643433613938626166343961663337376266
+63323163343633666330313666306234373663303738303033343662366139636534646162663230
+66343034666431326666626261303061343334643461343633663436616430323339613732306437
+31633431613463666139646638643037336435346564383631653664633135333734356434373461
+35373963313361393331656463386234383962663039636164626239393465333137333839616439
+38356531643032363839363862376263336565396464623332336533333837333937623635636366
+61313532633161336631363561353139376637623562346438623865343332643232653036303536
+62333865396439633435333533623338323664326231623136383761316336653334653464336363
+31313261366162386533646365386230646338646466623730306166366235623466323066656239
+66306166363630633733303261616335383839323163313239393330363730663262616133613737
+30363537623061333030363162316138353361326430636534313034613032653433326130393134
+37636364633533363263363833626237613639313638383536643637303435663831613735343261
+36363937356332313237343563356134366162633338616263613338393736646561303135383362
+35616562353739343661306330376334376361396266646230373065326364336662
http://git-wip-us.apache.org/repos/asf/airavata/blob/22e97985/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index 046a119..60e7cc6 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -27,12 +27,15 @@ doc_root_dir: "/var/www/portals/{{ gateway_id }}"
# TODO: disable SSL temporarily for testing
#vhost_servername: "seagrid.org"
#vhost_serveralias: "www.portal.seagrid.org"
-vhost_servername: "gf4.ucs.indiana.edu"
-vhost_ssl: False
+vhost_servername: "beta.seagrid.org"
+vhost_ssl: True
# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
+#ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
+#ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
+#ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
+ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
## WSO2 IS related variables
tenant_domain: "prod.seagrid"
http://git-wip-us.apache.org/repos/asf/airavata/blob/22e97985/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index 0b6b715..2ce43c1 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -24,13 +24,17 @@ git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/testdrive"
-vhost_servername: "testdrive.airavata.org"
-vhost_serveralias: "www.testdrive.airavata.org"
+#vhost_servername: "testdrive.airavata.org"
+#vhost_serveralias: "www.testdrive.airavata.org"
+vhost_servername: "beta.testdrive.airavata.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
+#ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
+#ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
+#ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
+ssl_certificate_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/privkey.pem"
## WSO2 IS related variables
tenant_domain: "prod.testdrive"
http://git-wip-us.apache.org/repos/asf/airavata/blob/22e97985/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index e40417c..0e58808 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -21,5 +21,6 @@
---
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
...
[08/50] [abbrv] airavata git commit: Ansible handling of Apache SSL
config
Posted by ma...@apache.org.
Ansible handling of Apache SSL config
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ca9f9382
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ca9f9382
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ca9f9382
Branch: refs/heads/develop
Commit: ca9f938238fbbc79fc5ced5576fc580c49443f8f
Parents: 749a84d
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 4 17:04:36 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 4 17:04:36 2017 -0400
----------------------------------------------------------------------
.../scigap/production/group_vars/all/vars.yml | 4 ++
.../production/group_vars/pga-seagrid/vars.yml | 56 ++++++++++++++++++++
.../production/group_vars/pga-seagrid/vault.yml | 18 +++++++
.../ansible/inventories/scigap/production/hosts | 3 ++
dev-tools/ansible/roles/pga/defaults/main.yml | 5 +-
dev-tools/ansible/roles/pga/tasks/main.yml | 10 +++-
.../roles/pga/templates/pga-ssl-vhost.conf.j2 | 29 ++++++++++
.../roles/pga/templates/pga-vhost.conf.j2 | 3 ++
8 files changed, 124 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index ecc6641..3984024 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -111,6 +111,10 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
user_data_dir: "/var/www/portals/gateway-user-data"
+## Airavata Client related variables
+#airavata_server: "tls://gw77.iu.xsede.org"
+airavata_server: "tls://{{ groups['api-orch'][0] }}"
+airavata_port: "9930"
# Sharing Registry related variables
sharing_registry_host: "{{ groups['api-orch'][0] }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
new file mode 100644
index 0000000..90ac459
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+# TODO: disable SSL temporarily for testing
+#vhost_servername: "seagrid.org"
+#vhost_serveralias: "www.portal.seagrid.org"
+vhost_servername: "{{ groups['pga'][0][0] }}"
+vhost_ssl: False
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
+
+## WSO2 IS related variables
+tenant_domain: "prod.seagrid"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "seagrid"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/seagrid"
+# TODO: fix this
+gateway_data_store_resource_id: "149.165.156.11_b5f26430-14d5-4372-8a7e-39b125aa640b"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['pamidigs@iu.edu', 'sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml
new file mode 100644
index 0000000..b253227
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+66333335376433663761356636313739303836383431366135633735663262366262663737613936
+6238613036636365653530353538373031623562373335300a316462306231653531613330303030
+61383138343832616162353239303331663164326635336566663666316232366562616633316139
+6365666632373662340a666238353135396239373062383331386137353134336539386636623237
+37326237326233303437386666646138666530663766376238366263653730353938363064663336
+62336662643831653833633835653666363134303830633834336162383265666131303434346466
+32323937663766323632396631616264326232613361333834303031636239333435343563396366
+35643766376466613535383938623038653634303035323065363031303032303835343866643330
+37303462333839313265353063613937623431336635623839386137353433396136623162333233
+62633536616437376366663566393430626533323232383733353761643738376366316631353562
+35366133373866393737653665326566353963643138633630393838643363633562623430373132
+62383531356430646633323933633130623935653139363566326232653965333764363238333137
+30663863363566353035393437316135303265643165353034326664656336623930613632376237
+62393231336539656636636530643863323834363130636238323732373738316265306665643962
+62333437313064623566386438636136613461373332343462613733623736666338333064346661
+62643035636435663135613437383036663034363536646634633966666633643033303634633639
+63396139343037353433613936333962366130333336333231353836353161636365
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/inventories/scigap/production/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index 3d4d311..dbd7789 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -16,6 +16,9 @@ gf5.ucs.indiana.edu
[gfac]
gf6.ucs.indiana.edu
+[pga:children]
+pga-seagrid
+
[pga-seagrid]
gf4.ucs.indiana.edu
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 19dc062..aec2ea6 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -19,11 +19,10 @@
#
---
-pga_user: "pga"
-pga_group: "pga"
-doc_root_dir: "/var/www/html/php-gateway"
+doc_root_dir: "/var/www/{{ gateway_id }}"
user_data_dir: "/var/www/user_data"
vhost_servername: "{{ groups['pga'][0] }}"
+vhost_ssl: False
httpd_confd_file_location:
RedHat: "/etc/httpd/conf.d/pga-{{ gateway_id }}.conf"
Debian: "/etc/apache2/sites-available/pga-{{ gateway_id }}.conf"
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 3018f1c..8caa24b 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -84,8 +84,16 @@
- https
become: yes
-- name: copy httpd.conf file
+- name: copy virtual host config file
template: src=pga-vhost.conf.j2 dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
become: yes
notify:
- restart httpd
+ when: not vhost_ssl
+
+- name: copy SSL enabled virtual host config file
+ template: src=pga-ssl-vhost.conf.j2 dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
+ become: yes
+ notify:
+ - restart httpd
+ when: vhost_ssl
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
new file mode 100644
index 0000000..b55697d
--- /dev/null
+++ b/dev-tools/ansible/roles/pga/templates/pga-ssl-vhost.conf.j2
@@ -0,0 +1,29 @@
+<VirtualHost *:80>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ ## Redirect all http traffic to https
+ RewriteEngine On
+ RewriteCond %{HTTPS} off
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ DocumentRoot {{ doc_root_dir }}/public
+ <Directory "{{ doc_root_dir }}/public">
+ AllowOverride All
+ </Directory>
+ ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
+ CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
+ SSLEngine on
+ SSLCertificateFile {{ ssl_certificate_file }}
+ SSLCertificateChainFile {{ ssl_certificate_chain_file }}
+ SSLCertificateKeyFile {{ ssl_certificate_key_file }}
+</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/ca9f9382/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2 b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
index 59e8406..0305ef2 100644
--- a/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga-vhost.conf.j2
@@ -1,5 +1,8 @@
<VirtualHost *:80>
ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
DocumentRoot {{ doc_root_dir }}/public
<Directory "{{ doc_root_dir }}/public">
[18/50] [abbrv] airavata git commit: AIRAVATA-2363 Switch to logback
for logging
Posted by ma...@apache.org.
AIRAVATA-2363 Switch to logback for logging
Used conversion utility to convert old log4j.properties to logback.xml
and then made a few small tweaks:
* slf4j/logback API doesn't have FATAL level
* %X instead of %x
* %c{30} instead of %c to get abbreviated fully qualified class name
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dca8e143
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dca8e143
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dca8e143
Branch: refs/heads/develop
Commit: dca8e1431a80c20178c2ea2b1a33cea26eeaa27c
Parents: 9578e5c
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 11 15:52:50 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 11 17:17:25 2017 -0400
----------------------------------------------------------------------
.../server/src/main/resources/log4j.properties | 48 --------------
.../server/src/main/resources/logback.xml | 70 +++++++++++++-------
.../src/main/assembly/bin-assembly.xml | 2 +-
3 files changed, 48 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/dca8e143/modules/configuration/server/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/log4j.properties b/modules/configuration/server/src/main/resources/log4j.properties
deleted file mode 100644
index ee67028..0000000
--- a/modules/configuration/server/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# 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.
-#
-
-# Set root category priority to INFO and its only appender to CONSOLE.
-log4j.rootCategory=INFO, CONSOLE,LOGFILE
-log4j.rootLogger=INFO, CONSOLE, LOGFILE
-
-# Set the enterprise logger priority to FATAL
-log4j.logger.org.apache.axis2.enterprise=FATAL
-log4j.logger.org.apache.airavata=INFO
-log4j.logger.de.hunsicker.jalopy.io=FATAL
-log4j.logger.httpclient.wire.header=FATAL
-log4j.logger.org.apache.commons.httpclient=FATAL
-log4j.logger.org.apache.zookeeper=FATAL
-log4j.logger.org.globus=INFO
-# following remove grouper info logs
-log4j.logger.edu.internet2.middleware.grouper=FATAL
-log4j.logger.org.hibernate=FATAL
-
-# CONSOLE is set to be a ConsoleAppender using a PatternLayout.
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %m%n
-
-# LOGFILE is set to be a File appender using a PatternLayout.
-log4j.appender.LOGFILE=org.apache.log4j.DailyRollingFileAppender
-log4j.appender.LOGFILE.File=../logs/airavata.log
-#Rollover at midnight each day.
-log4j.appender.LOGFILE.DatePattern='.'yyyy-MM-dd
-log4j.appender.LOGFILE.Append=true
-log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout
-log4j.appender.LOGFILE.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
http://git-wip-us.apache.org/repos/asf/airavata/blob/dca8e143/modules/configuration/server/src/main/resources/logback.xml
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/logback.xml b/modules/configuration/server/src/main/resources/logback.xml
index 4153f84..fa4ae1f 100644
--- a/modules/configuration/server/src/main/resources/logback.xml
+++ b/modules/configuration/server/src/main/resources/logback.xml
@@ -1,31 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
+<!--
- <property name="DEV_HOME" value="../logs" />
- <appender name="FILE-AUDIT"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>../logs/airavata.log</file>
- <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <Pattern>
- %d{yyyy-MM-dd HH:mm:ss} [%thread] %level %logger{35} - %msg%n
- </Pattern>
- </encoder>
+ 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.
+
+-->
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>[%p] %m%n</pattern>
+ </encoder>
+ </appender>
+ <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+ <!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
+ <!--for further documentation-->
+ <File>../logs/airavata.log</File>
+ <Append>true</Append>
+ <encoder>
+ <pattern>%d [%t] %-5p %c{30} %X - %m%n</pattern>
+ </encoder>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- rollover daily -->
- <fileNamePattern>../logs/airavata.%d{yyyy-MM-dd}.%i.log
- </fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
- class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>10MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
+ <fileNamePattern>../logs/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
</rollingPolicy>
-
</appender>
-
- <root level="info">
- <appender-ref ref="FILE-AUDIT" />
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="edu.internet2.middleware.grouper" level="ERROR"/>
+ <logger name="org.globus" level="INFO"/>
+ <logger name="org.apache.commons.httpclient" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <logger name="de.hunsicker.jalopy.io" level="ERROR"/>
+ <logger name="httpclient.wire.header" level="ERROR"/>
+ <logger name="org.apache.axis2.enterprise" level="ERROR"/>
+ <root level="INFO">
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="LOGFILE"/>
</root>
-
-</configuration>
\ No newline at end of file
+</configuration>
http://git-wip-us.apache.org/repos/asf/airavata/blob/dca8e143/modules/distribution/src/main/assembly/bin-assembly.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/assembly/bin-assembly.xml b/modules/distribution/src/main/assembly/bin-assembly.xml
index b0113f2..918396e 100644
--- a/modules/distribution/src/main/assembly/bin-assembly.xml
+++ b/modules/distribution/src/main/assembly/bin-assembly.xml
@@ -112,7 +112,7 @@
<include>airavata-server.properties</include>
<include>zoo.cfg</include>
<include>registry.properties</include>
- <include>log4j.properties</include>
+ <include>logback.xml</include>
<include>host.xml</include>
<include>persistence.xml</include>
<include>provenance.sql</include>
[20/50] [abbrv] airavata git commit: SELinux enabled PGA install
Posted by ma...@apache.org.
SELinux enabled PGA install
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/dc24945a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/dc24945a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/dc24945a
Branch: refs/heads/develop
Commit: dc24945af0f8c91d3fa68fc1886bf60f4f5a583b
Parents: dca8e14
Author: Marcus Christie <ma...@apache.org>
Authored: Sat Apr 15 14:57:21 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Sat Apr 15 14:57:21 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/pga/handlers/main.yml | 4 +-
dev-tools/ansible/roles/pga/tasks/main.yml | 71 ++++++++++++++++------
2 files changed, 53 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc24945a/dev-tools/ansible/roles/pga/handlers/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/handlers/main.yml b/dev-tools/ansible/roles/pga/handlers/main.yml
index ff941a9..202da40 100644
--- a/dev-tools/ansible/roles/pga/handlers/main.yml
+++ b/dev-tools/ansible/roles/pga/handlers/main.yml
@@ -25,9 +25,9 @@
become: yes
- name: start httpd
- service: name={{ httpd_name[ansible_os_family] }} state=started
+ service: name={{ httpd_name[ansible_os_family] }} state=started enabled=yes
become: yes
- name: restart httpd
- service: name={{ httpd_name[ansible_os_family] }} state=restarted
+ service: name={{ httpd_name[ansible_os_family] }} state=restarted enabled=yes
become: yes
http://git-wip-us.apache.org/repos/asf/airavata/blob/dc24945a/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index dff3002..cb3bb7b 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -25,19 +25,10 @@
- include: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml
-# - name: Check previous deployments
-# stat: path="{{ doc_root_dir }}" get_md5=no get_checksum=no
-# register: check
-
-# Why? if it's new, we just created this dir above...
-# if not, can just pull from the git repo in the next task...
-#- name: delete previous deployments
-# file: path="{{ doc_root_dir }}" state=absent
-
- name: Git clone php gateway
- git:
+ git:
repo: "{{ pga_repo }}"
- dest: "{{ doc_root_dir }}"
+ dest: "{{ doc_root_dir }}"
version: "{{ git_branch }}"
update: yes
force: yes
@@ -47,17 +38,50 @@
file: path="{{ user_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes
become: yes
-# - name: Allow selinux outbound connection from web server
- # command: setsebool -P httpd_can_network_connect 1
+# SELinux configuration
+- name: set selinux to enforcing
+ selinux: state=enforcing policy=targeted
+ become: yes
+ when: ansible_os_family == "RedHat"
+
+- name: set selinux context to allow read on public directory
+ sefcontext:
+ target: "{{ doc_root_dir }}/public(/.*)?"
+ setype: httpd_sys_content_t
+ state: present
+ become: yes
+ notify:
+ - restart httpd
+ when: ansible_os_family == "RedHat"
+
+- name: set selinux context to allow read/write on storage directory
+ sefcontext:
+ target: "{{ doc_root_dir }}/app/storage(/.*)?"
+ setype: httpd_sys_rw_content_t
+ state: present
+ become: yes
+ notify:
+ - restart httpd
+ when: ansible_os_family == "RedHat"
+
+- name: set selinux context to allow read/write on the user data directory
+ sefcontext:
+ target: "{{ user_data_dir }}(/.*)?"
+ setype: httpd_sys_rw_content_t
+ state: present
+ become: yes
+ notify:
+ - restart httpd
+ when: ansible_os_family == "RedHat"
-#SHOULD MAKE A PROFILE RATHER THAN DISABLING. SELINUX IS *GOOD*
-# going to permissive from enforcing doesn't require a reboot
-# permissive allows all, but still logs, allowing easy build
-# of a working profile.
-- name: set selinux permissive
- selinux: state=permissive policy=default
+- name: allow httpd to connect out to the network
+ seboolean:
+ name: httpd_can_network_connect
+ state: yes
+ persistent: yes
become: yes
- register: selinux_disable
+ notify:
+ - restart httpd
when: ansible_os_family == "RedHat"
- name: Run composer update
@@ -85,6 +109,12 @@
file: path="{{ doc_root_dir }}/app/storage" state=directory mode=0777 owner="{{user}}" group="{{group}}" recurse=yes
become: yes
+# For SELinux, need to apply file contexts, but I'm not sure why since the contexts were created before the files/directories
+- name: run restorecon on those directories
+ command: restorecon -R {{ doc_root_dir }} {{ user_data_dir }}
+ become: yes
+ when: ansible_os_family == "RedHat"
+
- name: Enable https and http service on public zone
firewalld: service="{{ item }}" permanent=true state=enabled zone=public immediate=True
with_items:
@@ -110,4 +140,5 @@
authorized_key:
user: "{{user}}"
key: "{{ gateway_data_store_ssh_public_key }}"
+ become: yes
when: gateway_data_store_ssh_public_key != ""
[40/50] [abbrv] airavata git commit: Disabling data sharing for
Ultrascan PGA
Posted by ma...@apache.org.
Disabling data sharing for Ultrascan PGA
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/6791f289
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/6791f289
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/6791f289
Branch: refs/heads/develop
Commit: 6791f289e0c02956bcfc41913da332b570a7d673
Parents: c99687f
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 26 14:53:26 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 26 14:53:26 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/ultrascan/vars.yml | 2 ++
dev-tools/ansible/pga-scigap-prod.yml | 1 +
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 2 +-
4 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index 2548cb8..491b491 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -52,6 +52,8 @@ gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62
# Not using gateway storage right now
#gateway_data_store_ssh_public_key: ""
+data_sharing_enabled: "false"
+
## Portal related variables
super_admin_portal: "true"
admin_emails: "['eroma.abeysinghe@gmail.com','sgg@iu.edu']"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 6ab9c9d..6a0ed62 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -35,6 +35,7 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southdakota"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/southernillinois"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/ultrascan"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/utah"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index 4b66323..a36593c 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -56,6 +56,7 @@ gateway_id: "{{ default_gateway }}"
experiment_data_dir: "{{ user_data_dir }}"
gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19"
gateway_data_store_ssh_public_key: ""
+data_sharing_enabled: "true"
## Portal related variables
super_admin_portal: "true"
http://git-wip-us.apache.org/repos/asf/airavata/blob/6791f289/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index 78cb65b..a8b34da 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -169,7 +169,7 @@ return array(
/**
* Data Sharing enabled
*/
- 'data-sharing-enabled' => true
+ 'data-sharing-enabled' => {{ data_sharing_enabled }}
],
/**
[47/50] [abbrv] airavata git commit: making trivial change to test
ansible
Posted by ma...@apache.org.
making trivial change to test ansible
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a9073175
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a9073175
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a9073175
Branch: refs/heads/develop
Commit: a9073175fca796df2a22e07ca1a89e7b20ea7391
Parents: 4407f82
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Apr 27 17:04:43 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Apr 27 17:04:43 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/oscer/vars.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a9073175/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index 235f4b6..eb15b34 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -51,5 +51,5 @@ portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
portal_theme: "oscer"
portal_theme_repo: "https://github.com/SciGaP/ou-gateway-theme"
-portal_title: "OU CyberGateway"
+portal_title: "OU Science Gateway"
...
[12/50] [abbrv] airavata git commit: Reorganized pga config files
into include files
Posted by ma...@apache.org.
Reorganized pga config files into include files
Ansible doesn't support having multiple group_vars for the same host, so
configuring each pga instance as a different group doesn't work. Ansible
will load all of the groups' variables for a host and they overwrite one
another.
As an alternative I refactored the pga group vars files into vars
include files in the inventory.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/67eed40b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/67eed40b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/67eed40b
Branch: refs/heads/develop
Commit: 67eed40b9a56db71d45f18b23384da0ea14e9199
Parents: cda1172
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 5 16:05:58 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 5 16:05:58 2017 -0400
----------------------------------------------------------------------
.../production/group_vars/pga-seagrid/vars.yml | 59 --------------------
.../production/group_vars/pga-seagrid/vault.yml | 18 ------
.../ansible/inventories/scigap/production/hosts | 6 +-
.../production/pga_config/seagrid/vars.yml | 59 ++++++++++++++++++++
.../production/pga_config/seagrid/vault.yml | 18 ++++++
.../production/pga_config/testdrive/vars.yml | 57 +++++++++++++++++++
.../production/pga_config/testdrive/vault.yml | 18 ++++++
dev-tools/ansible/pga-scigap-prod.yml | 25 +++++++++
dev-tools/ansible/pga-single-vhost.yml | 36 ++++++++++++
9 files changed, 214 insertions(+), 82 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
deleted file mode 100644
index 89f300f..0000000
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-#
-#
-# 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.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-# TODO: disable SSL temporarily for testing
-#vhost_servername: "seagrid.org"
-#vhost_serveralias: "www.portal.seagrid.org"
-vhost_servername: "{{ groups['pga'][0][0] }}"
-vhost_ssl: False
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
-
-## WSO2 IS related variables
-tenant_domain: "prod.seagrid"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-
-gateway_id: "seagrid"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/seagrid"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['pamidigs@iu.edu', 'sgg@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "seagrid"
-portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
-portal_title: "SEAGrid Portal"
-...
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml
deleted file mode 100644
index b253227..0000000
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66333335376433663761356636313739303836383431366135633735663262366262663737613936
-6238613036636365653530353538373031623562373335300a316462306231653531613330303030
-61383138343832616162353239303331663164326635336566663666316232366562616633316139
-6365666632373662340a666238353135396239373062383331386137353134336539386636623237
-37326237326233303437386666646138666530663766376238366263653730353938363064663336
-62336662643831653833633835653666363134303830633834336162383265666131303434346466
-32323937663766323632396631616264326232613361333834303031636239333435343563396366
-35643766376466613535383938623038653634303035323065363031303032303835343866643330
-37303462333839313265353063613937623431336635623839386137353433396136623162333233
-62633536616437376366663566393430626533323232383733353761643738376366316631353562
-35366133373866393737653665326566353963643138633630393838643363633562623430373132
-62383531356430646633323933633130623935653139363566326232653965333764363238333137
-30663863363566353035393437316135303265643165353034326664656336623930613632376237
-62393231336539656636636530643863323834363130636238323732373738316265306665643962
-62333437313064623566386438636136613461373332343462613733623736666338333064346661
-62643035636435663135613437383036663034363536646634633966666633643033303634633639
-63396139343037353433613936333962366130333336333231353836353161636365
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index dbd7789..1049930 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -16,9 +16,5 @@ gf5.ucs.indiana.edu
[gfac]
gf6.ucs.indiana.edu
-[pga:children]
-pga-seagrid
-
-[pga-seagrid]
+[pga]
gf4.ucs.indiana.edu
-
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
new file mode 100644
index 0000000..046a119
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -0,0 +1,59 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+# TODO: disable SSL temporarily for testing
+#vhost_servername: "seagrid.org"
+#vhost_serveralias: "www.portal.seagrid.org"
+vhost_servername: "gf4.ucs.indiana.edu"
+vhost_ssl: False
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
+
+## WSO2 IS related variables
+tenant_domain: "prod.seagrid"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "seagrid"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/seagrid"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['pamidigs@iu.edu', 'sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "seagrid"
+portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
+portal_title: "SEAGrid Portal"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
new file mode 100644
index 0000000..b253227
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+66333335376433663761356636313739303836383431366135633735663262366262663737613936
+6238613036636365653530353538373031623562373335300a316462306231653531613330303030
+61383138343832616162353239303331663164326635336566663666316232366562616633316139
+6365666632373662340a666238353135396239373062383331386137353134336539386636623237
+37326237326233303437386666646138666530663766376238366263653730353938363064663336
+62336662643831653833633835653666363134303830633834336162383265666131303434346466
+32323937663766323632396631616264326232613361333834303031636239333435343563396366
+35643766376466613535383938623038653634303035323065363031303032303835343866643330
+37303462333839313265353063613937623431336635623839386137353433396136623162333233
+62633536616437376366663566393430626533323232383733353761643738376366316631353562
+35366133373866393737653665326566353963643138633630393838643363633562623430373132
+62383531356430646633323933633130623935653139363566326232653965333764363238333137
+30663863363566353035393437316135303265643165353034326664656336623930613632376237
+62393231336539656636636530643863323834363130636238323732373738316265306665643962
+62333437313064623566386438636136613461373332343462613733623736666338333064346661
+62643035636435663135613437383036663034363536646634633966666633643033303634633639
+63396139343037353433613936333962366130333336333231353836353161636365
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
new file mode 100644
index 0000000..0b6b715
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -0,0 +1,57 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/testdrive"
+vhost_servername: "testdrive.airavata.org"
+vhost_serveralias: "www.testdrive.airavata.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
+
+## WSO2 IS related variables
+tenant_domain: "prod.testdrive"
+admin_username: "tdaadmin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "default"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/testdrive"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu','eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+#portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "Airavata Test Drive"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
new file mode 100644
index 0000000..2719a75
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+62343936613436343730626461303331313361373265653231623265646366343037303261643162
+3730386162363861626462626432373932363365323233610a643637633565333538633462383530
+61333833323534356430343461363531663035386637623836366361653430323861333639653762
+6239626461646433380a376139303561346661316131376366623538643433326335363032653966
+63393732653961666637343966623839386564643339653665623433613132363832363061356665
+63346637373235623332613561303162356363323937303630623036386636393465346662336365
+63386238306534613136643466323564626336386165616137653133316532613465626365393961
+34373466613439346534366263633261643936323334316636376538613233663333646636383838
+66333437316165656262386337326131396432616137326631643532613438366633396337633065
+62363833616239626666613062623730326633616532336662653234393863373962396564353662
+66366461343066366161366633666562613031613036363237636333343734393730383332363534
+62306435633163303864636639613465633936636462333636633361613431396265626333373761
+32346234383639363163326435356330633062383162353666303931376133393431356336663665
+34303265386334623332303336633662323563643661623566353734303362326661643062613637
+31666239313065316633613162646631636534356233323533663666613537303263646261643363
+32303539633332386566623435353732396532396537643736356334383565316433633261333630
+36336263323934643764323263393362373531643165373435326539623266383936
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
new file mode 100644
index 0000000..e40417c
--- /dev/null
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -0,0 +1,25 @@
+#
+#
+# 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.
+#
+
+---
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
+
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/67eed40b/dev-tools/ansible/pga-single-vhost.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-single-vhost.yml b/dev-tools/ansible/pga-single-vhost.yml
new file mode 100644
index 0000000..618c613
--- /dev/null
+++ b/dev-tools/ansible/pga-single-vhost.yml
@@ -0,0 +1,36 @@
+#
+#
+# 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.
+#
+
+# This playbook is meant to be included and can be used to
+# deploy multiple PGA instances onto the same host by using
+# virtual hosting. Turns out in Ansible you can't setup these
+# different PGA instances as different groups on the same host.
+# The group_vars for each PGA instance will overwrite each other.
+# See https://github.com/ansible/ansible/issues/9065 for more info.
+---
+- hosts: pga
+ vars_files:
+ - "{{ vars_dir }}/vars.yml"
+ - "{{ vars_dir }}/vault.yml"
+ roles:
+ - env_setup
+ - pga
+
+...
[38/50] [abbrv] airavata git commit: Adding mason email address to
gfac config
Posted by ma...@apache.org.
Adding mason email address to gfac config
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/57cb2aef
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/57cb2aef
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/57cb2aef
Branch: refs/heads/develop
Commit: 57cb2aef858c2216114a5733c8a241d912ef5969
Parents: f8e55d3
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 26 13:39:07 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 26 13:39:07 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/57cb2aef/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
index ba18caa..b6dbdc2 100644
--- a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
+++ b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
@@ -84,6 +84,7 @@ resources:
- root <ad...@trident.bigred2.uits.iu.edu> # Bigred2
- root <ad...@scyld.localdomain> # alamo
- root <ad...@m2.karst.uits.iu.edu> #karst
+ - root <ad...@m1.mason.indiana.edu> #mason
- jobManagerType: SLURM
commandOutputParser: org.apache.airavata.gfac.impl.job.SlurmOutputParser
[46/50] [abbrv] airavata git commit: Revert "adding user profile
service to server module"
Posted by ma...@apache.org.
Revert "adding user profile service to server module"
This reverts commit be5ef40fdbe1a144bf89a68b934e11ff573dba83.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4407f82c
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4407f82c
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4407f82c
Branch: refs/heads/develop
Commit: 4407f82c3ad320b24a31f3bf611208ce22b140dd
Parents: e48a02e
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Apr 27 14:56:40 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Apr 27 14:56:40 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/server/ServerMain.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/4407f82c/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 63202f9..1fcf179 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -118,7 +118,7 @@ public class ServerMain {
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(GFAC_SERVER);
- serverList.add(USER_PROFILE);
+ // serverList.add(USER_PROFILE); // Commenting temporarily since there is no current usage
} else if (serverList.indexOf(API_ORCH) > -1) {
serverList.clear();
serverList.add(REGISTRY_SERVER); // registry server should start before everything
[30/50] [abbrv] airavata git commit: Update gateway storage resource
id to new one for gf4
Posted by ma...@apache.org.
Update gateway storage resource id to new one for gf4
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/17941979
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/17941979
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/17941979
Branch: refs/heads/develop
Commit: 17941979ff345e01eb8fac8d0399aed43863847e
Parents: 950309c
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 13:43:49 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/pga_config/brandeis/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/cinetvtech/vars.yml | 3 +--
.../scigap/production/pga_config/georgiastate/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/iugateway/vars.yml | 3 +--
.../ansible/inventories/scigap/production/pga_config/lsu/vars.yml | 3 +--
.../ansible/inventories/scigap/production/pga_config/nsg/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/oiitandy/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/oscer/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/phasta/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/scigap/vars.yml | 2 +-
.../inventories/scigap/production/pga_config/seagrid/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/simvascular/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/southdakota/vars.yml | 3 +--
.../scigap/production/pga_config/southernillinois/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/testdrive/vars.yml | 3 +--
.../inventories/scigap/production/pga_config/utah/vars.yml | 3 +--
16 files changed, 16 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
index 0d4dd60..67e66f2 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
@@ -37,8 +37,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "brandeis"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/brandeis"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnenzHr90GmK9nGzUFVr2Xt0F8dVtqFTU/nSpEK22M0LcBWDJuX2lGw6tz/gU+j5SRAEu2HJnHb67DbvPG+DAEiCYf4sm94GBHljGjySlvDzC8uZGmOzRE3KCzDan5XnHHHQqXL+HJAOzkODVLhxEpN0AOq90Q+Og+vhJlmGJk6WIdjebBfVd0xcHp0nKFzB54F7f0cVubnt5XOE6rMZTb812RSHIIWVk1s5StVbpiDZMzwRJ4tBd1Oe+4DVSTJyn6SdEN18x2KoFeR6BrM8L5QiXhR8GhXj8MyoQLF5+m6q9Drp76n3qw2GMjGgmC8jdwFFOKRiIKM47u9sGrtljX"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
index 118516e..627f99b 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/cinetvtech/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "cinetvtech"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/cinet-virginiatech"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCpt0ai3Z7TGUNFM8heCPsQAZJkSik+PCa3QD5ej+sApXfiZZoFdjLswXAFcRbsD4RyCMnKFQ4st9e6+1LT8nHG3dd5uHjtBI2FFBaDg5JrIAuQj40nkdCII12gbXLu4uKCjKJ3NThn/AFQjpw0TvzFLusDd7/Xb+xBpMdobHHqngDqG8Y8fA1pbHtB5BgcAuWp3TZ/s1PL5cEhS0yZ8cVBTnSYK87o6hh0Pn4tlyU29lyLRPz43aHvjkKBN0VNwJlyOtCgr+Gj4TzlRvHXgLTn7yg1w7L6/V5LFpH2cealS92qfoBJpQ9IBAi5hX4yokEopCBsXyx78+n5E2hW05xR"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
index 1b8f9af..7d79862 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "georgiastate"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/georgia-state"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
index fd70a17..7bce4c5 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "iugateway"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/iugateway"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjKGnDVSWXJynfzyOOcACuXG8KdIaPvx1idpsMeioYAX+T+W2wK86tHfD2B9QxzmrcjvAZD7/GvTcMotBUQ+5nJyFyYkRDKL5XtC2HWaMijCmsGFgODfc+i3E274Cw9oYAamRPTCUShoqogd9jzW8gaIzTy+2sU5R/dYAUeiHM2ov9SpIJXNuCoT12R948iUd3b2amnBIJvy/DnhorLXz7MQ70l9cWQp986ZVOS32JRUZhk/2nLHQLxP9cwjP3kVXEtoaOZc3lwypOzdA/xJq4pRTb4s8mZ4SaQIzHBPBYneU85+P6j7cjlV3UeN+0YwvnXe1iWaoUuoUFrNmzudlf"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
index a7a8088..5d7ecb8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
@@ -37,8 +37,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "lsu"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/lsu"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjusb/NsMD1BRsb0A7CEYpaaoKY+RH9bkcGOCTtJMRYgtzenOaX9egIR7AtOH3eaWjr2221QU9IOTQj2S4ZhpnC6+/eO6Lx3zHbqzG78z7U7gX6IzDjjuwrQDeDLYGfd6RoDAZk+H2/pvoNGia/AnOXHU0+x1eF795TDbyVZvA+vtDPJ4EHUfbE8GG/QzTGK8IZqUBJUd+NSzcqTs/jzTetwunN1MnTHHDOCOEgYWDTia+TMECmEq/YNy0u8Uhu1TtmXUu/vyCwjnspWBNnWjiXf0tLEnZ10HnvmH15Yhh3OERKrACaU7JqNmPDj8Vc9YIAYK1bRjmh5OrYCtxiHVF"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
index 583f0b1..9487e44 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
@@ -42,8 +42,7 @@ user_role_name: "airavata-user"
gateway_id: "nsg"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/nsg"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
#gateway_data_store_ssh_public_key: ""
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
index ed2678f..37321cb 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "oiitandy"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/oii-tandy"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDW1N6Y2UJul9Y9Nd1jO6j+huPBzOm8uKCMgo7njslDS0WQEXB8+JZ+krZr3PTIWNl9KcRKkrQi86ufzxSImS1fdCIAtNsp3VWZ2hOU4G4h20K9wdSXsi3ppeOveruYqpBHfGwXhDflS0bsof6uRdmQR7nCa5hrVjGuntcs1DKdHSsrxfhc/4w7py7Ema5v32ZvCXYe0s3JpMR3Sd6zCsQBEw84GUGdz6f7K6CjxRuJlWOikbKttrSq+P1tstIdKIX1XxAnuvsbzJhWtJDvtGviQMiokW7SnZQ1KglrmG2R9CIteDhttLOAI5XL1hDL/gK78LSQ7sbF1i1PV+R7yPYt"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index 088a9de..235f4b6 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "oscer"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/oscer"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZs3ErVmOoQ7GCRwsBJkh3BQVPaoeDw6cja67kXJPCBP7hQ1m9ld0h+PeIt/O8qwPgVN9kGf2fGeekJ9hTjAN8jk0xnU7og7F1RYg6+TqnugyfKZ22ZjfGf/tcc0Wd5BlokvMVJIsLCIv1N0OyxELrGi33y3U98egzn7r0j0uhtNZVN2AC4m1OpRJL7S9FRv9Z7CBXEs7x1j9ctyi3+Q8kBjWm7D78QPqCd2ODrHIDsPZpHm8CUOwHy9p7M+E2bbhkeGxExQhmBIFF75U4Lm3dzUzSmQGvUOppT+Nler8im7ArxS/8OJHEMOi4nW9J+BvtpDztQDAraJAX+VRNjaH5"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
index cfdb368..2542690 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "phasta"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/phasta"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIvxQcdWfZPnXgM1mU++kTuX2ydkQ5BxK0w4stY9qEwJDUoRxF6nstTFBEDkhS34/oBYsJIH9IM4UPxiiplwoIPSYRpqI24pmVNnfJakcsFmxeSVmQRI7SztedXca9IAn9DelJZyORonYsfbsYIDQNzAiMUVs+K9l4flZUqVIZwYrrKfDbd2StC3DUvCugKgJk+v+XsRUxGsebk8wqE273GYPtMt4bdTQFZMfCLg52pXUqrK8RTbL+WdB7uCVXAGC2vu7OsI5+BJSVVUUPiA3vS9oiuZS9qPAYEwowEs+RMl56sGLh5udvhMxaSDn4zqWKTo/LNXcO2p2Y9sit90LD"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index 40e8e52..8cb7375 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -43,7 +43,7 @@ gateway_id: "scigap"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/scigap"
# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
## Portal related variables
super_admin_portal: "true"
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index fef5599..7ad0bda 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -42,8 +42,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "seagrid"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/seagrid"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
index 2d745fe..a800de2 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -37,8 +37,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "simvascular"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/simvascular"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: ""
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
index b37dc02..c0e8ce5 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "southdakota"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/southdakota"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
index 60f9a11..9e0839a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "southill"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/southernillinois"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: ""
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index 0b6b715..0e07e38 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -42,8 +42,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "default"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/testdrive"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
## Portal related variables
http://git-wip-us.apache.org/repos/asf/airavata/blob/17941979/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
index 3513adf..eedd509 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
@@ -41,8 +41,7 @@ oauth_client_secret: "{{ vault_oauth_client_secret }}"
gateway_id: "utah"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}/utah-university"
-# TODO: this is only for testing, we'll need to update this again during the real migration
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiR1OU3jrSqoDxkieAQuB4YXnEllg+74h9nWKXSa7G6S8BDuSOVQl6YFdk1nCpJ9pGEoCziYa+fgTmQ98eXFEaXglRyu2Cq7HkPgKnBR5xtsx+Qslm/jBxO2C/kez7eGJH8F8bSOq6o4hUsPP8XUdzvf76o+wZ25RErqzQl1Go8E1sOi4fXkH4eR8cCsI093ZquuUgwIZjoqcj+bwCRoZWCqyOhXEzYqZmng4EvBm3VnPf77xdVxAZELDd7oKiTf4y1cEExIJyQJqwCJJjic9Utuf13lEROfnV2nELf1YdaLwWoFKJgc+bBaoxxxoo1hdKW7hFQDmgHCWASSIX0fx/"
## Portal related variables
[32/50] [abbrv] airavata git commit: Moving log file out of
distribution directory
Posted by ma...@apache.org.
Moving log file out of distribution directory
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/af6ca9a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/af6ca9a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/af6ca9a7
Branch: refs/heads/develop
Commit: af6ca9a78f9a39f2e3506ebf5673daedacc1700d
Parents: e74625d
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 11:16:57 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400
----------------------------------------------------------------------
.../scigap/production/group_vars/all/vars.yml | 2 +
.../ansible/roles/api-orch/defaults/main.yml | 1 +
dev-tools/ansible/roles/api-orch/tasks/main.yml | 9 +++-
.../roles/api-orch/templates/logback.xml.j2 | 55 ++++++++++++++++++++
dev-tools/ansible/roles/gfac/defaults/main.yml | 21 ++++++++
dev-tools/ansible/roles/gfac/tasks/main.yml | 9 +++-
.../ansible/roles/gfac/templates/logback.xml.j2 | 55 ++++++++++++++++++++
7 files changed, 150 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index 3984024..da3a545 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -76,6 +76,7 @@ orchestrator_name: "orchestrator-node0"
orchestrator_host: "{{ groups['api-orch'][0] }}"
orchestrator_port: "8940"
api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_log_dir: "{{ api_orch_dir }}/logs"
# registry related variables
registry_name: regserver-node0
@@ -103,6 +104,7 @@ gfac_name: "gfac-node0"
gfac_host: "{{ groups['gfac'][0] }}"
gfac_port: "8950"
gfac_dir: "{{ deployment_dir }}/gfac-instance"
+gfac_log_dir: "{{ gfac_dir }}/logs"
# Monitoring variables
monitor_email_address: "gw77jobs@scigap.org"
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/roles/api-orch/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/defaults/main.yml b/dev-tools/ansible/roles/api-orch/defaults/main.yml
index eb74160..c7dd3a9 100644
--- a/dev-tools/ansible/roles/api-orch/defaults/main.yml
+++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml
@@ -19,3 +19,4 @@
#
api_orch_server_names: "api-orch"
+api_orch_log_dir: "../logs"
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 1a5b298..da8e313 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -66,6 +66,13 @@
group={{ group }}
mode="u=rw,g=r,o=r"
+- name: Copy logback configuration file
+ template: src=logback.xml.j2
+ dest="{{ api_orch_dir }}/{{ airavata_dist }}/bin/logback.xml"
+ owner={{ user }}
+ group={{ group }}
+ mode="u=rw,g=r,o=r"
+
- name: Copy Mysql jar to lib
copy: src={{ mysql_connector_jar }}
dest="{{ api_orch_dir }}/{{ airavata_dist }}/lib/{{ mysql_connector_jar }}"
@@ -88,7 +95,7 @@
removes="{{ api_orch_dir }}/{{ airavata_dist }}/bin/server_start_*"
- name: start api-orch
- command: ./bin/airavata-server-start.sh api-orch -d
+ command: ./bin/airavata-server-start.sh api-orch -d -log "{{ api_orch_log_dir }}/output.log"
chdir="{{ api_orch_dir }}/{{ airavata_dist }}/"
creates="{{ api_orch_dir }}/{{ airavata_dist }}/bin/server_start_*"
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2 b/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2
new file mode 100644
index 0000000..d66170e
--- /dev/null
+++ b/dev-tools/ansible/roles/api-orch/templates/logback.xml.j2
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ 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.
+
+-->
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>[%p] %m%n</pattern>
+ </encoder>
+ </appender>
+ <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+ <!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
+ <!--for further documentation-->
+ <File>{{ api_orch_log_dir }}/airavata.log</File>
+ <Append>true</Append>
+ <encoder>
+ <pattern>%d [%t] %-5p %c{30} %X - %m%n</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>{{ api_orch_log_dir }}/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
+ </rollingPolicy>
+ </appender>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="edu.internet2.middleware.grouper" level="ERROR"/>
+ <logger name="org.globus" level="INFO"/>
+ <logger name="org.apache.commons.httpclient" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <logger name="de.hunsicker.jalopy.io" level="ERROR"/>
+ <logger name="httpclient.wire.header" level="ERROR"/>
+ <logger name="org.apache.axis2.enterprise" level="ERROR"/>
+ <root level="INFO">
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="LOGFILE"/>
+ </root>
+</configuration>
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/roles/gfac/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/defaults/main.yml b/dev-tools/ansible/roles/gfac/defaults/main.yml
new file mode 100644
index 0000000..c7ccc3d
--- /dev/null
+++ b/dev-tools/ansible/roles/gfac/defaults/main.yml
@@ -0,0 +1,21 @@
+#
+#
+# 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.
+#
+
+gfac_log_dir: "../logs"
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/roles/gfac/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/tasks/main.yml b/dev-tools/ansible/roles/gfac/tasks/main.yml
index d5de2c6..31e486a 100644
--- a/dev-tools/ansible/roles/gfac/tasks/main.yml
+++ b/dev-tools/ansible/roles/gfac/tasks/main.yml
@@ -62,6 +62,13 @@
group={{ group }}
mode="u=rw,g=r,o=r"
+- name: Copy logback configuration file
+ template: src=logback.xml.j2
+ dest="{{ gfac_dir }}/{{ airavata_dist }}/bin/logback.xml"
+ owner={{ user }}
+ group={{ group }}
+ mode="u=rw,g=r,o=r"
+
- name: Copy Mysql jar to lib
copy: src="{{ mysql_connector_jar }}"
dest="{{ gfac_dir }}/{{ airavata_dist }}/lib/{{ mysql_connector_jar }}"
@@ -79,7 +86,7 @@
removes="{{ gfac_dir }}/{{ airavata_dist }}/bin/server_start_*"
- name: start gfac
- command: ./bin/airavata-server-start.sh gfac -d
+ command: ./bin/airavata-server-start.sh gfac -d -log "{{ gfac_log_dir }}/output.log"
chdir="{{ gfac_dir }}/{{ airavata_dist }}/"
creates="{{ gfac_dir }}/{{ airavata_dist }}/bin/server_start_*"
http://git-wip-us.apache.org/repos/asf/airavata/blob/af6ca9a7/dev-tools/ansible/roles/gfac/templates/logback.xml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/logback.xml.j2 b/dev-tools/ansible/roles/gfac/templates/logback.xml.j2
new file mode 100644
index 0000000..81b4929
--- /dev/null
+++ b/dev-tools/ansible/roles/gfac/templates/logback.xml.j2
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+ 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.
+
+-->
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>[%p] %m%n</pattern>
+ </encoder>
+ </appender>
+ <appender name="LOGFILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <!--See http://logback.qos.ch/manual/appenders.html#RollingFileAppender-->
+ <!--and http://logback.qos.ch/manual/appenders.html#TimeBasedRollingPolicy-->
+ <!--for further documentation-->
+ <File>{{ gfac_log_dir }}/airavata.log</File>
+ <Append>true</Append>
+ <encoder>
+ <pattern>%d [%t] %-5p %c{30} %X - %m%n</pattern>
+ </encoder>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>{{ gfac_log_dir }}/airavata.log.%d{yyyy-MM-dd}</fileNamePattern>
+ </rollingPolicy>
+ </appender>
+ <logger name="org.apache.zookeeper" level="ERROR"/>
+ <logger name="edu.internet2.middleware.grouper" level="ERROR"/>
+ <logger name="org.globus" level="INFO"/>
+ <logger name="org.apache.commons.httpclient" level="ERROR"/>
+ <logger name="org.apache.airavata" level="INFO"/>
+ <logger name="org.hibernate" level="ERROR"/>
+ <logger name="de.hunsicker.jalopy.io" level="ERROR"/>
+ <logger name="httpclient.wire.header" level="ERROR"/>
+ <logger name="org.apache.axis2.enterprise" level="ERROR"/>
+ <root level="INFO">
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="LOGFILE"/>
+ </root>
+</configuration>
[37/50] [abbrv] airavata git commit: dREG PGA configuration
Posted by ma...@apache.org.
dREG PGA configuration
dREG PGA configuration needs to override the virtual host configuration
to allow some non-HTTPS requests, so a way to override the virtual host
file was implemented.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f8e55d34
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f8e55d34
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f8e55d34
Branch: refs/heads/develop
Commit: f8e55d34576d5d7c6afbd0848daf05841defb361
Parents: 2fb19efc
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 26 10:06:32 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 26 10:31:45 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/ansible.cfg | 2 +-
.../cornell-dnasequence/pga-ssl-vhost.conf.j2 | 31 ++++++++++
.../pga_config/cornell-dnasequence/vars.yml | 63 ++++++++++++++++++++
.../pga_config/cornell-dnasequence/vault.yml | 18 ++++++
dev-tools/ansible/pga-scigap-prod.yml | 1 +
dev-tools/ansible/roles/pga/defaults/main.yml | 3 +
dev-tools/ansible/roles/pga/tasks/main.yml | 6 +-
7 files changed, 120 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/ansible.cfg
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/ansible.cfg b/dev-tools/ansible/ansible.cfg
index 9af1301..bf32223 100644
--- a/dev-tools/ansible/ansible.cfg
+++ b/dev-tools/ansible/ansible.cfg
@@ -1,2 +1,2 @@
[defaults]
-inventory_ignore_extensions = .jks
\ No newline at end of file
+inventory_ignore_extensions = .jks, .j2
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2
new file mode 100644
index 0000000..ee053cc
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2
@@ -0,0 +1,31 @@
+<VirtualHost *:80>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ ## Redirect all http traffic to https
+ RewriteEngine On
+ RewriteCond %{HTTPS} off
+ # Don't redirect /gbrowser and /gbfile requests to HTTPS
+ RewriteCond %{THE_REQUEST} !\s/(gbrowser|gbfile)
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ DocumentRoot {{ doc_root_dir }}/public
+ <Directory "{{ doc_root_dir }}/public">
+ AllowOverride All
+ </Directory>
+ ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
+ CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
+ SSLEngine on
+ SSLCertificateFile {{ ssl_certificate_file }}
+ SSLCertificateChainFile {{ ssl_certificate_chain_file }}
+ SSLCertificateKeyFile {{ ssl_certificate_key_file }}
+</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml
new file mode 100644
index 0000000..56cc201
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vars.yml
@@ -0,0 +1,63 @@
+#
+#
+# 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.
+#
+
+---
+
+# FIXME Temporarily dREG is pointed to gw56 (dev)
+airavata_server: "tls://gw56.iu.xsede.org"
+airavata_port: "9930"
+
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "dreg-gateway"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+vhost_servername: "dreg.dnasequence.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/dreg.dnasequence.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/dreg.dnasequence.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/dreg.dnasequence.org/privkey.pem"
+pga_ssl_vhost_template: "{{ inventory_dir }}/pga_config/cornell-dnasequence/pga-ssl-vhost.conf.j2"
+
+## WSO2 IS related variables
+tenant_domain: "dreg.cornell"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+# dREG gateway automatically gives users the gateway-user role so they don't have to wait on admin approval
+initial_role_name: "gateway-user"
+
+gateway_id: "cornelldna"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/cornell-dnasequence"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTs6k2lSt5nn+UF3N1rAko9WjdtHZ1xLcKxCG4+4AVMdTIeng12g+1qB5hIFiDgesT/D/nzoA27EFj5nWiYanxBySNgl1Re8kR0nEqQbR0zj1dSibmfjW+vmOZzEiNSrNoLlc4KbFgqFCRGIlZ1bWZ7yHtJ3I7xxfKhvvxCTzJ4K71v1aovnDTUYophy2lUsdOcOq84Qhv3ITZafgblz3mJSwVpnnI72IepzonzDUdcf/w0lKCl70L9MgQAZ2V4e9sQZWJLI5s1VtJsqKggtgI4goPyxXROoH9PTUZFqvvYjLGW8JVS9eZKblSKil09yckPfZCSk1i/UD/uY6O7bjf"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['zw355@cornell.edu','sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+# The portal theme is included in the dreg-gateway branch of airavata-php-gateway
+portal_theme: "dreg"
+portal_title: "dREG DNA Sequencing"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml
new file mode 100644
index 0000000..eaca63b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/cornell-dnasequence/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+37653231363231666433316261313238643763633234663866393832386236643436623566303263
+3334323065363831656435383564623034393661323037300a343263316666633131366134613661
+39633030386362623966303630653462373762373034323134356539313036376563613335383135
+3962646533323362370a383064616634303730373232353663386165313666303732396635643562
+39313037323264656236323337643862636265626138656435303064353531616264633435643965
+38616138613039336666313436643635666337643533343264326637653864356563343532333262
+35323335336437333964373366653737343032306238643032343162353437666664376636353236
+32363138633432396330613832656266663734616131383735393565343133626666313766313164
+35386534313033623563613635343163633564613636636236316633623263313437626337663530
+64313166323263353266623135616236653463356439363530373630653232363863303238356265
+65363630393364636238643861386161356635666331336530626533666434373931393237643861
+33383663653439313064393735653064323836656666343366636161643938396136383234386232
+33343238636238373936663365316663653532616364636336363936316235353164636365613738
+33346462386230623735376132306663633932363838643935373539316565626435646565393833
+66623065373162623964363665646436356464643366633764323232343736353032616561643637
+30326166396262316335323463323763653930653263613162663336343863313937393934313765
+30626235653162643566366361303630616437346539333436616666313738346232
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index a4192b5..6ab9c9d 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -21,6 +21,7 @@
---
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cinetvtech"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cornell-dnasequence"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index e2690f3..4b66323 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -33,6 +33,9 @@ httpd_log_dir:
Debian: /var/log/apache2
RedHat: /var/log/httpd
+pga_vhost_template: "pga-vhost.conf.j2"
+pga_ssl_vhost_template: "pga-ssl-vhost.conf.j2"
+
## WSO2 IS related variables
tenant_domain: "prod.testdrive"
admin_username: "tdaadmin"
http://git-wip-us.apache.org/repos/asf/airavata/blob/f8e55d34/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 384ef25..3279a97 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -101,7 +101,7 @@
dest: "{{ doc_root_dir }}/public/themes/{{ portal_theme }}"
version: "master"
update: yes
- when: portal_theme != "base"
+ when: portal_theme != "base" and portal_theme_repo != ""
become: yes
become_user: "{{user}}"
@@ -127,14 +127,14 @@
become: yes
- name: copy virtual host config file
- template: src=pga-vhost.conf.j2 dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
+ template: src={{ pga_vhost_template }} dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
become: yes
notify:
- restart httpd
when: not vhost_ssl
- name: copy SSL enabled virtual host config file
- template: src=pga-ssl-vhost.conf.j2 dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
+ template: src={{ pga_ssl_vhost_template }} dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
become: yes
notify:
- restart httpd
[04/50] [abbrv] airavata git commit: excluding ansible vault from
license header
Posted by ma...@apache.org.
excluding ansible vault from license header
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2e90368a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2e90368a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2e90368a
Branch: refs/heads/develop
Commit: 2e90368a1a7d68d225b4059a0294ebaec11c211f
Parents: e440a96
Author: Suresh Marru <sm...@apache.org>
Authored: Tue Apr 4 11:35:08 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Tue Apr 4 11:35:25 2017 -0400
----------------------------------------------------------------------
.../AiravataExperimentStatusUpdator.java | 2 +-
.../geogateway-dev/group_vars/pga/vault.yml | 20 --------------------
.../scigap/production/group_vars/all/vault.yml | 20 --------------------
.../group_vars/all/vault.yml | 20 --------------------
.../group_vars/pga/vault.yml | 20 --------------------
.../group_vars/all/vault.yml | 20 --------------------
.../group_vars/pga/vault.yml | 20 --------------------
.../testing-0.17/group_vars/all/vault.yml | 20 --------------------
.../testing-0.17/group_vars/pga/vault.yml | 20 --------------------
pom.xml | 3 +++
10 files changed, 4 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
index ab4484c..da937eb 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/listener/AiravataExperimentStatusUpdator.java
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-*//*
+/*
package org.apache.airavata.api.server.listener;
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vault.yml
index 303b565..7a518f2 100644
--- a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vault.yml
+++ b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
32366561643361633736313164303438383164373234613062303662333832373338373432356562
3966646664353835343865636333636432313733373830630a643539663361316165636661613232
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
index c4d1f83..e63e4ae 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
32393636303631613537663430383839636363376162653935623036373062663734383863316435
3039646665353363346261616636363633346665616263620a636438333561623935643234303236
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vault.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vault.yml
index c5c8791..a1d18b5 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/all/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
36666132643537623138323138316561383434336231643237303337623462313834323462656434
6362663032643235363133613463616663643731316438340a636336316333386434303635303961
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
index c8183c4..a30ba69 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
64653833663230383465353266623839636163316364356431373837653638306130616130383963
3132323230336531646162616464633061623830653462640a663263373436653831643063616638
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vault.yml b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vault.yml
index c5c8791..a1d18b5 100644
--- a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/all/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
36666132643537623138323138316561383434336231643237303337623462313834323462656434
6362663032643235363133613463616663643731316438340a636336316333386434303635303961
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vault.yml
index 36f42a9..53570f3 100644
--- a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
61396665393731333432613331393939633062393863613563396331666232333863393432306336
6535633534353532623634346238666437343761313430330a303039366262663334306264313733
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vault.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vault.yml
index b0ac99b..60069f7 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
65316665653761353134393035633263663062626565323337376434336262613962336165343434
3232643663396464353466376433633439376566336463300a626665316339646633633435396136
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
index 6bd4b2d..b253227 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vault.yml
@@ -1,23 +1,3 @@
-#
-#
-# 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.
-#
-
$ANSIBLE_VAULT;1.1;AES256
66333335376433663761356636313739303836383431366135633735663262366262663737613936
6238613036636365653530353538373031623562373335300a316462306231653531613330303030
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e90368a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d213d1..2f6e3a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -698,6 +698,7 @@
<exclude>**/README</exclude>
<exclude>**/src/test/resources/**</exclude>
<exclude>**/src/main/resources/**</exclude>
+ <exclude>**/vault.yml</exclude>
</excludes>
</configuration>
<executions>
@@ -727,6 +728,8 @@
<exclude>**/*.pk8</exclude>
<exclude>**/.idea/**/*</exclude>
<exclude>airavata-api/airavata-client-sdks/**/*</exclude>
+ <exclude>**/src/main/resources/**/*</exclude>
+ <exclude>**/src/test/resources/**/*</exclude>
</excludes>
</configuration>
<executions>
[14/50] [abbrv] airavata git commit: scigap prod pga configurations
for a iu, phasta, etc.
Posted by ma...@apache.org.
scigap prod pga configurations for a iu, phasta, etc.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/7f8272db
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7f8272db
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7f8272db
Branch: refs/heads/develop
Commit: 7f8272db47f123f1e03f6e871cfd06a37325ed20
Parents: 22e9798
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Apr 6 17:06:26 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Apr 6 17:06:26 2017 -0400
----------------------------------------------------------------------
.../production/pga_config/iugateway/vars.yml | 56 +++++++++++++++++++
.../production/pga_config/iugateway/vault.yml | 18 +++++++
.../scigap/production/pga_config/nsg/vars.yml | 57 ++++++++++++++++++++
.../scigap/production/pga_config/nsg/vault.yml | 18 +++++++
.../production/pga_config/oiitandy/vars.yml | 56 +++++++++++++++++++
.../production/pga_config/oiitandy/vault.yml | 18 +++++++
.../scigap/production/pga_config/oscer/vars.yml | 56 +++++++++++++++++++
.../production/pga_config/oscer/vault.yml | 18 +++++++
.../production/pga_config/phasta/vars.yml | 56 +++++++++++++++++++
.../production/pga_config/phasta/vault.yml | 18 +++++++
.../production/pga_config/scigap/vars.yml | 1 +
.../production/pga_config/simvascular/vars.yml | 52 ++++++++++++++++++
.../production/pga_config/simvascular/vault.yml | 18 +++++++
dev-tools/ansible/pga-scigap-prod.yml | 6 +++
dev-tools/ansible/roles/pga/defaults/main.yml | 4 ++
.../roles/pga/templates/pga_config.php.j2 | 8 +--
16 files changed, 456 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
new file mode 100644
index 0000000..fd70a17
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/iugateway"
+vhost_servername: "cybergateway.iu.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/cybergateway_iu_edu_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/cybergateway_iu_edu_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/iugateway.key"
+
+## WSO2 IS related variables
+tenant_domain: "airavata.iub"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "iugateway"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/iugateway"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjKGnDVSWXJynfzyOOcACuXG8KdIaPvx1idpsMeioYAX+T+W2wK86tHfD2B9QxzmrcjvAZD7/GvTcMotBUQ+5nJyFyYkRDKL5XtC2HWaMijCmsGFgODfc+i3E274Cw9oYAamRPTCUShoqogd9jzW8gaIzTy+2sU5R/dYAUeiHM2ov9SpIJXNuCoT12R948iUd3b2amnBIJvy/DnhorLXz7MQ70l9cWQp986ZVOS32JRUZhk/2nLHQLxP9cwjP3kVXEtoaOZc3lwypOzdA/xJq4pRTb4s8mZ4SaQIzHBPBYneU85+P6j7cjlV3UeN+0YwvnXe1iWaoUuoUFrNmzudlf"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['athota@iu.edu', 'sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "iugateway"
+portal_theme_repo: "https://github.com/SciGaP/iu-cybergateway-theme.git"
+portal_title: "IU Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
new file mode 100644
index 0000000..c2fcaa7
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+30613430626237373639393261636364373635313266303134366230343561356262363964306533
+3130636130343966313739393031636662626366343038380a356465636138616462396164653866
+66643331343234633439663232313633633664393938623839636130353761366337356439636566
+6632363330653665340a623634393433336366643139626136343732323565353533623962626266
+62653561333538656361363964373735633165386564313733396636323739666234613834653637
+64346562626664623265666362623535633866633564343538663365376139636537336138303766
+65313138363239633034373266343365316362646362336538306565656165613465633231626332
+63323436346535633463303339353638376533366235316463353432306530373036343736363761
+33303634373634613931653939663463613938336435383338373034616638616334646364643732
+65303662626230326235623562373264373331646334323566356437303239323436363239373936
+32623332336633363837373031373030386137343030613234646634303135383465313233313863
+66336339383662363462643531303163363734393438333639663163306336386661623130363663
+61653662343235343030646630393961653234343330613334356239343834376166623962363264
+32643839393966633538393133623433373131653537396234643436633733366338643863393461
+64666139633436353631323863326263303839653261653533663130616130363637366139646366
+33336263306563373836346238386230336233613834363163343664633436323262396332626539
+38306163616362316166613335353536643036386637656563396264343135386136
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
new file mode 100644
index 0000000..583f0b1
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
@@ -0,0 +1,57 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/nsg"
+vhost_servername: "nsg.scigap.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/nsg_scigap_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/nsg_scigap_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/nsg.scigap.key"
+
+## WSO2 IS related variables
+tenant_domain: "prod.nsg"
+admin_username: "nsgadmin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+user_role_name: "airavata-user"
+
+gateway_id: "nsg"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/nsg"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+#gateway_data_store_ssh_public_key: ""
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+#portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "NSG SciGaP Admin Portal"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
new file mode 100644
index 0000000..bd6c7f8
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+31653563373664623963356139623437303239303730616666343533383734633833353939376430
+3237393136613135303062643663303835636636323636610a613362373565323339366339363836
+33343766613565663662316364376238633836643134666333373064383439643661656664346532
+3430626262343366620a386166376466366634646635316566356630343166353331366630613933
+65316332373964386463343261343266353937366239323463383236343063656265656664626665
+38666333346332323864643238363931313863393664386634666230326266376537326665313634
+61353536613933376163336634383637623466313264633531363261353862336566633436306266
+64633038323964663631316533633264316238376438353262376261313666623631666534643266
+35626464643831333039643133303830613465393339376537636330373337366335613335623837
+61666531643034643965616130623339653363366531373439303966363935323638363736323031
+61616638643131663036623530363265623830373834303264666130336433383565643136613033
+37303831653563343461303737633334646262356333316563303831323736666564633466613238
+62643664633230333361623965623264643638373031393566333861303634356261623537643136
+63393263326566303131613962643738346231656565316432333064376537383430616535396362
+66633763323531343533636330613033663836306330313236353630636236653936316630303633
+30343038333334623836616264313861396335333232333630303832643739626335643133343539
+66623137366162316632336661613330346632623135373930346239373235313666
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
new file mode 100644
index 0000000..ed2678f
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/oii-tandy"
+vhost_servername: "scigw.oii.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/scigw.oii.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/scigw.oii.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/scigw.oii.org/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "prod.oii"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "oiitandy"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/oii-tandy"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDW1N6Y2UJul9Y9Nd1jO6j+huPBzOm8uKCMgo7njslDS0WQEXB8+JZ+krZr3PTIWNl9KcRKkrQi86ufzxSImS1fdCIAtNsp3VWZ2hOU4G4h20K9wdSXsi3ppeOveruYqpBHfGwXhDflS0bsof6uRdmQR7nCa5hrVjGuntcs1DKdHSsrxfhc/4w7py7Ema5v32ZvCXYe0s3JpMR3Sd6zCsQBEw84GUGdz6f7K6CjxRuJlWOikbKttrSq+P1tstIdKIX1XxAnuvsbzJhWtJDvtGviQMiokW7SnZQ1KglrmG2R9CIteDhttLOAI5XL1hDL/gK78LSQ7sbF1i1PV+R7yPYt"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['techmail@oii.org','sgg@iu.edu','it-alert@oii.org']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "oii-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/oii-gateway-theme.git"
+portal_title: "OII Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
new file mode 100644
index 0000000..d885c2e
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+62303734386432636433343337306638653838393637386634306137353839616164653435343464
+3461353736383331363362343163343836343239396265320a323863623135306637353635663566
+38343836326532303838633334316334666361323835386630396335626138363139646539316330
+3965356435303133660a663937656434663262633264343163373666396233313662316332643930
+33303237386333346166306137656133326639313565316461313665336438323331356230346364
+65663531353438663730323037303135353164623032396561393937306262366438333465343161
+35363361356163323965633933396331356431343131363639623235333632613432653361383966
+63636234393237663265623730663663646666636430363231656165363036363831353038383363
+32636561353332323432326436633161623239386134653866306261623864386363613935356535
+34336265326137323662366163363637343132623931313835323964393261383432343133323161
+31316239306566306664386233313730373834383739373838383337356532646163633366383063
+38363962363239663831656232623031383836343934623931326538336630623963613164613762
+37376539313762326635373962663432303564356230343231653930333464633634373336333831
+62396133653435653163386434663035316236663365323465663634383732333131326166346636
+30646331653563353238333632653136663530613265613135386533393732323439323932393661
+33306338306435353133306263383866383764643539396232326436643333303862626632363763
+36646636636561353964303132333030306263366635306535333138633935666265
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
new file mode 100644
index 0000000..088a9de
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/oscer"
+vhost_servername: "sciencegateway.oscer.ou.edu"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/privkey.pem"
+
+## WSO2 IS related variables
+tenant_domain: "prod.oscer"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "oscer"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/oscer"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZs3ErVmOoQ7GCRwsBJkh3BQVPaoeDw6cja67kXJPCBP7hQ1m9ld0h+PeIt/O8qwPgVN9kGf2fGeekJ9hTjAN8jk0xnU7og7F1RYg6+TqnugyfKZ22ZjfGf/tcc0Wd5BlokvMVJIsLCIv1N0OyxELrGi33y3U98egzn7r0j0uhtNZVN2AC4m1OpRJL7S9FRv9Z7CBXEs7x1j9ctyi3+Q8kBjWm7D78QPqCd2ODrHIDsPZpHm8CUOwHy9p7M+E2bbhkeGxExQhmBIFF75U4Lm3dzUzSmQGvUOppT+Nler8im7ArxS/8OJHEMOi4nW9J+BvtpDztQDAraJAX+VRNjaH5"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['smarru@iu.edu','sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "oscer"
+portal_theme_repo: "https://github.com/SciGaP/ou-gateway-theme"
+portal_title: "OU CyberGateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
new file mode 100644
index 0000000..a04aa9c
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+61623562303862643764333631626135396161353430666539386233366431666630643230333861
+3935623062363934653938383630333166373133326235610a343466356664356439393861633438
+65633264353130633262633230363439366232343261343031313331326137383861383232316430
+3661383731376630370a643265313361356330376131626261336566343632313761356334316361
+66373364613063653639353633353036323439336265363466383133313739663265623536653634
+63356665623330643663626533333633366536663363373338653836666665613735623331656235
+61383564613364636363666562376337646330666637323365616234346430396662633239626334
+38303437306235326638633965393033353533393162353262623637323134653162653862373636
+66373266353137333131343631346334386137643765313238366436346138326536656330326162
+65323133383535373539313334336639373036346134333439303033383033393266653131623363
+34363138633939626166643738353062643964343765366366353738373730363763353232303763
+36653335656565396465376364663366363966316630333339353732613164303861333362653639
+62343833656433366433663339326230663866343231616337353966366139666466666336636232
+37626562353933323533326265316666633566303163613437323964313631383561326538366235
+64333964326664353232303962633237346565323665653763666437633832333136356366343233
+63653632353235373133626165313061353336343636653763323039643131313562343630393763
+6130
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
new file mode 100644
index 0000000..cfdb368
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
@@ -0,0 +1,56 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/phasta"
+vhost_servername: "phasta.scigap.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/pki/tls/certs/phasta_scigap_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/phasta_scigap_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/phasta.scigap.key"
+
+## WSO2 IS related variables
+tenant_domain: "product.phasta"
+admin_username: "phasta_admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "phasta"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/phasta"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIvxQcdWfZPnXgM1mU++kTuX2ydkQ5BxK0w4stY9qEwJDUoRxF6nstTFBEDkhS34/oBYsJIH9IM4UPxiiplwoIPSYRpqI24pmVNnfJakcsFmxeSVmQRI7SztedXca9IAn9DelJZyORonYsfbsYIDQNzAiMUVs+K9l4flZUqVIZwYrrKfDbd2StC3DUvCugKgJk+v+XsRUxGsebk8wqE273GYPtMt4bdTQFZMfCLg52pXUqrK8RTbL+WdB7uCVXAGC2vu7OsI5+BJSVVUUPiA3vS9oiuZS9qPAYEwowEs+RMl56sGLh5udvhMxaSDn4zqWKTo/LNXcO2p2Y9sit90LD"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['eroma.abeysinghe@gmail.com','supun.nakandala@gmail.com','sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "phasta"
+portal_theme_repo: "https://github.com/SciGaP/phasta-portal-theme.git"
+portal_title: "PHASTA Science Gateway"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
new file mode 100644
index 0000000..a7b1f5b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+34393362646639623536616530363932393732383265616430636166353537623439353263386461
+3937376637623966313861373164643961643630656131650a316265306638353963643339373263
+30663964393533616566316163373734336234323663643430623063333866356164626639626333
+3764646161363333370a663335363831316465653734386131373338623831633266376434636131
+35653766363835316338643739666339333638303231636135613936376231383431656562616662
+33306262363965396131353237326330643339613834633761373666373765666135316235366466
+64616334353161643638323561313438346662353038643835386133623165373831643562393332
+66393665653833656638396337626436386234666162666438393738643964626632306631373736
+62653564333961633462363534653866323231366263313430316630633833663239316262613564
+37663561386161383531626135353361363064633564316162383262666161613733663064643835
+31626663333031623332646463333833623635373035303437656362343934343135376564613361
+39313133653562613466623762393031393065663066333536326263353166313831326163333833
+30393738323734333432613232633363653664326438623565323938313265343236326336613936
+39306636633535316161333533323166383662373630343431323337343334653338363364623636
+31656636396361383462353039633561363164633035386366306131643432666638626464353532
+34623262343637646134343131363365383830626137373264343162306136623161643437303563
+37663264303864373331613431666363366562353831366439633932326562353761
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index 5e77eea..9822f96 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -41,6 +41,7 @@ admin_username: "scigap_admin"
admin_password: "{{ vault_admin_password }}"
oauth_client_key: "{{ vault_oauth_client_key }}"
oauth_client_secret: "{{ vault_oauth_client_secret }}"
+user_role_name: "airavata-user"
gateway_id: "scigap"
# relative to document root dir
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
new file mode 100644
index 0000000..2d745fe
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -0,0 +1,52 @@
+#
+#
+# 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.
+#
+
+---
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "master"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/simvascular"
+vhost_servername: "gateway.simvascular.org"
+vhost_ssl: False
+
+## WSO2 IS related variables
+tenant_domain: "airavata.simvascular"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+
+gateway_id: "simvascular"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/simvascular"
+# TODO: this is only for testing, we'll need to update this again during the real migration
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_71a8409a-0713-4a45-985f-22847f63df4e"
+gateway_data_store_ssh_public_key: ""
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+portal_theme: "base"
+#portal_theme_repo: ""
+portal_title: "SimVascular Gateway Portal"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
new file mode 100644
index 0000000..d25f6cb
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+63303434393531636337626266376134353865333465663338616665363738653165643161343662
+3034303964666433656232316336313865346332316666370a343236373330653465663362613733
+33313862383462376664643466346337613536633862636537373930316365623234666536633532
+3064353436333838650a656234643965623130633262326561383937393233373537353139346362
+38366331643435613965393034323564656633316533653465373561366634386231663033343262
+32646538353737393665613461333233353036313338646130613131643465656131343830313435
+34626138333330653830323038313365386464396437363065313539666632323836623033616564
+62343766636133316166653963666339323632623462356163316662313232383963643561636466
+63663261326536653435303065646561386133353733616561623736646633636665633939313139
+37393963633035333237346535336439383234333532343035313733306232613636613862303634
+39383961626264363833363935323762393466376263366135363038383339373963303563343063
+36323535386430316363623734643931323138643063316233616638373864613835336466303561
+61303137343630626135313934643539613936396530636436313262303861636361396333636162
+63303331363561663034383262623939333137306139616437616533373835613962616262376230
+63636634353463653934623433383265346463623637366133373530363561333461383437663637
+35346662336332306565646463626234313263616131373230396335633863666461653530643932
+62343065306438343232323361656231306138643034373663313933336265376439
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 0e58808..f5d5bd2 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -22,5 +22,11 @@
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/seagrid"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/testdrive"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/scigap"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/phasta"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/nsg"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oscer"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/oiitandy"
+- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/simvascular"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index eb0308d..e2690f3 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -39,6 +39,10 @@ admin_username: "tdaadmin"
admin_password: "SciDeploy"
oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa"
oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa"
+admin_role_name: "admin"
+admin_readonly_role_name: "admin-read-only"
+user_role_name: "gateway-user"
+initial_role_name: "user-pending"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
http://git-wip-us.apache.org/repos/asf/airavata/blob/7f8272db/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index 6db651a..78cb65b 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -11,17 +11,17 @@ return array(
/**
* Admin Role Name
*/
- 'admin-role-name' => 'admin',
+ 'admin-role-name' => '{{ admin_role_name }}',
/**
* Read only Admin Role Name
*/
- 'read-only-admin-role-name' => 'admin-read-only',
+ 'read-only-admin-role-name' => '{{ admin_readonly_role_name }}',
/**
* Gateway user role
*/
- 'user-role-name' => 'gateway-user',
+ 'user-role-name' => '{{ user_role_name }}',
/**
* Initial user role. This is the initial user role assigned to a new
@@ -29,7 +29,7 @@ return array(
* grant new users that role, or set to some other role ('user-pending')
* to require admin approval before users have access.
*/
- 'initial-role-name' => 'user-pending',
+ 'initial-role-name' => '{{ initial_role_name }}',
/**
* Tenant Domain
[10/50] [abbrv] airavata git commit: Added PGA theme checkout,
config to ansible role
Posted by ma...@apache.org.
Added PGA theme checkout, config to ansible role
Also setting PGA title, fixes to setting admin emails
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/2e6437a7
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/2e6437a7
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/2e6437a7
Branch: refs/heads/develop
Commit: 2e6437a7e0f682cda8cfa10855ffabe8c957972c
Parents: dc55333
Author: Marcus Christie <ma...@apache.org>
Authored: Wed Apr 5 10:02:05 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Wed Apr 5 10:11:46 2017 -0400
----------------------------------------------------------------------
.../inventories/geogateway-dev/group_vars/pga/vars.yml | 2 +-
.../scigap/production/group_vars/pga-seagrid/vars.yml | 4 +++-
.../testing-0.17-scigap/group_vars/pga/vars.yml | 2 +-
.../testing-0.17-testdrive/group_vars/pga/vars.yml | 2 +-
.../inventories/testing-0.17/group_vars/pga/vars.yml | 2 +-
dev-tools/ansible/roles/pga/defaults/main.yml | 3 +++
dev-tools/ansible/roles/pga/tasks/main.yml | 10 +++++++++-
dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 6 +++---
8 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
index 3e7058b..11e39f7 100644
--- a/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/geogateway-dev/group_vars/pga/vars.yml
@@ -47,7 +47,7 @@ gateway_data_store_resource_id: "149.165.156.79_80025f37-19e4-496e-962e-d6fa75a5
## Portal related variables
super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
index 90ac459..f024d1a 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/pga-seagrid/vars.yml
@@ -52,5 +52,7 @@ super_admin_portal: "false"
admin_emails: "['pamidigs@iu.edu', 'sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
-
+portal_theme: "seagrid"
+portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
+portal_title: "SEAGrid Portal"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
index 758bd43..e3a7317 100644
--- a/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-scigap/group_vars/pga/vars.yml
@@ -46,7 +46,7 @@ gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b
## Portal related variables
super_admin_portal: "true"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
index 5b5c13b..adbb9c8 100644
--- a/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17-testdrive/group_vars/pga/vars.yml
@@ -45,7 +45,7 @@ gateway_data_store_resource_id: "149.165.156.148_13fd11a4-f2eb-4ba8-a2c7-0db07f9
## Portal related variables
super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
index 5f50315..57c4ef9 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
@@ -45,7 +45,7 @@ gateway_data_store_resource_id: "149.165.156.11_b5f26430-14d5-4372-8a7e-39b125aa
## Portal related variables
super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu'"
+admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index aec2ea6..07f9a28 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -54,4 +54,7 @@ super_admin_portal: "true"
admin_emails: "'sgg@iu.edu'"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "airavata12"
+portal_theme: "base"
+portal_theme_repo: ""
+portal_title: "Airavata PHP Gateway"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml
index 8caa24b..3f4aba6 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -69,8 +69,16 @@
template: src=pga_config.php.j2 dest="{{ doc_root_dir }}/app/config/pga_config.php"
become: yes
+- name: Checkout the portal theme (if a custom theme is defined)
+ git:
+ repo: "{{ portal_theme_repo }}"
+ dest: "{{ doc_root_dir }}/public/themes/{{ portal_theme }}"
+ version: "master"
+ update: yes
+ when: portal_theme_repo != ""
+
- name: give read permissions to doc root
- file: path="{{ doc_root_dir }}" state=directory mode=0755 recurse=yes
+ file: path="{{ doc_root_dir }}" state=directory mode=a+rX recurse=yes
become: yes
- name: give write permissions to storage dir
http://git-wip-us.apache.org/repos/asf/airavata/blob/2e6437a7/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index aa320a7..6db651a 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -186,18 +186,18 @@ return array(
/**
* Set the name of theme in use here
*/
- 'theme' => 'base',
+ 'theme' => '{{ portal_theme }}',
/**
* Portal title
*/
- 'portal-title' => 'Airavata PHP Gateway',
+ 'portal-title' => '{{ portal_title }}',
/**
* Email address of the portal admin. Portal admin well get email notifications for events
* such as new user creation
*/
- 'admin-emails' => [{{ admin_emails }}],
+ 'admin-emails' => {{ admin_emails }},
/**
* Email account that the portal should login to send emails
[29/50] [abbrv] airavata git commit: Update PGA configs for production
Posted by ma...@apache.org.
Update PGA configs for production
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/00efec7e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/00efec7e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/00efec7e
Branch: refs/heads/develop
Commit: 00efec7ec967a6a7b0e89fa7fec5d58c91e2e72e
Parents: af6ca9a
Author: Marcus Christie <ma...@apache.org>
Authored: Tue Apr 25 11:20:40 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue Apr 25 14:52:58 2017 -0400
----------------------------------------------------------------------
.../scigap/production/pga_config/scigap/vars.yml | 12 ++++--------
.../scigap/production/pga_config/seagrid/vars.yml | 15 +++++----------
.../scigap/production/pga_config/testdrive/vars.yml | 14 +++++---------
3 files changed, 14 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/00efec7e/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index 9822f96..40e8e52 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -24,16 +24,12 @@ git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/scigap"
-#vhost_servername: "scigap.org"
-vhost_servername: "beta.scigap.org"
+vhost_servername: "scigap.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
## WSO2 IS related variables
tenant_domain: ""
http://git-wip-us.apache.org/repos/asf/airavata/blob/00efec7e/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index 60e7cc6..fef5599 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -24,18 +24,13 @@ git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-# TODO: disable SSL temporarily for testing
-#vhost_servername: "seagrid.org"
-#vhost_serveralias: "www.portal.seagrid.org"
-vhost_servername: "beta.seagrid.org"
+vhost_servername: "seagrid.org"
+vhost_serveralias: "www.seagrid.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
## WSO2 IS related variables
tenant_domain: "prod.seagrid"
http://git-wip-us.apache.org/repos/asf/airavata/blob/00efec7e/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index 2ce43c1..0b6b715 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -24,17 +24,13 @@ git_branch: "master"
user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/testdrive"
-#vhost_servername: "testdrive.airavata.org"
-#vhost_serveralias: "www.testdrive.airavata.org"
-vhost_servername: "beta.testdrive.airavata.org"
+vhost_servername: "testdrive.airavata.org"
+vhost_serveralias: "www.testdrive.airavata.org"
vhost_ssl: True
# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
-ssl_certificate_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/beta.testdrive.airavata.org/privkey.pem"
+ssl_certificate_file: "/etc/pki/tls/certs/testdrive_airavata_org_cert.cer"
+ssl_certificate_chain_file: "/etc/pki/tls/certs/testdrive_airavata_org_interm.cer"
+ssl_certificate_key_file: "/etc/pki/tls/private/testdrive-airavata.key"
## WSO2 IS related variables
tenant_domain: "prod.testdrive"
[24/50] [abbrv] airavata git commit: AIRAVATA-2352 Redirect
stdout/stderr to log file
Posted by ma...@apache.org.
AIRAVATA-2352 Redirect stdout/stderr to log file
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/64fb9df0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/64fb9df0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/64fb9df0
Branch: refs/heads/develop
Commit: 64fb9df0f81b730e6dbb70ee5a21740a02699261
Parents: 8be77fd
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Apr 21 11:46:24 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Apr 21 11:46:24 2017 -0400
----------------------------------------------------------------------
.../main/resources/bin/airavata-server-start.sh | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/64fb9df0/modules/distribution/src/main/resources/bin/airavata-server-start.sh
----------------------------------------------------------------------
diff --git a/modules/distribution/src/main/resources/bin/airavata-server-start.sh b/modules/distribution/src/main/resources/bin/airavata-server-start.sh
index f44661b..382e091 100644
--- a/modules/distribution/src/main/resources/bin/airavata-server-start.sh
+++ b/modules/distribution/src/main/resources/bin/airavata-server-start.sh
@@ -18,6 +18,8 @@
# under the License.
. `dirname $0`/setenv.sh
+# Capture user's working dir before changing directory
+CWD="$PWD"
cd ${AIRAVATA_HOME}/bin
LOGO_FILE="logo.txt"
@@ -29,6 +31,8 @@ IS_DAEMON_MODE=false
LOGO=true
IS_SUBSET=false
SUBSET=""
+DEFAULT_LOG_FILE="${AIRAVATA_HOME}/logs/output.log"
+LOG_FILE=$DEFAULT_LOG_FILE
# parse command arguments
for var in "$@"
@@ -64,6 +68,15 @@ do
LOGO=false
shift
;;
+ -log)
+ shift
+ LOG_FILE="$1"
+ shift
+ # If relative path, expand to absolute path using the user's $CWD
+ if [ -z "`echo "$LOG_FILE" | egrep "^/"`" ]; then
+ LOG_FILE="${CWD}/${LOG_FILE}"
+ fi
+ ;;
-h)
echo "Usage: airavata-server-start.sh [server-name/s] [command-options]"
echo "Server names:"
@@ -80,6 +93,7 @@ do
echo " -nologo Do not show airavata logo"
echo " -security Enable Java 2 security"
echo " --<key>[=<value>] Server setting(s) to override or introduce (overrides values in airavata-server.properties)"
+ echo " -log <LOG_FILE> Where to redirect stdout/stderr (defaults to $DEFAULT_LOG_FILE)"
echo " -h Display this help and exit"
shift
exit 0
@@ -114,8 +128,9 @@ fi
if ${IS_DAEMON_MODE} ; then
echo "Starting airavata server/s in daemon mode..."
+ echo "Redirecting output to $LOG_FILE"
nohup java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
- org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $* > /dev/null 2>&1 &
+ org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $* >> $LOG_FILE 2>&1 &
else
java ${JAVA_OPTS} -classpath "${AIRAVATA_CLASSPATH}" \
org.apache.airavata.server.ServerMain ${AIRAVATA_COMMAND} $*
[44/50] [abbrv] airavata git commit: adding user profile service to
server module
Posted by ma...@apache.org.
adding user profile service to server module
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/be5ef40f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/be5ef40f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/be5ef40f
Branch: refs/heads/develop
Commit: be5ef40fdbe1a144bf89a68b934e11ff573dba83
Parents: 43c6736
Author: Anuj Bhandar <bh...@gmail.com>
Authored: Tue Jan 24 19:05:59 2017 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Apr 27 14:52:01 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/server/ServerMain.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/be5ef40f/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
----------------------------------------------------------------------
diff --git a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
index 1fcf179..63202f9 100644
--- a/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
+++ b/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
@@ -118,7 +118,7 @@ public class ServerMain {
serverList.add(API_SERVER);
serverList.add(ORCHESTRATOR);
serverList.add(GFAC_SERVER);
- // serverList.add(USER_PROFILE); // Commenting temporarily since there is no current usage
+ serverList.add(USER_PROFILE);
} else if (serverList.indexOf(API_ORCH) > -1) {
serverList.clear();
serverList.add(REGISTRY_SERVER); // registry server should start before everything
[26/50] [abbrv] airavata git commit: adding configurable cluster
status monitoring option
Posted by ma...@apache.org.
adding configurable cluster status monitoring option
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e3009f5f
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e3009f5f
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e3009f5f
Branch: refs/heads/develop
Commit: e3009f5f3e010a0859625328a321dc56301afac4
Parents: eadbdba
Author: scnakandala <su...@gmail.com>
Authored: Fri Apr 21 21:38:55 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Fri Apr 21 22:05:58 2017 -0400
----------------------------------------------------------------------
.../roles/api-orch/templates/airavata-server.properties.j2 | 1 +
.../roles/gfac/templates/airavata-server.properties.j2 | 7 +++++++
.../roles/registry/templates/airavata-server.properties.j2 | 7 +++++++
.../org/apache/airavata/common/utils/ApplicationSettings.java | 4 ++++
.../server/src/main/resources/airavata-server.properties | 1 +
.../airavata/orchestrator/server/OrchestratorServer.java | 7 +++++--
.../src/main/resources/airavata-server.properties | 1 +
7 files changed, 26 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
index 2cd5013..e502524 100644
--- a/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2
@@ -54,6 +54,7 @@ super.tenant.gatewayId={{ default_gateway }}
# Properties for cluster status monitoring
# cluster status monitoring job repeat time in seconds
+cluster.status.monitoring.enable=false
cluster.status.monitoring.repeat.time=18000
###########################################################################
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
index bf6f536..8aef970 100644
--- a/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2
@@ -50,6 +50,13 @@ default.registry.user=admin
default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway={{ default_gateway }}
+super.tenant.gatewayId={{ default_gateway }}
+
+# Properties for cluster status monitoring
+# cluster status monitoring job repeat time in seconds
+cluster.status.monitoring.enable=false
+cluster.status.monitoring.repeat.time=18000
+
###########################################################################
# Application Catalog DB Configuration
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2 b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
index bf92e39..4bf7e23 100644
--- a/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
+++ b/dev-tools/ansible/roles/registry/templates/airavata-server.properties.j2
@@ -50,6 +50,13 @@ default.registry.user=admin
default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway={{ default_gateway }}
+super.tenant.gatewayId={{ default_gateway }}
+
+# Properties for cluster status monitoring
+# cluster status monitoring job repeat time in seconds
+cluster.status.monitoring.enable=false
+cluster.status.monitoring.repeat.time=18000
+
###########################################################################
# Application Catalog DB Configuration
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
----------------------------------------------------------------------
diff --git a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
index acd037a..820b282 100644
--- a/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
+++ b/modules/commons/src/main/java/org/apache/airavata/common/utils/ApplicationSettings.java
@@ -411,6 +411,10 @@ public class ApplicationSettings {
return getSetting("cluster.status.monitoring.repeat.time");
}
+ public static Boolean enableClusterStatusMonitoring() throws ApplicationSettingsException {
+ return getSetting("cluster.status.monitoring.enable").equalsIgnoreCase("true");
+ }
+
public static String getUserProfileServerHost() throws ApplicationSettingsException {
return getSetting(ServerSettings.USER_PROFILE_SERVER_HOST);
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/modules/configuration/server/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/server/src/main/resources/airavata-server.properties b/modules/configuration/server/src/main/resources/airavata-server.properties
index fd1449f..b11107f 100644
--- a/modules/configuration/server/src/main/resources/airavata-server.properties
+++ b/modules/configuration/server/src/main/resources/airavata-server.properties
@@ -54,6 +54,7 @@ super.tenant.gatewayId=php_reference_gateway
# Properties for cluster status monitoring
# cluster status monitoring job repeat time in seconds
+cluster.status.monitoring.enable=false
cluster.status.monitoring.repeat.time=18000
###########################################################################
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
index dd7f24a..cb4f468 100644
--- a/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
+++ b/modules/orchestrator/orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServer.java
@@ -113,8 +113,11 @@ public class OrchestratorServer implements IServer {
@Override
public void start() throws Exception {
- //starting cluster status monitoring
- startClusterStatusMonitoring();
+ if (ServerSettings.enableClusterStatusMonitoring()) {
+ //starting cluster status monitoring
+ startClusterStatusMonitoring();
+ }
+
setStatus(ServerStatus.STARTING);
OrchestratorService.Processor<OrchestratorServerHandler> orchestratorService =
http://git-wip-us.apache.org/repos/asf/airavata/blob/e3009f5f/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties
----------------------------------------------------------------------
diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties
index e8a5b25..e2b0d51 100644
--- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties
+++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/airavata-server.properties
@@ -54,6 +54,7 @@ super.tenant.gatewayId=php_reference_gateway
# Properties for cluster status monitoring
# cluster status monitoring job repeat time in seconds
+cluster.status.monitoring.enable=false
cluster.status.monitoring.repeat.time=18000
###########################################################################
[41/50] [abbrv] airavata git commit: updating themes for two more
gateways
Posted by ma...@apache.org.
updating themes for two more gateways
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/056ae0a9
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/056ae0a9
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/056ae0a9
Branch: refs/heads/develop
Commit: 056ae0a97f8c02d6e89294e77142ba2f79a2c4b8
Parents: 6791f28
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Apr 27 09:23:36 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Apr 27 09:23:36 2017 -0400
----------------------------------------------------------------------
.../scigap/production/pga_config/simvascular/vars.yml | 4 ++--
.../inventories/scigap/production/pga_config/utah/vars.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/056ae0a9/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
index a800de2..5af96ae 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -45,7 +45,7 @@ super_admin_portal: "false"
admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: ""
+portal_theme: "simvascular-gateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/simvascular-gateway-theme.git"
portal_title: "SimVascular Gateway Portal"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/056ae0a9/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
index eedd509..a92897f 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
@@ -49,7 +49,7 @@ super_admin_portal: "false"
admin_emails: "['sgg@iu.edu']"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: ""
+portal_theme: "utah-sciencegateway-theme"
+portal_theme_repo: "https://github.com/SciGaP/utah-sciencegateway-theme.git"
portal_title: "Utah Gateway"
...
[42/50] [abbrv] airavata git commit: updating simvascular ssl certs
Posted by ma...@apache.org.
updating simvascular ssl certs
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b6312d9a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b6312d9a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b6312d9a
Branch: refs/heads/develop
Commit: b6312d9aa5a164490f744545414f8e05c2093680
Parents: 056ae0a
Author: Suresh Marru <sm...@apache.org>
Authored: Thu Apr 27 13:05:15 2017 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Thu Apr 27 13:05:15 2017 -0400
----------------------------------------------------------------------
.../scigap/production/pga_config/simvascular/vars.yml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b6312d9a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
index 5af96ae..97cd515 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -25,7 +25,11 @@ user: "pga"
group: "pga"
doc_root_dir: "/var/www/portals/simvascular"
vhost_servername: "gateway.simvascular.org"
-vhost_ssl: False
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/gateway.simvascular.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/gateway.simvascular.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/gateway.simvascular.org/privkey.pem"
## WSO2 IS related variables
tenant_domain: "airavata.simvascular"