You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/04/27 18:52:43 UTC
[1/3] airavata git commit: checking sharing is enabled
Repository: airavata
Updated Branches:
refs/heads/master b6312d9aa -> e48a02eaf
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/master
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<>();
}
[3/3] airavata git commit: merging upstream
Posted by sc...@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/master
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(-)
----------------------------------------------------------------------
[2/3] airavata git commit: adding user profile service to server
module
Posted by sc...@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/master
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